Skip to content

Commit

Permalink
update docs references from 2.4 -> 2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorwhitney authored and splitice committed May 21, 2022
1 parent 702a91a commit f0253e6
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 12 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://github.com/raw/grafana/loki/v2.4.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.4.2 -config.file=/mnt/config/loki-config.yaml
wget https://github.com/raw/grafana/loki/v2.4.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.4.2 -config.file=/mnt/config/promtail-config.yaml
wget https://github.com/raw/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://github.com/raw/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
```

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://github.com/raw/grafana/loki/v2.4.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.4.2 --config.file=/mnt/config/loki-config.yaml
wget https://github.com/raw/grafana/loki/v2.4.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.4.2 --config.file=/mnt/config/promtail-config.yaml
wget https://github.com/raw/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://github.com/raw/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
```

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://github.com/raw/grafana/loki/v2.4.2/production/docker-compose.yaml -O docker-compose.yaml
wget https://github.com/raw/grafana/loki/v2.5.0/production/docker-compose.yaml -O docker-compose.yaml
docker-compose -f docker-compose.yaml up
```
2 changes: 1 addition & 1 deletion docs/sources/maintaining/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Loki docs are versioned. Follow the below steps to version Loki docs for this re
>NOTE: Here $LOCAL_LOKI_PATH is your local path where Loki is checked out with correct $VERSION

1. Clone Grafana website [repo](https://github.com/grafana/website)
1. Create new branch `git checkout -b $VERSION` (replace `$VERSION` with current release version. e.g: `v2.4.2`)
1. Create new branch `git checkout -b $VERSION` (replace `$VERSION` with current release version. e.g: `v2.5.0`)
1. Run `mv content/docs/loki/next content/docs/loki/next.main`
1. Run `mkdir content/docs/loki/next`
1. Run `cp -R $LOCAL_LOKI_PATH/docs/sources/* content/docs/loki/next`
Expand Down
1 change: 1 addition & 0 deletions docs/sources/release-notes/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ weight: 100
Release notes for Loki are in the CHANGELOG for the release and
listed here by version number.

- [V2.5 release notes](../release-notes/v2-5/)
- [V2.4 release notes](../release-notes/v2-4/)
- [V2.3 release notes](../release-notes/v2-3/)
6 changes: 6 additions & 0 deletions docs/sources/release-notes/v2-5.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: V2.5
weight: 88
---

# Version 2.5 release notes
4 changes: 2 additions & 2 deletions docs/sources/upgrading/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ If possible try to stay current and do sequential updates. If you want to skip v
Using docker you can check changes between 2 versions of Loki with a command like this:

```
export OLD_LOKI=2.3.0
export NEW_LOKI=2.4.1
export OLD_LOKI=2.4.2
export NEW_LOKI=2.5.0
export CONFIG_FILE=loki-local-config.yaml
diff --color=always --side-by-side <(docker run --rm -t -v "${PWD}":/config grafana/loki:${OLD_LOKI} -config.file=/config/${CONFIG_FILE} -print-config-stderr 2>&1 | sed '/Starting Loki/q' | tr -d '\r') <(docker run --rm -t -v "${PWD}":/config grafana/loki:${NEW_LOKI} -config.file=/config/${CONFIG_FILE} -print-config-stderr 2>&1 | sed '/Starting Loki/q' | tr -d '\r') | less -R
```
Expand Down

0 comments on commit f0253e6

Please sign in to comment.