Merge branch 'release-1.4.1'

# Conflicts:
#	CHANGELOG.md
pull/1904/head
Edward Welch 5 years ago
commit 4d744f76b8
No known key found for this signature in database
GPG Key ID: 798419F3113EC5A5
  1. 9
      CHANGELOG.md
  2. 2
      docs/clients/promtail/installation.md
  3. 10
      docs/installation/docker.md
  4. 2
      docs/operations/loki-canary.md

@ -1,3 +1,12 @@
## 1.4.1 (2020-04-06)
We realized after the release last week that piping data into promtail was not working on Linux or Windows, this should fix this issue for both platforms:
* [1893](https://github.com/grafana/loki/pull/1893) **cyriltovena**: Removes file size check for pipe, not provided by linux.
Also thanks to @dottedmag for providing this fix for Fluent Bit!
* [1890](https://github.com/grafana/loki/pull/1890) **dottedmag**: fluentbit: JSON encoding: avoid base64 encoding of []byte inside other slices
## 1.4.0 (2020-04-01)

@ -12,7 +12,7 @@ Every release includes binaries for Promtail which can be found on the
```bash
# modify tag to most recent version
$ docker pull grafana/promtail:1.4.0
$ docker pull grafana/promtail:1.4.1
```
## Helm

@ -11,15 +11,15 @@ For production, we recommend Tanka or Helm.
## Install with Docker
```bash
$ wget https://raw.githubusercontent.com/grafana/loki/v1.4.0/cmd/loki/loki-local-config.yaml -O loki-config.yaml
$ docker run -v $(pwd):/mnt/config -p 3100:3100 grafana/loki:1.4.0 -config.file=/mnt/config/loki-config.yaml
$ wget https://raw.githubusercontent.com/grafana/loki/v1.4.0/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml
$ docker run -v $(pwd):/mnt/config -v /var/log:/var/log grafana/promtail:1.4.0 -config.file=/mnt/config/promtail-config.yaml
$ wget https://raw.githubusercontent.com/grafana/loki/v1.4.1/cmd/loki/loki-local-config.yaml -O loki-config.yaml
$ docker run -v $(pwd):/mnt/config -p 3100:3100 grafana/loki:1.4.1 -config.file=/mnt/config/loki-config.yaml
$ wget https://raw.githubusercontent.com/grafana/loki/v1.4.1/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml
$ docker run -v $(pwd):/mnt/config -v /var/log:/var/log grafana/promtail:1.4.1 -config.file=/mnt/config/promtail-config.yaml
```
## Install with Docker Compose
```bash
$ wget https://raw.githubusercontent.com/grafana/loki/v1.4.0/production/docker-compose.yaml -O docker-compose.yaml
$ wget https://raw.githubusercontent.com/grafana/loki/v1.4.1/production/docker-compose.yaml -O docker-compose.yaml
$ docker-compose -f docker-compose.yaml up
```

@ -67,7 +67,7 @@ Loki Canary is also provided as a Docker container image:
```bash
# change tag to the most recent release
$ docker pull grafana/loki-canary:1.4.0
$ docker pull grafana/loki-canary:1.4.1
```
### Kubernetes

Loading…
Cancel
Save