diff --git a/docs/sources/community/maintaining/release/_index.md b/docs/sources/community/maintaining/release/_index.md index 4ff18b3df770..fffcfc32401a 100644 --- a/docs/sources/community/maintaining/release/_index.md +++ b/docs/sources/community/maintaining/release/_index.md @@ -39,5 +39,6 @@ to publish a new [Grafana Loki](https://github.com/grafana/loki) release. 1. [Backport commits]({{< relref "./backport-commits" >}}) 1. [Prepare release notes]({{< relref "./prepare-release-notes" >}}) 1. [Prepare changelog]({{< relref "./prepare-changelog" >}}) +1. [Update version numbers]({{< relref "./update-version-numbers" >}}) 1. [Tag release]({{< relref "./tag-release" >}}) 1. [Publish release]({{< relref "./publish-release" >}}) diff --git a/docs/sources/get-started/deployment-modes.md b/docs/sources/get-started/deployment-modes.md index 74a688a42e66..330184681b1d 100644 --- a/docs/sources/get-started/deployment-modes.md +++ b/docs/sources/get-started/deployment-modes.md @@ -74,7 +74,7 @@ For release 2.9 the components are: TIP: You can see the complete list of targets for your version of Loki by running Loki with the flag `-list-targets`, for example: ```bash -docker run docker.io/grafana/loki:2.9.0 -config.file=/etc/loki/local-config.yaml -list-targets +docker run docker.io/grafana/loki:2.9.2 -config.file=/etc/loki/local-config.yaml -list-targets ``` ![Microservices mode diagram](../microservices-mode.png "Microservices mode") diff --git a/docs/sources/operations/loki-canary/_index.md b/docs/sources/operations/loki-canary/_index.md index ea3f12aedaa9..4a5f26b423c8 100644 --- a/docs/sources/operations/loki-canary/_index.md +++ b/docs/sources/operations/loki-canary/_index.md @@ -133,7 +133,7 @@ Loki Canary is also provided as a Docker container image: ```bash # change tag to the most recent release -$ docker pull grafana/loki-canary:2.9.1 +$ docker pull grafana/loki-canary:2.9.2 ``` ### Kubernetes diff --git a/docs/sources/send-data/docker-driver/_index.md b/docs/sources/send-data/docker-driver/_index.md index bfaa84d975a7..04b35d6a80f7 100644 --- a/docs/sources/send-data/docker-driver/_index.md +++ b/docs/sources/send-data/docker-driver/_index.md @@ -29,7 +29,7 @@ The Docker plugin must be installed on each Docker host that will be running con Run the following command to install the plugin, updating the release version if needed: ```bash -docker plugin install grafana/loki-docker-driver:2.9.1 --alias loki --grant-all-permissions +docker plugin install grafana/loki-docker-driver:2.9.2 --alias loki --grant-all-permissions ``` To check installed plugins, use the `docker plugin ls` command. @@ -54,7 +54,7 @@ re-enabling and restarting Docker: ```bash docker plugin disable loki --force -docker plugin upgrade loki grafana/loki-docker-driver:2.9.1 --grant-all-permissions +docker plugin upgrade loki grafana/loki-docker-driver:2.9.2 --grant-all-permissions docker plugin enable loki systemctl restart docker ``` diff --git a/docs/sources/send-data/promtail/installation.md b/docs/sources/send-data/promtail/installation.md index 6a7290be9d82..3b81225b5189 100644 --- a/docs/sources/send-data/promtail/installation.md +++ b/docs/sources/send-data/promtail/installation.md @@ -21,7 +21,7 @@ Every Grafana Loki release includes binaries for Promtail which can be found on ```bash # modify tag to most recent version -docker pull grafana/promtail:2.9.1 +docker pull grafana/promtail:2.9.2 ``` ## Install using Helm diff --git a/docs/sources/setup/install/docker.md b/docs/sources/setup/install/docker.md index 24459bb1efec..51df7f9288c8 100644 --- a/docs/sources/setup/install/docker.md +++ b/docs/sources/setup/install/docker.md @@ -25,10 +25,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://raw.githubusercontent.com/grafana/loki/v2.9.1/cmd/loki/loki-local-config.yaml -O loki-config.yaml -docker run --name loki -d -v $(pwd):/mnt/config -p 3100:3100 grafana/loki:2.9.1 -config.file=/mnt/config/loki-config.yaml -wget https://raw.githubusercontent.com/grafana/loki/v2.9.1/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml -docker run --name promtail -d -v $(pwd):/mnt/config -v /var/log:/var/log --link loki grafana/promtail:2.9.1 -config.file=/mnt/config/promtail-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.9.2/cmd/loki/loki-local-config.yaml -O loki-config.yaml +docker run --name loki -d -v $(pwd):/mnt/config -p 3100:3100 grafana/loki:2.9.2 -config.file=/mnt/config/loki-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.9.2/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml +docker run --name promtail -d -v $(pwd):/mnt/config -v /var/log:/var/log --link loki grafana/promtail:2.9.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. @@ -43,10 +43,10 @@ Copy and paste the commands below into your terminal. Note that you will need to ```bash cd "" -wget https://raw.githubusercontent.com/grafana/loki/v2.9.1/cmd/loki/loki-local-config.yaml -O loki-config.yaml -docker run --name loki -v :/mnt/config -p 3100:3100 grafana/loki:2.9.1 --config.file=/mnt/config/loki-config.yaml -wget https://raw.githubusercontent.com/grafana/loki/v2.9.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.9.1 --config.file=/mnt/config/promtail-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.9.2/cmd/loki/loki-local-config.yaml -O loki-config.yaml +docker run --name loki -v :/mnt/config -p 3100:3100 grafana/loki:2.9.2 --config.file=/mnt/config/loki-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.9.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.9.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. @@ -58,6 +58,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://raw.githubusercontent.com/grafana/loki/v2.9.1/production/docker-compose.yaml -O docker-compose.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.9.2/production/docker-compose.yaml -O docker-compose.yaml docker-compose -f docker-compose.yaml up ``` diff --git a/docs/sources/setup/install/local.md b/docs/sources/setup/install/local.md index ac4020be4ee0..2e636d01f252 100644 --- a/docs/sources/setup/install/local.md +++ b/docs/sources/setup/install/local.md @@ -37,7 +37,7 @@ The configuration specifies running Loki as a single binary. **Note:** Do not download LogCLI or Loki Canary at this time. `LogCLI` allows you to run Loki queries in a command line interface. [Loki Canary]({{< relref "../../operations/loki-canary" >}}) is a tool to audit Loki performance. 4. Unzip the package contents into the same directory. This is where the two programs will run. 5. In the command line, change directory (`cd` on most systems) to the directory with Loki and Promtail. Copy and paste the commands below into your command line to download generic configuration files. - **Note:** Use the corresponding Git refs that match your downloaded Loki version to get the correct configuration file. For example, if you are using Loki version 2.9.1, you need to use the `https://raw.githubusercontent.com/grafana/loki/v2.9.1/cmd/loki/loki-local-config.yaml` URL to download the configuration file that corresponds to the Loki version you aim to run. + **Note:** Use the corresponding Git refs that match your downloaded Loki version to get the correct configuration file. For example, if you are using Loki version 2.9.2, you need to use the `https://raw.githubusercontent.com/grafana/loki/v2.9.2/cmd/loki/loki-local-config.yaml` URL to download the configuration file that corresponds to the Loki version you aim to run. ``` wget https://raw.githubusercontent.com/grafana/loki/main/cmd/loki/loki-local-config.yaml diff --git a/examples/getting-started/docker-compose.yaml b/examples/getting-started/docker-compose.yaml index cc1079aff39f..01b765ccd1a1 100644 --- a/examples/getting-started/docker-compose.yaml +++ b/examples/getting-started/docker-compose.yaml @@ -6,7 +6,7 @@ networks: services: read: - image: grafana/loki:2.9.1 + image: grafana/loki:2.9.2 command: "-config.file=/etc/loki/config.yaml -target=read" ports: - 3101:3100 @@ -27,7 +27,7 @@ services: - loki write: - image: grafana/loki:2.9.1 + image: grafana/loki:2.9.2 command: "-config.file=/etc/loki/config.yaml -target=write" ports: - 3102:3100 @@ -46,7 +46,7 @@ services: <<: *loki-dns promtail: - image: grafana/promtail:2.9.1 + image: grafana/promtail:2.9.2 volumes: - ./promtail-local-config.yaml:/etc/promtail/config.yaml:ro - /var/run/docker.sock:/var/run/docker.sock diff --git a/production/docker-compose.yaml b/production/docker-compose.yaml index f36d0a4afc5b..1e1cd864b0e5 100644 --- a/production/docker-compose.yaml +++ b/production/docker-compose.yaml @@ -5,7 +5,7 @@ networks: services: loki: - image: grafana/loki:2.9.1 + image: grafana/loki:2.9.2 ports: - "3100:3100" command: -config.file=/etc/loki/local-config.yaml @@ -13,7 +13,7 @@ services: - loki promtail: - image: grafana/promtail:2.9.1 + image: grafana/promtail:2.9.2 volumes: - /var/log:/var/log command: -config.file=/etc/promtail/config.yml diff --git a/production/docker/docker-compose.yaml b/production/docker/docker-compose.yaml index 2afaba80753d..5c1b93f82917 100644 --- a/production/docker/docker-compose.yaml +++ b/production/docker/docker-compose.yaml @@ -14,7 +14,7 @@ services: # Loki would not have permissions to create the directories. # Therefore the init container changes permissions of the mounted directory. init: - image: &lokiImage grafana/loki:2.9.1 + image: &lokiImage grafana/loki:2.9.2 user: root entrypoint: - "chown" @@ -71,7 +71,7 @@ services: - ./loki/:/var/log/ promtail: - image: grafana/promtail:2.9.1 + image: grafana/promtail:2.9.2 volumes: - ./loki/:/var/log/ - ./config:/etc/promtail/ diff --git a/production/ksonnet/loki-canary/config.libsonnet b/production/ksonnet/loki-canary/config.libsonnet index 0c26a797e23e..117e84e97992 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.9.1', + loki_canary: 'grafana/loki-canary:2.9.2', }, } diff --git a/production/ksonnet/loki-simple-scalable/example/main.jsonnet b/production/ksonnet/loki-simple-scalable/example/main.jsonnet index 6570dbc247b8..ebf7b5cf288a 100644 --- a/production/ksonnet/loki-simple-scalable/example/main.jsonnet +++ b/production/ksonnet/loki-simple-scalable/example/main.jsonnet @@ -8,7 +8,7 @@ local k = import 'ksonnet-util/kausal.libsonnet', loki { _images+:: { - loki: 'grafana/loki:2.9.1', + loki: 'grafana/loki:2.9.2', }, _config+:: { diff --git a/production/ksonnet/loki-simple-scalable/images.libsonnet b/production/ksonnet/loki-simple-scalable/images.libsonnet index de5545f6b0a4..844e501c8576 100644 --- a/production/ksonnet/loki-simple-scalable/images.libsonnet +++ b/production/ksonnet/loki-simple-scalable/images.libsonnet @@ -1,6 +1,6 @@ { _images+:: { - loki: 'grafana/loki:2.9.1', + loki: 'grafana/loki:2.9.2', read: self.loki, write: self.loki, diff --git a/production/ksonnet/loki/images.libsonnet b/production/ksonnet/loki/images.libsonnet index b712ada41134..f124ac8d8fb1 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.9.1', + loki: 'grafana/loki:2.9.2', distributor:: self.loki, ingester:: self.loki, diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet index 4b6ef7eb7081..98f2eca88a49 100644 --- a/production/ksonnet/promtail/config.libsonnet +++ b/production/ksonnet/promtail/config.libsonnet @@ -1,6 +1,6 @@ { _images+:: { - promtail: 'grafana/promtail:2.9.1', + promtail: 'grafana/promtail:2.9.2', }, _config+:: {