diff --git a/CHANGELOG.md b/CHANGELOG.md index 46c7aaf7e6..5914867e1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,7 +40,6 @@ * [7925](https://github.com/grafana/loki/pull/7925) **sandeepsukhani**: Fix bugs in logs results caching causing query-frontend to return logs outside of query window. * [8120](https://github.com/grafana/loki/pull/8120) **ashwanthgoli** fix panic on hitting /scheduler/ring when ring is disabled. * [8251](https://github.com/grafana/loki/pull/8251) **sandeepsukhani** index-store: fix indexing of chunks overlapping multiple schemas. -* [8120](https://github.com/grafana/loki/pull/8232) **TaehyunHwang** Fix version info issue that shows wrong version. * [8151](https://github.com/grafana/loki/pull/8151) **sandeepsukhani** fix log deletion with line filters. ##### Changes @@ -85,6 +84,18 @@ ### Dependencies +## 2.7.3 (2023-02-01) + +#### Loki + +##### Fixes + +* [8340](https://github.com/grafana/loki/pull/8340) **MasslessParticle** Fix bug in compactor that caused panics when `startTime` and `endTime` of a delete request are equal. + +#### Build + +* [8232](https://github.com/grafana/loki/pull/8232) **TaehyunHwang** Fix build issue that caused `--version` to show wrong version for Loki and Promtail binaries. + ## 2.7.2 (2023-01-25) #### Loki diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md index 0e1cd30c43..449d226e67 100644 --- a/docs/sources/installation/docker.md +++ b/docs/sources/installation/docker.md @@ -22,9 +22,9 @@ 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.7.2/cmd/loki/loki-local-config.yaml -O loki-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.3/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.6.1 -config.file=/mnt/config/loki-config.yaml -wget https://raw.githubusercontent.com/grafana/loki/v2.7.2/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.3/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.6.1 -config.file=/mnt/config/promtail-config.yaml ``` @@ -40,9 +40,9 @@ 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.7.2/cmd/loki/loki-local-config.yaml -O loki-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.3/cmd/loki/loki-local-config.yaml -O loki-config.yaml docker run --name loki -v :/mnt/config -p 3100:3100 grafana/loki:2.6.1 --config.file=/mnt/config/loki-config.yaml -wget https://raw.githubusercontent.com/grafana/loki/v2.7.2/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.3/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.6.1 --config.file=/mnt/config/promtail-config.yaml ``` @@ -55,6 +55,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.7.2/production/docker-compose.yaml -O docker-compose.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.3/production/docker-compose.yaml -O docker-compose.yaml docker-compose -f docker-compose.yaml up ``` diff --git a/docs/sources/release-notes/v2-7.md b/docs/sources/release-notes/v2-7.md index 205cf3a719..af508ed5e4 100644 --- a/docs/sources/release-notes/v2-7.md +++ b/docs/sources/release-notes/v2-7.md @@ -34,7 +34,12 @@ As always, please read the [upgrade guide]({{}}) bef ## Bug fixes -### 2.7.2 +### 2.7.3 (2023-02-01) + +* Fixed a bug in compactor that caused divide-by-zero panics when `startTime` and `endTime` of a delete request were equal. +* Fixed the output of the `--version` command that showed an incorrect version information. + +### 2.7.2 (2023-01-25) * Fixed bug in validation of `pattern` and `regexp` parsers where missing or empty parameters for these parsers caused panics. * Fixed bugs in processing delete requests with line filters: @@ -44,7 +49,7 @@ As always, please read the [upgrade guide]({{}}) bef * Fixed bug in multi-tenant querying that caused HTTP 400 responses when multiple tenants where used in `X-Scope-OrgID` header like so `tenant-a|tenant-b`. * Upgraded Go build version and Docker container base images to 1.19.5 to mitigate [GO-2022-1144](https://pkg.go.dev/vuln/GO-2022-1144) vulnerability. -### 2.7.1 +### 2.7.1 (2022-12-09) * Add single compactor http client for delete and gennumber clients. This fixes a bug caused by the accidental introduction of different HTTP clients for compactor and gennumber operations that resulted in 404s when only the gennumber middlewares were enabled: diff --git a/production/docker-compose.yaml b/production/docker-compose.yaml index 52c4a6be99..72571b893a 100644 --- a/production/docker-compose.yaml +++ b/production/docker-compose.yaml @@ -5,7 +5,7 @@ networks: services: loki: - image: grafana/loki:2.7.2 + image: grafana/loki:2.7.3 ports: - "3100:3100" command: -config.file=/etc/loki/local-config.yaml @@ -13,7 +13,7 @@ services: - loki promtail: - image: grafana/promtail:2.7.2 + image: grafana/promtail:2.7.3 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 c9172eb3fb..f9476414f7 100644 --- a/production/docker/docker-compose.yaml +++ b/production/docker/docker-compose.yaml @@ -16,7 +16,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.7.2 + image: grafana/loki:2.7.3 user: root entrypoint: - "chown" @@ -72,7 +72,7 @@ services: - ./loki/:/var/log/ promtail: - image: grafana/promtail:2.7.2 + image: grafana/promtail:2.7.3 volumes: - ./loki/:/var/log/ - ./config:/etc/promtail/ @@ -114,7 +114,7 @@ services: - loki loki-read: - image: grafana/loki:2.7.2 + image: grafana/loki:2.7.3 volumes: - ./config:/etc/loki/ ports: @@ -136,7 +136,7 @@ services: # only needed for interactive debugging with dlv loki-write: - image: grafana/loki:2.7.2 + image: grafana/loki:2.7.3 volumes: - ./config:/etc/loki/ ports: diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 8995122558..b162b7bbd2 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -3,7 +3,7 @@ apiVersion: v2 name: loki description: Helm chart for Grafana Loki in simple, scalable mode type: application -appVersion: 2.7.2 +appVersion: 2.7.3 version: 4.4.2 home: https://grafana.github.io/helm-charts sources: diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index 26fd882f5c..cd06eeded2 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 4.4.2](https://img.shields.io/badge/Version-4.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.2](https://img.shields.io/badge/AppVersion-2.7.2-informational?style=flat-square) +![Version: 4.4.2](https://img.shields.io/badge/Version-4.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.3](https://img.shields.io/badge/AppVersion-2.7.3-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode diff --git a/production/ksonnet/loki-canary/config.libsonnet b/production/ksonnet/loki-canary/config.libsonnet index 83bb62adc8..172b6f49f5 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.7.2', + loki_canary: 'grafana/loki-canary:2.7.3', }, } diff --git a/production/ksonnet/loki-simple-scalable/example/main.jsonnet b/production/ksonnet/loki-simple-scalable/example/main.jsonnet index 097ac40bb6..a6d40a2c03 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.7.2', + loki: 'grafana/loki:2.7.3', }, _config+:: { diff --git a/production/ksonnet/loki-simple-scalable/images.libsonnet b/production/ksonnet/loki-simple-scalable/images.libsonnet index e8552e72cb..eb753dd247 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.7.2', + loki: 'grafana/loki:2.7.3', read: self.loki, write: self.loki, diff --git a/production/ksonnet/loki/images.libsonnet b/production/ksonnet/loki/images.libsonnet index 6e18828772..b20eadd634 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.7.2', + loki: 'grafana/loki:2.7.3', distributor:: self.loki, ingester:: self.loki, diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet index 2f739ba916..577480b437 100644 --- a/production/ksonnet/promtail/config.libsonnet +++ b/production/ksonnet/promtail/config.libsonnet @@ -1,6 +1,6 @@ { _images+:: { - promtail: 'grafana/promtail:2.7.2', + promtail: 'grafana/promtail:2.7.3', }, _config+:: { diff --git a/production/nomad/loki-distributed/README.md b/production/nomad/loki-distributed/README.md index 0444f253cf..e61a8c8992 100644 --- a/production/nomad/loki-distributed/README.md +++ b/production/nomad/loki-distributed/README.md @@ -21,7 +21,7 @@ To deploy a different version change `variable.version` default value or specify from command line: ```shell -nomad job run -var="version=2.7.2" job.nomad.hcl +nomad job run -var="version=2.7.3" job.nomad.hcl ``` ### Scale Loki diff --git a/production/nomad/loki-distributed/job.nomad.hcl b/production/nomad/loki-distributed/job.nomad.hcl index 8506dd210d..add465ed07 100644 --- a/production/nomad/loki-distributed/job.nomad.hcl +++ b/production/nomad/loki-distributed/job.nomad.hcl @@ -1,7 +1,7 @@ variable "version" { type = string description = "Loki version" - default = "2.7.2" + default = "2.7.3" } job "loki" { diff --git a/production/nomad/loki-simple/README.md b/production/nomad/loki-simple/README.md index 5c0e222fec..dd04f5ab22 100644 --- a/production/nomad/loki-simple/README.md +++ b/production/nomad/loki-simple/README.md @@ -22,7 +22,7 @@ To deploy a different version change `variable.version` default value or specify from command line: ```shell -nomad job run -var="version=2.7.2" job.nomad.hcl +nomad job run -var="version=2.7.3" job.nomad.hcl ``` ### Scale Loki diff --git a/production/nomad/loki-simple/job.nomad.hcl b/production/nomad/loki-simple/job.nomad.hcl index c31ad66f7d..a33d2f50eb 100644 --- a/production/nomad/loki-simple/job.nomad.hcl +++ b/production/nomad/loki-simple/job.nomad.hcl @@ -1,7 +1,7 @@ variable "version" { type = string description = "Loki version" - default = "2.7.2" + default = "2.7.3" } job "loki" { diff --git a/production/nomad/loki/README.md b/production/nomad/loki/README.md index 9d811dbe2f..bc98237971 100644 --- a/production/nomad/loki/README.md +++ b/production/nomad/loki/README.md @@ -22,7 +22,7 @@ To deploy a different version change `variable.version` default value or specify from command line: ```shell -nomad job run -var="version=2.7.2" job.nomad.hcl +nomad job run -var="version=2.7.3" job.nomad.hcl ``` ### Scale Loki diff --git a/production/nomad/loki/job.nomad.hcl b/production/nomad/loki/job.nomad.hcl index 48d1cddffb..484613026c 100644 --- a/production/nomad/loki/job.nomad.hcl +++ b/production/nomad/loki/job.nomad.hcl @@ -1,7 +1,7 @@ variable "version" { type = string description = "Loki version" - default = "2.7.2" + default = "2.7.3" } job "loki" {