simplify the release page and instructions on installing and working …

…with binaries to remove our opinionated installation path. (#1290)
grafana · Nov 20, 2019 · 12538b0 · 12538b0
1 parent b5c03b0
commit 12538b0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 46 deletions.
diff --git a/docs/clients/promtail/installation.md b/docs/clients/promtail/installation.md
@@ -5,19 +5,7 @@ Promtail is distributed as a [binary](#binary), [Docker container](#docker), and
 
 ## Binary
 
-Every Loki release includes binaries for Promtail:
-
-```bash
-# download a binary (modify app, os, and arch as needed)
-# Installs v0.4.0. Go to the releases page for the latest version
-$ curl -fSL -o "/usr/local/bin/promtail.gz" "https://github.com/grafana/loki/releases/download/v0.4.0/promtail-linux-amd64.gz"
-$ gunzip "/usr/local/bin/promtail.gz"
-
-# make sure it is executable
-$ chmod a+x "/usr/local/bin/promtail"
-```
-
-Binaries for macOS and Windows are also provided at the
+Every release includes binaries for Promtail which can be found on the
 [Releases page](https://github.com/grafana/loki/releases).
 
 ## Docker

diff --git a/docs/getting-started/logcli.md b/docs/getting-started/logcli.md
@@ -7,18 +7,8 @@ queries against a Loki server.
 
 ### Binary (Recommended)
 
-Navigate to the [Loki Releases page](https://github.com/grafana/loki/releases)
-and download the `logcli` binary for your OS:
-
-```bash
-# download a binary (adapt app, os and arch as needed)
-# installs v0.4.0. For up to date URLs refer to the release's description
-$ curl -fSL -o "/usr/local/bin/logcli.gz" "https://github.com/grafana/logcli/releases/download/v0.4.0/logcli-linux-amd64.gz"
-$ gunzip "/usr/local/bin/logcli.gz"
-
-# make sure it is executable
-$ chmod a+x "/usr/local/bin/logcli"
-```
+Every release includes binaries for `logcli` which can be found on the
+[Releases page](https://github.com/grafana/loki/releases).
 
 ### From source
 

diff --git a/docs/installation/local.md b/docs/installation/local.md
@@ -2,18 +2,9 @@
 
 ## Release Binaries
 
-Every [Loki release](https://github.com/grafana/loki/releases) includes
-prebuilt binaries:
+Every release includes binaries for Loki which can be found on the
+[Releases page](https://github.com/grafana/loki/releases).
 
-```bash
-# download a binary (modify app, os, and arch as needed)
-# Installs v0.4.0. Go to the releases page for the latest version
-$ curl -fSL -o "/usr/local/bin/loki.gz" "https://github.com/grafana/loki/releases/download/v0.4.0/loki-linux-amd64.gz"
-$ gunzip "/usr/local/bin/loki.gz"
-
-# make sure it is executable
-$ chmod a+x "/usr/local/bin/loki"
-```
 
 ## Community openSUSE Linux packages
 

diff --git a/tools/release-note.md b/tools/release-note.md
@@ -6,20 +6,27 @@ This is release `${CIRCLE_TAG}` of Loki.
 ### Installation:
 The components of Loki are currently distributed in plain binary form and as Docker container images. Choose what fits your use-case best.
 
-#### Binary:
-```bash
-# download a binary (adapt app, os and arch as needed)
-$ curl -fSL -o "/usr/local/bin/loki.gz" "https://github.com/grafana/loki/releases/download/${CIRCLE_TAG}/loki-linux-amd64.gz"
-$ gunzip "/usr/local/bin/loki.gz"
-
-# make sure it is executable
-$ chmod a+x "/usr/local/bin/loki"
-```
-
 #### Docker container:
 * https://hub.docker.com/r/grafana/loki
 * https://hub.docker.com/r/grafana/promtail
 ```bash
 $ docker pull "grafana/loki:${CIRCLE_TAG}"
 $ docker pull "grafana/promtail:${CIRCLE_TAG}"
 ```
+
+#### Binary:
+
+Choose from the assets below for the application and architecture matching your system.
+
+Example for `Loki` on the `linux` operating system and `amd64` architecture:
+
+```bash
+# curl -L "https://github.com/grafana/loki/releases/download/${CIRCLE_TAG}/loki-linux-amd64.gz
+
+# extract the binary
+$ gunzip "loki-linux-amd64.gz"
+
+# make sure it is executable
+$ chmod a+x "loki-linux-amd64"
+```
+