Merging upstream version 1.33.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 14 insertions, 13 deletions

diff --git a/exporting/WALKTHROUGH.md b/exporting/WALKTHROUGH.md
index c17ee165..d6ede823 100644
--- a/exporting/WALKTHROUGH.md
+++ b/exporting/WALKTHROUGH.md
@@ -68,8 +68,9 @@ link](/packaging/installer/README.md), the Netdata devs give us several one-line
 any issues with these one liners and their bootstrapping scripts so far (If you guys run into anything do share). Run
 the following command in your container.
 
+<!-- candidate for reuse -->
 ```sh
-bash <(curl -Ss https://my-netdata.io/kickstart.sh) --dont-wait
+wget -O /tmp/netdata-kickstart.sh https://my-netdata.io/kickstart.sh && sh /tmp/netdata-kickstart.sh --dont-wait
 ```
 
 After the install completes you should be able to hit the Netdata dashboard at <http://localhost:19999/> (replace
diff --git a/exporting/prometheus/README.md b/exporting/prometheus/README.md
index ef6f6135..ceb778a4 100644
--- a/exporting/prometheus/README.md
+++ b/exporting/prometheus/README.md
@@ -2,15 +2,12 @@
 title: "Export metrics to Prometheus"
 description: "Export Netdata metrics to Prometheus for archiving and further analysis."
 custom_edit_url: https://github.com/netdata/netdata/edit/master/exporting/prometheus/README.md
-sidebar_label: Using Netdata with Prometheus
+sidebar_label: "Using Netdata with Prometheus"
 -->
+import { OneLineInstallWget, OneLineInstallCurl } from '../../../src/components/OneLineInstall/'
 
 # Using Netdata with Prometheus
 
-> IMPORTANT: the format Netdata sends metrics to Prometheus has changed since Netdata v1.7. The new Prometheus exporting
-> connector for Netdata supports a lot more features and is aligned to the development of the rest of the Netdata
-> exporting connectors.
-
 Prometheus is a distributed monitoring system which offers a very simple setup along with a robust data model. Recently
 Netdata added support for Prometheus. I'm going to quickly show you how to install both Netdata and Prometheus on the
 same server. We can then use Grafana pointed at Prometheus to obtain long term metrics Netdata offers. I'm assuming we
@@ -21,11 +18,17 @@ are starting at a fresh ubuntu shell (whether you'd like to follow along in a VM
 ### Installing Netdata
 
 There are number of ways to install Netdata according to [Installation](/packaging/installer/README.md). The suggested way
-of installing the latest Netdata and keep it upgrade automatically. Using one line installation:
+of installing the latest Netdata and keep it upgrade automatically.
 
-```sh
-bash <(curl -Ss https://my-netdata.io/kickstart.sh)
-```
+<!-- candidate for reuse -->
+
+To install Netdata, run the following as your normal user:
+
+<OneLineInstallWget/>
+
+Or, if you have cURL but not wget (such as on macOS):
+
+<OneLineInstallCurl/>
 
 At this point we should have Netdata listening on port 19999. Attempt to take your browser here:
 
@@ -208,9 +211,6 @@ this and click on 'targets' We should see the Netdata host as a scraped target.
 
 ## Netdata support for Prometheus
 
-> IMPORTANT: the format Netdata sends metrics to Prometheus has changed since Netdata v1.6. The new format allows easier
-> queries for metrics and supports both `as collected` and normalized metrics.
-
 Before explaining the changes, we have to understand the key differences between Netdata and Prometheus.
 
 ### understanding Netdata metrics