From d9d5ed4a1f8bc500d12c8e0068f2f0af88a5d830 Mon Sep 17 00:00:00 2001 From: Christian Haudum Date: Thu, 14 Sep 2023 18:05:23 +0200 Subject: [PATCH] Prepare release 2.9.1 (#10588) This PR prepares the release of Loki 2.9.1 --------- Signed-off-by: Christian Haudum --- CHANGELOG.md | 7 ++++++- docs/sources/release-notes/v2-9.md | 10 ++++++++++ docs/sources/send-data/docker-driver/_index.md | 4 ++-- docs/sources/setup/install/docker.md | 18 +++++++++--------- 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8846f61b35690..d6d4cc1763473 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ -## Unreleased +## 2.9.1 (2023-09-14) ### All Changes +##### Security + +* [10573](https://github.com/grafana/loki/pull/10573) **DylanGuedes**: Bump Docker base images to Alpine version 3.18.7 to mitigate CVE-2022-48174 + #### Loki ##### Fixes @@ -9,6 +13,7 @@ * [10314](https://github.com/grafana/loki/pull/10314) **bboreham**: Fix race conditions in indexshipper. * [10585](https://github.com/grafana/loki/pull/10585) **ashwanthgoli** / **chaudum**: Fix bug in index object client that could result in not showing all ingested logs in query results. + ## 2.9.0 (2023-09-06) ### All Changes diff --git a/docs/sources/release-notes/v2-9.md b/docs/sources/release-notes/v2-9.md index 59c87ca884b3b..f7b5e1166f436 100644 --- a/docs/sources/release-notes/v2-9.md +++ b/docs/sources/release-notes/v2-9.md @@ -29,3 +29,13 @@ Grafana Labs is excited to announce the release of Loki 2.9.0 Here's a summary o - The `-boltdb.shipper.compactor.*` CLI flags are deprecated in favor of `-compactor.*`. - The `-ingester.unordered-writes` CLI flag is deprecated and will always default to `true` in the next major release. - For the full list of deprecations, see CHANGELOG.md + +## Bug fixes + +### 2.9.1 (2023-09-14) + +* Update Docker base images to mitigate security vulnerability CVE-2022-48174 +* Fix bugs in indexshipper (`tsdb`, `boltdb-shipper`) that could result in not showing all ingested logs in query results. + + +For a full list of all changes and fixes, look at the [CHANGELOG](https://github.com/grafana/loki/blob/release-2.9.x/CHANGELOG.md). diff --git a/docs/sources/send-data/docker-driver/_index.md b/docs/sources/send-data/docker-driver/_index.md index 8a0f52cbdbd2d..32d413232ccea 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.0 --alias loki --grant-all-permissions +docker plugin install grafana/loki-docker-driver:2.9.1 --alias loki --grant-all-permissions ``` To check installed plugins, use the `docker plugin ls` command. Plugins that @@ -50,7 +50,7 @@ re-enabling and restarting Docker: ```bash docker plugin disable loki --force -docker plugin upgrade loki grafana/loki-docker-driver:2.9.0 --grant-all-permissions +docker plugin upgrade loki grafana/loki-docker-driver:2.9.1 --grant-all-permissions docker plugin enable loki systemctl restart docker ``` diff --git a/docs/sources/setup/install/docker.md b/docs/sources/setup/install/docker.md index 16c52a8f65a4c..9a26eea946d8b 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.0/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.0 -config.file=/mnt/config/loki-config.yaml -wget https://raw.githubusercontent.com/grafana/loki/v2.9.0/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.0 -config.file=/mnt/config/promtail-config.yaml +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 ``` 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.0/cmd/loki/loki-local-config.yaml -O loki-config.yaml -docker run --name loki -v :/mnt/config -p 3100:3100 grafana/loki:2.9.0 --config.file=/mnt/config/loki-config.yaml -wget https://raw.githubusercontent.com/grafana/loki/v2.9.0/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.0 --config.file=/mnt/config/promtail-config.yaml +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 ``` 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.0/production/docker-compose.yaml -O docker-compose.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.9.1/production/docker-compose.yaml -O docker-compose.yaml docker-compose -f docker-compose.yaml up ```