diff --git a/CHANGELOG.md b/CHANGELOG.md index 968d1362d4..e147fbe7f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,9 @@ #### Loki ##### Enhancements + * [7951](https://github.com/grafana/loki/pull/7951) **MichelHollands**: Add a count template function to line_format and label_format. * [7380](https://github.com/grafana/loki/pull/7380) **liguozhong**: metrics query: range vector support streaming agg when no overlap. -* [7684](https://github.com/grafana/loki/pull/7684) **kavirajk**: Add missing `embedded-cache` config under `cache_config` doc. -* [6360](https://github.com/grafana/loki/pull/6099) **liguozhong**: Hide error message when ctx timeout occurs in s3.getObject -* [7602](https://github.com/grafana/loki/pull/7602) **vmax**: Add decolorize filter to easily parse colored logs. * [7731](https://github.com/grafana/loki/pull/7731) **bitkill**: Add healthchecks to the docker-compose example. * [7759](https://github.com/grafana/loki/pull/7759) **kavirajk**: Improve error message for loading config with ENV variables. * [7785](https://github.com/grafana/loki/pull/7785) **dannykopping**: Add query blocker for queries and rules. @@ -29,16 +27,13 @@ * [8131](https://github.com/grafana/loki/pull/8131) **jeschkies**: Compile Promtail ARM and ARM64 with journald support. * [8212](https://github.com/grafana/loki/pull/8212) **kavirajk**: ingester: Add `ingester_memory_streams_labels_bytes metric` for more visibility of size of metadata of in-memory streams. * [8271](https://github.com/grafana/loki/pull/8271) **kavirajk**: logql: Support urlencode and urldecode template functions +* [7906](https://github.com/grafana/loki/pull/7906) **kavirajk**: Add API endpoint that formats LogQL expressions and support new `fmt` subcommand in `logcli` to format LogQL query. ##### Fixes -* [7926](https://github.com/grafana/loki/pull/7926) **MichelHollands**: Fix validation for pattern and regexp parsers. -* [7720](https://github.com/grafana/loki/pull/7720) **sandeepsukhani**: fix bugs in processing delete requests with line filters. -* [7708](https://github.com/grafana/loki/pull/7708) **DylanGuedes**: Fix multitenant querying. * [7784](https://github.com/grafana/loki/pull/7784) **isodude**: Fix default values of connect addresses for compactor and querier workers to work with IPv6. * [7880](https://github.com/grafana/loki/pull/7880) **sandeepsukhani**: consider range and offset in queries while looking for schema config for query sharding. * [7937](https://github.com/grafana/loki/pull/7937) **ssncferreira**: Deprecate CLI flag `-ruler.wal-cleaer.period` and replace it with `-ruler.wal-cleaner.period`. -* [7906](https://github.com/grafana/loki/pull/7906) **kavirajk**: Add API endpoint that formats LogQL expressions and support new `fmt` subcommand in `logcli` to format LogQL query. * [7966](https://github.com/grafana/loki/pull/7966) **sandeepsukhani**: Fix query-frontend request load balancing when using k8s service. * [7988](https://github.com/grafana/loki/pull/7988) **ashwanthgoli** store: write overlapping chunks to multiple stores. * [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. @@ -50,32 +45,29 @@ #### Promtail +##### Enhancements + * [7619](https://github.com/grafana/loki/pull/7619) **cadrake**: Add ability to pass query params to heroku drain targets for relabelling. * [7973](https://github.com/grafana/loki/pull/7973) **chodges15**: Add configuration to drop rate limited batches in Loki client and new metric label for drop reason. * [8153](https://github.com/grafana/loki/pull/8153) **kavirajk**: promtail: Add `max-line-size` limit to drop on client side * [8096](https://github.com/grafana/loki/pull/8096) **kavirajk**: doc(promtail): Doc about how log rotate works with promtail * [8233](https://github.com/grafana/loki/pull/8233) **nicoche**: promtail: Add `max-line-size-truncate` limit to truncate too long lines on client side - - -##### Enhancements - * [7462](https://github.com/grafana/loki/pull/7462) **MarNicGit**: Allow excluding event message from Windows Event Log entries. -* [7602](https://github.com/grafana/loki/pull/7602) **vmax**: Add decolorize stage to Promtail to easily parse colored logs. * [7597](https://github.com/grafana/loki/pull/7597) **redbaron**: allow ratelimiting by label ##### Fixes -* [7771](https://github.com/grafana/loki/pull/7771) **GeorgeTsilias**: Handle nil error on target Details() call. +* [7771](https://github.com/grafana/loki/pull/7771) **GeorgeTsilias**: Handle nil error on target Details() call. * [7461](https://github.com/grafana/loki/pull/7461) **MarNicGit**: Promtail: Fix collecting userdata field from Windows Event Log ##### Changes -* [7587](https://github.com/grafana/loki/pull/7587) **mar4uk**: Add go build tag `promtail_journal_enabled` to include/exclude Promtail journald code from binary. #### Fluent Bit #### Loki Canary ##### Enhancements + * [8024](https://github.com/grafana/loki/pull/8024) **jijotj**: Support passing loki address as environment variable #### Jsonnet @@ -86,24 +78,59 @@ ### Notes -This release was created from a branch starting at commit FIXME but it may also contain backported changes from main. +### Dependencies + +## 2.7.2 (2023-01-25) + +#### Loki + +##### Fixes + +* [7926](https://github.com/grafana/loki/pull/7926) **MichelHollands**: Fix bug in validation of `pattern` and `regexp` parsers where missing or empty parameters caused panics. +* [7720](https://github.com/grafana/loki/pull/7720) **sandeepsukhani**: Fix bugs in processing delete requests with line filters. +* [7708](https://github.com/grafana/loki/pull/7708) **DylanGuedes**: Fix bug in multi-tenant querying. + +### Notes + +This release was created from a branch starting at commit `706c22e9e40b0156031f214b63dc6ed4e210abc1` but it may also contain backported changes from main. -Check the history of the branch FIXME. +Check the history of the branch `release-2.7.x`. ### Dependencies -* Go Version: 1.19 +* Go version: 1.19.5 -## 2.7.1 +## 2.7.1 (2022-12-09) #### Loki +##### Enhancements + +* [6360](https://github.com/grafana/loki/pull/6360) **liguozhong**: Hide error message when context timeout occurs in `s3.getObject` +* [7602](https://github.com/grafana/loki/pull/7602) **vmax**: Add decolorize filter to easily parse colored logs. +* [7804](https://github.com/grafana/loki/pull/7804) **sandeepsukhani**: Use grpc for communicating with compactor for query time filtering of data requested for deletion. +* [7684](https://github.com/grafana/loki/pull/7684) **kavirajk**: Add missing `embedded-cache` config under `cache_config` reference documentation. + ##### Fixes + * [7453](https://github.com/grafana/loki/pull/7453) **periklis**: Add single compactor http client for delete and gennumber clients ##### Changes + * [7877](https://github.com/grafana/loki/pull/7877)A **trevorwhitney**: Due to a known bug with experimental new delete mode feature, the default delete mode has been changed to `filter-only`. +#### Promtail + +##### Enhancements + +* [7602](https://github.com/grafana/loki/pull/7602) **vmax**: Add decolorize stage to Promtail to easily parse colored logs. + +##### Fixes + +##### Changes + +* [7587](https://github.com/grafana/loki/pull/7587) **mar4uk**: Add go build tag `promtail_journal_enabled` to include/exclude Promtail journald code from binary. + ## 2.7.0 #### Loki diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md index 1a06b31904..0e1cd30c43 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.1/cmd/loki/loki-local-config.yaml -O loki-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.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.6.1 -config.file=/mnt/config/loki-config.yaml -wget https://raw.githubusercontent.com/grafana/loki/v2.7.1/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.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.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.1/cmd/loki/loki-local-config.yaml -O loki-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.2/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.1/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.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.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.1/production/docker-compose.yaml -O docker-compose.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.2/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 784ea0b500..205cf3a719 100644 --- a/docs/sources/release-notes/v2-7.md +++ b/docs/sources/release-notes/v2-7.md @@ -34,6 +34,16 @@ As always, please read the [upgrade guide]({{}}) bef ## Bug fixes +### 2.7.2 + +* 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: + * Whole chunks covered by delete requests with a line filter were incorrectly skipped. + * Chunks partially covered by delete requests with a line filter were not properly processed. + The part that was not covered by the delete request was rewritten with a line filter, while the part that was covered by the delete request was completely deleted. +* 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 * 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 7d6dc10001..52c4a6be99 100644 --- a/production/docker-compose.yaml +++ b/production/docker-compose.yaml @@ -5,7 +5,7 @@ networks: services: loki: - image: grafana/loki:2.7.1 + image: grafana/loki:2.7.2 ports: - "3100:3100" command: -config.file=/etc/loki/local-config.yaml @@ -13,7 +13,7 @@ services: - loki promtail: - image: grafana/promtail:2.7.1 + image: grafana/promtail:2.7.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 8007d2d65d..c9172eb3fb 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.1 + image: grafana/loki:2.7.2 user: root entrypoint: - "chown" @@ -72,7 +72,7 @@ services: - ./loki/:/var/log/ promtail: - image: grafana/promtail:2.7.1 + image: grafana/promtail:2.7.2 volumes: - ./loki/:/var/log/ - ./config:/etc/promtail/ @@ -114,7 +114,7 @@ services: - loki loki-read: - image: grafana/loki:2.7.1 + image: grafana/loki:2.7.2 volumes: - ./config:/etc/loki/ ports: @@ -136,7 +136,7 @@ services: # only needed for interactive debugging with dlv loki-write: - image: grafana/loki:2.7.1 + image: grafana/loki:2.7.2 volumes: - ./config:/etc/loki/ ports: diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 64b896e01d..2a8bd29f04 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.0 +appVersion: 2.7.2 version: 4.4.1 home: https://grafana.github.io/helm-charts sources: diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index ae95f12641..4bac76c81f 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 4.4.1](https://img.shields.io/badge/Version-4.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square) +![Version: 4.4.1](https://img.shields.io/badge/Version-4.4.1-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) 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 6aebb8b356..83bb62adc8 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.1', + loki_canary: 'grafana/loki-canary:2.7.2', }, } diff --git a/production/ksonnet/loki-simple-scalable/example/main.jsonnet b/production/ksonnet/loki-simple-scalable/example/main.jsonnet index 716e83edfe..097ac40bb6 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.1', + loki: 'grafana/loki:2.7.2', }, _config+:: { diff --git a/production/ksonnet/loki-simple-scalable/images.libsonnet b/production/ksonnet/loki-simple-scalable/images.libsonnet index ba37230094..e8552e72cb 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.1', + loki: 'grafana/loki:2.7.2', read: self.loki, write: self.loki, diff --git a/production/ksonnet/loki/images.libsonnet b/production/ksonnet/loki/images.libsonnet index b867161e6d..6e18828772 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.1', + loki: 'grafana/loki:2.7.2', distributor:: self.loki, ingester:: self.loki, diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet index 8c51c0926f..2f739ba916 100644 --- a/production/ksonnet/promtail/config.libsonnet +++ b/production/ksonnet/promtail/config.libsonnet @@ -1,6 +1,6 @@ { _images+:: { - promtail: 'grafana/promtail:2.7.1', + promtail: 'grafana/promtail:2.7.2', }, _config+:: { diff --git a/production/nomad/loki-distributed/README.md b/production/nomad/loki-distributed/README.md index b2125c1009..0444f253cf 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.1" job.nomad.hcl +nomad job run -var="version=2.7.2" job.nomad.hcl ``` ### Scale Loki diff --git a/production/nomad/loki-distributed/job.nomad.hcl b/production/nomad/loki-distributed/job.nomad.hcl index 5871f0fdcf..8506dd210d 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.1" + default = "2.7.2" } job "loki" { diff --git a/production/nomad/loki-simple/README.md b/production/nomad/loki-simple/README.md index eba5fd7f9f..5c0e222fec 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.1" job.nomad.hcl +nomad job run -var="version=2.7.2" job.nomad.hcl ``` ### Scale Loki diff --git a/production/nomad/loki-simple/job.nomad.hcl b/production/nomad/loki-simple/job.nomad.hcl index a80f21e895..c31ad66f7d 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.1" + default = "2.7.2" } job "loki" { diff --git a/production/nomad/loki/README.md b/production/nomad/loki/README.md index 2ea738841b..9d811dbe2f 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.1" job.nomad.hcl +nomad job run -var="version=2.7.2" job.nomad.hcl ``` ### Scale Loki diff --git a/production/nomad/loki/job.nomad.hcl b/production/nomad/loki/job.nomad.hcl index a52e91088b..48d1cddffb 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.1" + default = "2.7.2" } job "loki" {