Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updated versions to the latest release v2.6.1 #6703

Merged
merged 1 commit into from
Jul 18, 2022
Merged

updated versions to the latest release v2.6.1 #6703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions docs/sources/installation/docker.md
View file
Open in desktop
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.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.
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.5.0/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.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 <local-path>:/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 <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
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
```

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.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
```
6 changes: 3 additions & 3 deletions examples/getting-started/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions production/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ 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
networks:
- 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
Expand Down
2 changes: 1 addition & 1 deletion production/ksonnet/loki-canary/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
_images+:: {
loki_canary: 'grafana/loki-canary:2.5.0',
loki_canary: 'grafana/loki-canary:2.6.1',
},
}
2 changes: 1 addition & 1 deletion production/ksonnet/loki-simple-scalable/example/main.jsonnet
View file
Open in desktop
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.5.0',
loki: 'grafana/loki:2.6.1',
},

_config+:: {
Expand Down
2 changes: 1 addition & 1 deletion production/ksonnet/loki-simple-scalable/images.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
_images+:: {
loki: 'grafana/loki:2.5.0',
loki: 'grafana/loki:2.6.1',

read: self.loki,
write: self.loki,
Expand Down
2 changes: 1 addition & 1 deletion production/ksonnet/loki/images.libsonnet
View file
Open in desktop
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.5.0',
loki: 'grafana/loki:2.6.1',

distributor: self.loki,
ingester: self.loki,
Expand Down
2 changes: 1 addition & 1 deletion production/ksonnet/promtail/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
_images+:: {
promtail: 'grafana/promtail:2.5.0',
promtail: 'grafana/promtail:2.6.1',
},

_config+:: {
Expand Down
2 changes: 1 addition & 1 deletion production/nomad/loki-distributed/README.md
View file
Open in desktop
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.5.0" job.nomad.hcl
nomad job run -var="version=2.6.1" job.nomad.hcl
```

### Scale Loki
Expand Down
2 changes: 1 addition & 1 deletion production/nomad/loki-distributed/job.nomad.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variable "version" {
type = string
description = "Loki version"
default = "2.5.0"
default = "2.6.1"
}

job "loki" {
Expand Down
2 changes: 1 addition & 1 deletion production/nomad/loki-simple/README.md
View file
Open in desktop
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.5.0" job.nomad.hcl
nomad job run -var="version=2.6.1" job.nomad.hcl
```

### Scale Loki
Expand Down
2 changes: 1 addition & 1 deletion production/nomad/loki-simple/job.nomad.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variable "version" {
type = string
description = "Loki version"
default = "2.5.0"
default = "2.6.1"
}

job "loki" {
Expand Down
2 changes: 1 addition & 1 deletion production/nomad/loki/README.md
View file
Open in desktop
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.5.0" job.nomad.hcl
nomad job run -var="version=2.6.1" job.nomad.hcl
```

### Scale Loki
Expand Down
2 changes: 1 addition & 1 deletion production/nomad/loki/job.nomad.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variable "version" {
type = string
description = "Loki version"
default = "2.5.0"
default = "2.6.1"
}

job "loki" {
Expand Down
2 changes: 1 addition & 1 deletion tools/promtail.sh
View file
Open in desktop
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.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 <instanceId> <apiKey> <url> [<namespace>[<container_root_path>[<parser>]]]"
Expand Down