Merging upstream version 1.33.0.

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

2 files changed, 3 insertions, 3 deletions

diff --git a/backends/WALKTHROUGH.md b/backends/WALKTHROUGH.md
index 12eea2ee1..bb38e7c1c 100644
--- a/backends/WALKTHROUGH.md
+++ b/backends/WALKTHROUGH.md
@@ -62,7 +62,7 @@ command to run (/bin/bash) and then chooses the base container images (centos:la
 sitting inside the shell of the container.
 
 After we have entered the shell we can install Netdata. This process could not be easier. If you take a look at [this
-link](../packaging/installer/README.md), the Netdata devs give us several one-liners to install Netdata. I have not had
+link](/packaging/installer/README.md), the Netdata devs give us several one-liners to install Netdata. I have not had
 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.
 
@@ -214,7 +214,7 @@ the `chart` dimension. If you’d like you can combine the ‘chart’ and ‘in
 Let’s give this a try: `netdata_system_cpu_percentage_average{chart="system.cpu", instance="netdata:19999"}`
 
 This is the basics of using Prometheus to query Netdata. I’d advise everyone at this point to read [this
-page](../backends/prometheus/#using-netdata-with-prometheus). The key point here is that Netdata can export metrics from
+page](/backends/prometheus/README.md#using-netdata-with-prometheus). The key point here is that Netdata can export metrics from
 its internal DB or can send metrics “as-collected” by specifying the ‘source=as-collected’ url parameter like so.
 <http://localhost:19999/api/v1/allmetrics?format=prometheus&help=yes&types=yes&source=as-collected> If you choose to use
 this method you will need to use Prometheus's set of functions here: <https://prometheus.io/docs/querying/functions/> to
diff --git a/backends/prometheus/remote_write/remote_write.cc b/backends/prometheus/remote_write/remote_write.cc
index 9448595c1..b919cffad 100644
--- a/backends/prometheus/remote_write/remote_write.cc
+++ b/backends/prometheus/remote_write/remote_write.cc
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include <snappy.h>
-#include "remote_write.pb.h"
+#include "exporting/prometheus/remote_write/remote_write.pb.h"
 #include "remote_write.h"
 
 using namespace prometheus;