Skip to content

Commit

Permalink
updated versions to the latest release v2.7.1 (grafana#7940)
Browse files Browse the repository at this point in the history
Signed-off-by: irizzant <[email protected]>

**What this PR does / why we need it**:
This PR updates Loki version to v2.7.1

**Which issue(s) this PR fixes**:
Fixes grafana#7768

Signed-off-by: irizzant <[email protected]>
  • Loading branch information
irizzant authored Dec 29, 2022
1 parent 0f139e2 commit ff7b462
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 25 deletions.
10 changes: 5 additions & 5 deletions docs/sources/installation/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,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.6.1/cmd/loki/loki-local-config.yaml -O loki-config.yaml
wget https://raw.githubusercontent.com/grafana/loki/v2.7.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
wget https://raw.githubusercontent.com/grafana/loki/v2.7.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
```

Expand All @@ -39,9 +39,9 @@ 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.6.1/cmd/loki/loki-local-config.yaml -O loki-config.yaml
wget https://raw.githubusercontent.com/grafana/loki/v2.7.1/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.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
wget https://raw.githubusercontent.com/grafana/loki/v2.7.1/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.6.1 --config.file=/mnt/config/promtail-config.yaml
```

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.6.1/production/docker-compose.yaml -O docker-compose.yaml
wget https://raw.githubusercontent.com/grafana/loki/v2.7.1/production/docker-compose.yaml -O docker-compose.yaml
docker-compose -f docker-compose.yaml up
```
6 changes: 3 additions & 3 deletions examples/getting-started/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ networks:

services:
read:
image: grafana/loki:2.6.1
image: grafana/loki:2.7.1
command: "-config.file=/etc/loki/config.yaml -target=read"
ports:
- 3101:3100
Expand All @@ -27,7 +27,7 @@ services:
- loki

write:
image: grafana/loki:2.6.1
image: grafana/loki:2.7.1
command: "-config.file=/etc/loki/config.yaml -target=write"
ports:
- 3102:3100
Expand All @@ -46,7 +46,7 @@ services:
<<: *loki-dns

promtail:
image: grafana/promtail:2.6.1
image: grafana/promtail:2.7.1
volumes:
- ./promtail-local-config.yaml:/etc/promtail/config.yaml:ro
- /var/run/docker.sock:/var/run/docker.sock
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.6.1
image: grafana/loki:2.7.1
user: root
entrypoint:
- "chown"
Expand Down Expand Up @@ -72,7 +72,7 @@ services:
- ./loki/:/var/log/

promtail:
image: grafana/promtail:2.6.1
image: grafana/promtail:2.7.1
volumes:
- ./loki/:/var/log/
- ./config:/etc/promtail/
Expand Down Expand Up @@ -114,7 +114,7 @@ services:
- loki

loki-frontend:
image: grafana/loki:2.6.1
image: grafana/loki:2.7.1
volumes:
- ./config:/etc/loki/
ports:
Expand All @@ -127,7 +127,7 @@ services:
replicas: 2

loki-read:
image: grafana/loki:2.6.1
image: grafana/loki:2.7.1
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.6.1
image: grafana/loki:2.7.1
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.6.1',
loki_canary: 'grafana/loki-canary:2.7.1',
},
}
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.6.1',
loki: 'grafana/loki:2.7.1',
},

_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.6.1',
loki: 'grafana/loki:2.7.1',

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.6.1',
loki: 'grafana/loki:2.7.1',

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.6.1',
promtail: 'grafana/promtail:2.7.1',
},

_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.6.1" job.nomad.hcl
nomad job run -var="version=2.7.1" 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.6.1"
default = "2.7.1"
}

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.6.1" job.nomad.hcl
nomad job run -var="version=2.7.1" 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.6.1"
default = "2.7.1"
}

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.6.1" job.nomad.hcl
nomad job run -var="version=2.7.1" 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.6.1"
default = "2.7.1"
}

job "loki" {
Expand Down
2 changes: 1 addition & 1 deletion tools/promtail.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ INSTANCEURL="${3:-}"
NAMESPACE="${4:-default}"
CONTAINERROOT="${5:-/var/lib/docker}"
PARSER="${6:-- docker:}"
VERSION="${PROMTAIL_VERSION:-2.7.0}"
VERSION="${PROMTAIL_VERSION:-2.7.1}"

if [ -z "${INSTANCEID}" ] || [ -z "${APIKEY}" ] || [ -z "${INSTANCEURL}" ] || [ -z "${NAMESPACE}" ] || [ -z "${CONTAINERROOT}" ] || [ -z "${PARSER}" ]; then
echo "usage: $0 <instanceId> <apiKey> <url> [<namespace>[<container_root_path>[<parser>]]]"
Expand Down

0 comments on commit ff7b462

Please sign in to comment.