Skip to content

Commit

Permalink
Docs: Update references from 2.7.{2,3} to 2.7.4 (#8626)
Browse files Browse the repository at this point in the history
**What this PR does / why we need it**:
Update references from 2.7.{2,3} to 2.7.4
  • Loading branch information
DylanGuedes authored Feb 24, 2023
1 parent 6f76a96 commit 90f2534
Show file tree
Hide file tree
Showing 15 changed files with 28 additions and 28 deletions.
18 changes: 9 additions & 9 deletions docs/sources/installation/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -39,10 +39,10 @@ Copy and paste the commands below into your terminal. Note that you will need to

```bash
cd "<local-path>"
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 <local-path>:/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 <local-path>:/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 <local-path>:/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 <local-path>:/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.
Expand All @@ -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
```
2 changes: 1 addition & 1 deletion docs/sources/installation/local.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions production/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ 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
networks:
- 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
Expand Down
10 changes: 5 additions & 5 deletions production/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion production/ksonnet/loki-canary/config.libsonnet
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
_images+:: {
loki_canary: 'grafana/loki-canary:2.7.3',
loki_canary: 'grafana/loki-canary:2.7.4',
},
}
Original file line number Diff line number Diff line change
Expand Up @@ -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+:: {
Expand Down
2 changes: 1 addition & 1 deletion production/ksonnet/loki-simple-scalable/images.libsonnet
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
_images+:: {
loki: 'grafana/loki:2.7.2',
loki: 'grafana/loki:2.7.4',

read: self.loki,
write: self.loki,
Expand Down
2 changes: 1 addition & 1 deletion production/ksonnet/loki/images.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion production/ksonnet/promtail/config.libsonnet
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
_images+:: {
promtail: 'grafana/promtail:2.7.3',
promtail: 'grafana/promtail:2.7.4',
},

_config+:: {
Expand Down
2 changes: 1 addition & 1 deletion production/nomad/loki-distributed/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion production/nomad/loki-distributed/job.nomad.hcl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variable "version" {
type = string
description = "Loki version"
default = "2.7.2"
default = "2.7.4"
}

job "loki" {
Expand Down
2 changes: 1 addition & 1 deletion production/nomad/loki-simple/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion production/nomad/loki-simple/job.nomad.hcl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variable "version" {
type = string
description = "Loki version"
default = "2.7.2"
default = "2.7.4"
}

job "loki" {
Expand Down
2 changes: 1 addition & 1 deletion production/nomad/loki/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion production/nomad/loki/job.nomad.hcl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variable "version" {
type = string
description = "Loki version"
default = "2.7.2"
default = "2.7.4"
}

job "loki" {
Expand Down

0 comments on commit 90f2534

Please sign in to comment.