diff --git a/docs/sources/installation/docker.md b/docs/sources/installation/docker.md index 7067c40411784..c358da5a8b0da 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.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.7.2 -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 -docker run --name promtail -d -v $(pwd):/mnt/config -v /var/log:/var/log --link loki grafana/promtail:2.7.2 -config.file=/mnt/config/promtail-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.4/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.7.4 -config.file=/mnt/config/loki-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.4/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.7.4 -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.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.7.2 --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 -docker run -v :/mnt/config -v /var/log:/var/log --link loki grafana/promtail:2.7.2 --config.file=/mnt/config/promtail-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.4/cmd/loki/loki-local-config.yaml -O loki-config.yaml +docker run --name loki -v :/mnt/config -p 3100:3100 grafana/loki:2.7.4 --config.file=/mnt/config/loki-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.4/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.7.4 --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.7.2/production/docker-compose.yaml -O docker-compose.yaml +wget https://raw.githubusercontent.com/grafana/loki/v2.7.4/production/docker-compose.yaml -O docker-compose.yaml docker-compose -f docker-compose.yaml up ``` diff --git a/docs/sources/installation/local.md b/docs/sources/installation/local.md index ef0c04e8be758..8a71a79e0a82b 100644 --- a/docs/sources/installation/local.md +++ b/docs/sources/installation/local.md @@ -18,7 +18,7 @@ The configuration specifies running Loki as a single binary. **Note:** Do not download LogCLI or Loki Canary at this time. [LogCLI](../../getting-started/logcli/) allows you to run Loki queries in a command line interface. [Loki Canary](../../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.7.2, you need to use the `https://raw.githubusercontent.com/grafana/loki/v2.7.2/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.7.4, you need to use the `https://raw.githubusercontent.com/grafana/loki/v2.7.4/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/production/docker-compose.yaml b/production/docker-compose.yaml index ede8050d9c0fd..5260b3a7bbe87 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.4 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.4 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 2b90890b5cb29..1e6d0c19bba12 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.4 user: root entrypoint: - "chown" @@ -72,7 +72,7 @@ services: - ./loki/:/var/log/ promtail: - image: grafana/promtail:2.7.2 + image: grafana/promtail:2.7.4 volumes: - ./loki/:/var/log/ - ./config:/etc/promtail/ @@ -114,7 +114,7 @@ services: - loki loki-frontend: - image: grafana/loki:2.7.2 + image: grafana/loki:2.7.4 volumes: - ./config:/etc/loki/ ports: @@ -127,7 +127,7 @@ services: replicas: 2 loki-read: - image: grafana/loki:2.7.2 + image: grafana/loki:2.7.4 volumes: - ./config:/etc/loki/ ports: @@ -149,7 +149,7 @@ services: # only needed for interactive debugging with dlv loki-write: - image: grafana/loki:2.7.2 + image: grafana/loki:2.7.4 volumes: - ./config:/etc/loki/ ports: diff --git a/production/ksonnet/loki-canary/config.libsonnet b/production/ksonnet/loki-canary/config.libsonnet index 172b6f49f5649..e291c13073252 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.3', + loki_canary: 'grafana/loki-canary:2.7.4', }, } diff --git a/production/ksonnet/loki-simple-scalable/example/main.jsonnet b/production/ksonnet/loki-simple-scalable/example/main.jsonnet index d81e73db56b98..924b48a364fa0 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.4', }, _config+:: { diff --git a/production/ksonnet/loki-simple-scalable/images.libsonnet b/production/ksonnet/loki-simple-scalable/images.libsonnet index e8552e72cb65c..d8b31940b7a40 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.4', read: self.loki, write: self.loki, diff --git a/production/ksonnet/loki/images.libsonnet b/production/ksonnet/loki/images.libsonnet index 9d2eab6c312b8..d497ab499703e 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.3', + loki: 'grafana/loki:2.7.4', distributor: self.loki, ingester: self.loki, diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet index 577480b437b5d..c4b70d88c5edb 100644 --- a/production/ksonnet/promtail/config.libsonnet +++ b/production/ksonnet/promtail/config.libsonnet @@ -1,6 +1,6 @@ { _images+:: { - promtail: 'grafana/promtail:2.7.3', + promtail: 'grafana/promtail:2.7.4', }, _config+:: { diff --git a/production/nomad/loki-distributed/README.md b/production/nomad/loki-distributed/README.md index 0444f253cf31b..4929bb35e7a9e 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.4" job.nomad.hcl ``` ### Scale Loki diff --git a/production/nomad/loki-distributed/job.nomad.hcl b/production/nomad/loki-distributed/job.nomad.hcl index 8506dd210d98b..39874257412d5 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.4" } job "loki" { diff --git a/production/nomad/loki-simple/README.md b/production/nomad/loki-simple/README.md index 5c0e222fece92..bc946bc2313e1 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.4" job.nomad.hcl ``` ### Scale Loki diff --git a/production/nomad/loki-simple/job.nomad.hcl b/production/nomad/loki-simple/job.nomad.hcl index c31ad66f7d232..8527d268370f8 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.4" } job "loki" { diff --git a/production/nomad/loki/README.md b/production/nomad/loki/README.md index 9d811dbe2f76f..7fd49f8ebe2c8 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.4" job.nomad.hcl ``` ### Scale Loki diff --git a/production/nomad/loki/job.nomad.hcl b/production/nomad/loki/job.nomad.hcl index 48d1cddffbf28..74e46a49b1b04 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.4" } job "loki" {