From 31c37ea2183ae748242dce1fadacd512d6674651 Mon Sep 17 00:00:00 2001 From: Paul Rogers <129207811+paul1r@users.noreply.github.com> Date: Fri, 17 Jan 2025 12:54:28 -0500 Subject: [PATCH] chore(docs): Version updates for Loki install information (#15808) --- docs/sources/setup/install/docker.md | 22 +++++++++---------- .../setup/install/install-from-source.md | 2 +- docs/sources/setup/install/local.md | 2 +- docs/sources/setup/install/tanka.md | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/sources/setup/install/docker.md b/docs/sources/setup/install/docker.md index 3cda6aeaca29b..89b08287031c1 100644 --- a/docs/sources/setup/install/docker.md +++ b/docs/sources/setup/install/docker.md @@ -30,15 +30,15 @@ The configuration files associated with these installation instructions run Loki 1. Copy and paste the following commands into your command line to download `loki-local-config.yaml` and `promtail-docker-config.yaml` to your `loki` directory. ```bash - wget https://raw.githubusercontent.com/grafana/loki/v3.0.0/cmd/loki/loki-local-config.yaml -O loki-config.yaml - wget https://raw.githubusercontent.com/grafana/loki/v3.0.0/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml + wget https://raw.githubusercontent.com/grafana/loki/v3.3.2/cmd/loki/loki-local-config.yaml -O loki-config.yaml + wget https://raw.githubusercontent.com/grafana/loki/v3.3.2/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml ``` 1. Copy and paste the following commands into your command line to start the Docker containers using the configuration files you downloaded in the previous step. ```bash - docker run --name loki -d -v $(pwd):/mnt/config -p 3100:3100 grafana/loki:3.2.1 -config.file=/mnt/config/loki-config.yaml - docker run --name promtail -d -v $(pwd):/mnt/config -v /var/log:/var/log --link loki grafana/promtail:3.2.1 -config.file=/mnt/config/promtail-config.yaml + docker run --name loki -d -v $(pwd):/mnt/config -p 3100:3100 grafana/loki:3.3.2 -config.file=/mnt/config/loki-config.yaml + docker run --name promtail -d -v $(pwd):/mnt/config -v /var/log:/var/log --link loki grafana/promtail:3.3.2 -config.file=/mnt/config/promtail-config.yaml ``` {{< admonition type="note" >}} @@ -56,8 +56,8 @@ The configuration files associated with these installation instructions run Loki ```bash CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES - 9485de9ad351 grafana/promtail:3.2.1 "/usr/bin/promtail -…" About a minute ago Up About a minute promtail - cece1df84519 grafana/loki:3.2.1 "/usr/bin/loki -conf…" About a minute ago Up About a minute 0.0.0.0:3100->3100/tcp, :::3100->3100/tcp loki + 9485de9ad351 grafana/promtail:3.3.2 "/usr/bin/promtail -…" About a minute ago Up About a minute promtail + cece1df84519 grafana/loki:3.3.2 "/usr/bin/loki -conf…" About a minute ago Up About a minute 0.0.0.0:3100->3100/tcp, :::3100->3100/tcp loki ``` 1. Verify that Loki is up and running. @@ -71,15 +71,15 @@ The configuration files associated with these installation instructions run Loki ```bash cd "" -wget https://raw.githubusercontent.com/grafana/loki/v3.0.0/cmd/loki/loki-local-config.yaml -O loki-config.yaml -wget https://raw.githubusercontent.com/grafana/loki/v3.0.0/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v3.3.2/cmd/loki/loki-local-config.yaml -O loki-config.yaml +wget https://raw.githubusercontent.com/grafana/loki/v3.3.2/clients/cmd/promtail/promtail-docker-config.yaml -O promtail-config.yaml ``` 1. Copy and paste the following commands into your command line to start the Docker containers using the configuration files you downloaded in the previous step. Note that you will need to replace the `` in the commands with your local path. ```bash -docker run --name loki -v :/mnt/config -p 3100:3100 grafana/loki:3.2.1 --config.file=/mnt/config/loki-config.yaml -docker run -v :/mnt/config -v /var/log:/var/log --link loki grafana/promtail:3.2.1 --config.file=/mnt/config/promtail-config.yaml +docker run --name loki -v :/mnt/config -p 3100:3100 grafana/loki:3.3.2 --config.file=/mnt/config/loki-config.yaml +docker run -v :/mnt/config -v /var/log:/var/log --link loki grafana/promtail:3.3.2 --config.file=/mnt/config/promtail-config.yaml ``` 1. Verify that Loki is up and running. @@ -101,7 +101,7 @@ Run the following commands in your command line. They work for Windows or Linux 1. Copy and paste the following command into your command line to download the `docker-compose` file. ```bash - wget https://raw.githubusercontent.com/grafana/loki/v3.0.0/production/docker-compose.yaml -O docker-compose.yaml + wget https://raw.githubusercontent.com/grafana/loki/v3.3.2/production/docker-compose.yaml -O docker-compose.yaml ``` 1. With `loki` as the current working directory, run the following 'docker-compose` command: diff --git a/docs/sources/setup/install/install-from-source.md b/docs/sources/setup/install/install-from-source.md index d7f8350262a33..a1dbaa8af542c 100644 --- a/docs/sources/setup/install/install-from-source.md +++ b/docs/sources/setup/install/install-from-source.md @@ -13,7 +13,7 @@ to build Loki from source. ## Prerequisites -- [Go](https://golang.org/), version 1.14 or later; +- [Go](https://golang.org/), version 1.22 or later; set your `$GOPATH` environment variable - `make` - Docker (for updating protobuf and yacc files) diff --git a/docs/sources/setup/install/local.md b/docs/sources/setup/install/local.md index f8fbaecd1c388..dd52871ee1578 100644 --- a/docs/sources/setup/install/local.md +++ b/docs/sources/setup/install/local.md @@ -47,7 +47,7 @@ The configuration runs Loki as a single binary. Copy and paste the following commands into your command line to download generic configuration files. Use the Git references that match your downloaded Loki version to get the correct configuration file. - For example, if you are using Loki version 2.9.2, you need to use the `https://raw.githubusercontent.com/grafana/loki/v2.9.2/cmd/loki/loki-local-config.yaml` URL to download the configuration file. + For example, if you are using Loki version 3.3.2, you need to use the `https://raw.githubusercontent.com/grafana/loki/v3.3.2/cmd/loki/loki-local-config.yaml` URL to download the configuration file. ``` wget https://raw.githubusercontent.com/grafana/loki/main/cmd/loki/loki-local-config.yaml diff --git a/docs/sources/setup/install/tanka.md b/docs/sources/setup/install/tanka.md index 043a3895892be..c00194989b763 100644 --- a/docs/sources/setup/install/tanka.md +++ b/docs/sources/setup/install/tanka.md @@ -16,7 +16,7 @@ The Tanka installation runs the Loki cluster in microservices mode. ## Prerequisites -Install the latest version of Tanka (version v0.17.1 or a more recent version) for the `tk env` +Install the latest version of Tanka (version v0.29.0 or a more recent version) for the `tk env` commands. Prebuilt binaries for Tanka can be found at the [Tanka releases URL](https://github.com/grafana/tanka/releases). @@ -35,7 +35,7 @@ Install `jsonnet-bundler` (`jb`), find instructions for your platform in Tanka's ## Deploying -Download and install the Loki and Promtail module using `jb` (version v0.4.0 or a more recent version): +Download and install the Loki and Promtail module using `jb` (version v0.6.0 or a more recent version): ```bash jb init # not required if you already ran `tk init`