diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md index e4d845123a31..c7c1f456f7e8 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://raw.githubusercontent.com/grafana/loki/v2.5.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.5.0 -config.file=/mnt/config/loki-config.yaml -wget https://raw.githubusercontent.com/grafana/loki/v2.5.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.5.0 -config.file=/mnt/config/promtail-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.6.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.6.1 -config.file=/mnt/config/loki-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.6.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.6.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. @@ -39,10 +39,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.5.0/cmd/loki/loki-local-config.yaml -O loki-config.yaml -docker run --name loki -v :/mnt/config -p 3100:3100 grafana/loki:2.5.0 --config.file=/mnt/config/loki-config.yaml -wget https://raw.githubusercontent.com/grafana/loki/v2.5.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.5.0 --config.file=/mnt/config/promtail-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.6.1/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.6.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.6.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. @@ -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://raw.githubusercontent.com/grafana/loki/v2.5.0/production/docker-compose.yaml -O docker-compose.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.6.1/production/docker-compose.yaml -O docker-compose.yaml docker-compose -f docker-compose.yaml up ``` diff --git a/examples/getting-started/docker-compose.yaml b/examples/getting-started/docker-compose.yaml index 75ca39c0dce7..9ac051dd6ae2 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.5.0 + image: grafana/loki:2.6.1 command: "-config.file=/etc/loki/config.yaml -target=read" ports: - 3101:3100 @@ -22,7 +22,7 @@ services: - loki write: - image: grafana/loki:2.5.0 + image: grafana/loki:2.6.1 command: "-config.file=/etc/loki/config.yaml -target=write" ports: - 3102:3100 @@ -36,7 +36,7 @@ services: <<: *loki-dns promtail: - image: grafana/promtail:2.5.0 + image: grafana/promtail:2.6.1 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 152825aba2fe..49050bd933dc 100644 --- a/production/docker-compose.yaml +++ b/production/docker-compose.yaml @@ -5,7 +5,7 @@ networks: services: loki: - image: grafana/loki:2.5.0 + image: grafana/loki:2.6.1 ports: - "3100:3100" command: -config.file=/etc/loki/local-config.yaml @@ -13,7 +13,7 @@ services: - loki promtail: - image: grafana/promtail:2.5.0 + image: grafana/promtail:2.6.1 volumes: - /var/log:/var/log command: -config.file=/etc/promtail/config.yml diff --git a/production/ksonnet/loki-canary/config.libsonnet b/production/ksonnet/loki-canary/config.libsonnet index 31b2ce0586f2..33fe55fc22de 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.5.0', + loki_canary: 'grafana/loki-canary:2.6.1', }, } diff --git a/production/ksonnet/loki-simple-scalable/example/main.jsonnet b/production/ksonnet/loki-simple-scalable/example/main.jsonnet index dab6807b7b02..ffefdafe32ed 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.5.0', + loki: 'grafana/loki:2.6.1', }, _config+:: { diff --git a/production/ksonnet/loki-simple-scalable/images.libsonnet b/production/ksonnet/loki-simple-scalable/images.libsonnet index 93a87940618e..a4e1cf4dc26d 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.5.0', + loki: 'grafana/loki:2.6.1', read: self.loki, write: self.loki, diff --git a/production/ksonnet/loki/images.libsonnet b/production/ksonnet/loki/images.libsonnet index b94f8567f85b..894747bc69b6 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.5.0', + loki: 'grafana/loki:2.6.1', distributor: self.loki, ingester: self.loki, diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet index 8a428b240ee8..4dc41400f8b2 100644 --- a/production/ksonnet/promtail/config.libsonnet +++ b/production/ksonnet/promtail/config.libsonnet @@ -1,6 +1,6 @@ { _images+:: { - promtail: 'grafana/promtail:2.5.0', + promtail: 'grafana/promtail:2.6.1', }, _config+:: { diff --git a/production/nomad/loki-distributed/README.md b/production/nomad/loki-distributed/README.md index c966bb091ba5..1fd36eb0549d 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.5.0" job.nomad.hcl +nomad job run -var="version=2.6.1" job.nomad.hcl ``` ### Scale Loki diff --git a/production/nomad/loki-distributed/job.nomad.hcl b/production/nomad/loki-distributed/job.nomad.hcl index ef85828172fc..d75c368957fc 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.5.0" + default = "2.6.1" } job "loki" { diff --git a/production/nomad/loki-simple/README.md b/production/nomad/loki-simple/README.md index 4270bbde8b6b..ba6d251a3038 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.5.0" job.nomad.hcl +nomad job run -var="version=2.6.1" job.nomad.hcl ``` ### Scale Loki diff --git a/production/nomad/loki-simple/job.nomad.hcl b/production/nomad/loki-simple/job.nomad.hcl index 6e14b4db0f17..4bdd974395cb 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.5.0" + default = "2.6.1" } job "loki" { diff --git a/production/nomad/loki/README.md b/production/nomad/loki/README.md index 1692cba4d569..1b64c0de4313 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.5.0" job.nomad.hcl +nomad job run -var="version=2.6.1" job.nomad.hcl ``` ### Scale Loki diff --git a/production/nomad/loki/job.nomad.hcl b/production/nomad/loki/job.nomad.hcl index ba721a634283..aff5a8bb66cc 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.5.0" + default = "2.6.1" } job "loki" { diff --git a/tools/promtail.sh b/tools/promtail.sh index 9d8def7e528e..91e7ca2c02a8 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.5.0}" +VERSION="${PROMTAIL_VERSION:-2.6.1}" if [ -z "${INSTANCEID}" ] || [ -z "${APIKEY}" ] || [ -z "${INSTANCEURL}" ] || [ -z "${NAMESPACE}" ] || [ -z "${CONTAINERROOT}" ] || [ -z "${PARSER}" ]; then echo "usage: $0 [[[]]]"