updated versions to the latest release v2.6.1 (#6703)

pull/6703/merge
Vladyslav Diachenko 4 years ago committed by GitHub
parent 7446f2498f
commit b39e4900ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 18
      docs/sources/installation/docker.md
  2. 6
      examples/getting-started/docker-compose.yaml
  3. 4
      production/docker-compose.yaml
  4. 2
      production/ksonnet/loki-canary/config.libsonnet
  5. 2
      production/ksonnet/loki-simple-scalable/example/main.jsonnet
  6. 2
      production/ksonnet/loki-simple-scalable/images.libsonnet
  7. 2
      production/ksonnet/loki/images.libsonnet
  8. 2
      production/ksonnet/promtail/config.libsonnet
  9. 2
      production/nomad/loki-distributed/README.md
  10. 2
      production/nomad/loki-distributed/job.nomad.hcl
  11. 2
      production/nomad/loki-simple/README.md
  12. 2
      production/nomad/loki-simple/job.nomad.hcl
  13. 2
      production/nomad/loki/README.md
  14. 2
      production/nomad/loki/job.nomad.hcl
  15. 2
      tools/promtail.sh

@ -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 "<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.
@ -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,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

@ -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

@ -1,5 +1,5 @@
{
_images+:: {
loki_canary: 'grafana/loki-canary:2.5.0',
loki_canary: 'grafana/loki-canary:2.6.1',
},
}

@ -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+:: {

@ -1,6 +1,6 @@
{
_images+:: {
loki: 'grafana/loki:2.5.0',
loki: 'grafana/loki:2.6.1',
read: self.loki,
write: self.loki,

@ -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,

@ -1,6 +1,6 @@
{
_images+:: {
promtail: 'grafana/promtail:2.5.0',
promtail: 'grafana/promtail:2.6.1',
},
_config+:: {

@ -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

@ -1,7 +1,7 @@
variable "version" {
type = string
description = "Loki version"
default = "2.5.0"
default = "2.6.1"
}
job "loki" {

@ -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

@ -1,7 +1,7 @@
variable "version" {
type = string
description = "Loki version"
default = "2.5.0"
default = "2.6.1"
}
job "loki" {

@ -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

@ -1,7 +1,7 @@
variable "version" {
type = string
description = "Loki version"
default = "2.5.0"
default = "2.6.1"
}
job "loki" {

@ -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>]]]"

Loading…
Cancel
Save