Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

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

1 files changed, 44 insertions, 55 deletions

diff --git a/src/collectors/REFERENCE.md b/src/collectors/REFERENCE.md
index e480a16d8..af745013c 100644
--- a/src/collectors/REFERENCE.md
+++ b/src/collectors/REFERENCE.md
@@ -1,32 +1,23 @@
-<!--
-title: "Collectors configuration reference"
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/collectors/REFERENCE.md"
-sidebar_label: "Collectors configuration"
-learn_status: "Published"
-learn_topic_type: "Tasks"
-learn_rel_path: "Configuration"
--->
-
 # Collectors configuration reference
 
-The list of supported collectors can be found in [the documentation](/src/collectors/COLLECTORS.md), 
-and on [our website](https://www.netdata.cloud/integrations). The documentation of each collector provides all the 
-necessary configuration options and prerequisites for that collector. In most cases, either the charts are automatically generated 
+The list of supported collectors can be found in [the documentation](/src/collectors/COLLECTORS.md),
+and on [our website](https://www.netdata.cloud/integrations). The documentation of each collector provides all the
+necessary configuration options and prerequisites for that collector. In most cases, either the charts are automatically generated
 without any configuration, or you just fulfil those prerequisites and [configure the collector](#configure-a-collector).
 
-If the application you are interested in monitoring is not listed in our integrations, the collectors list includes 
-the available options to 
+If the application you are interested in monitoring is not listed in our integrations, the collectors list includes
+the available options to
 [add your application to Netdata](https://github.com/netdata/netdata/edit/master/src/collectors/COLLECTORS.md#add-your-application-to-netdata).
 
-If we do support your collector but the charts described in the documentation don't appear on your dashboard, the reason will 
+If we do support your collector but the charts described in the documentation don't appear on your dashboard, the reason will
 be one of the following:
 
--   The entire data collection plugin is disabled by default. Read how to [enable and disable plugins](#enable-and-disable-plugins)
+- The entire data collection plugin is disabled by default. Read how to [enable and disable plugins](#enable-and-disable-plugins)
 
--   The data collection plugin is enabled, but a specific data collection module is disabled. Read how to
-    [enable and disable a specific collection module](#enable-and-disable-a-specific-collection-module). 
+- The data collection plugin is enabled, but a specific data collection module is disabled. Read how to
+    [enable and disable a specific collection module](#enable-and-disable-a-specific-collection-module).
 
--   Autodetection failed. Read how to [configure](#configure-a-collector) and [troubleshoot](#troubleshoot-a-collector) a collector.
+- Autodetection failed. Read how to [configure](#configure-a-collector) and [troubleshoot](#troubleshoot-a-collector) a collector.
 
 ## Enable and disable plugins
 
@@ -34,28 +25,28 @@ You can enable or disable individual plugins by opening `netdata.conf` and scrol
 This section features a list of Netdata's plugins, with a boolean setting to enable or disable them. The exception is
 `statsd.plugin`, which has its own `[statsd]` section. Your `[plugins]` section should look similar to this:
 
-```conf
+```text
 [plugins]
-	# timex = yes
-	# idlejitter = yes
-	# netdata monitoring = yes
-	# tc = yes
-	# diskspace = yes
-	# proc = yes
-	# cgroups = yes
-	# enable running new plugins = yes
-	# check for new plugins every = 60
-	# slabinfo = no
-	# python.d = yes
-	# perf = yes
-	# ioping = yes
-	# fping = yes
-	# nfacct = yes
-	# go.d = yes
-	# apps = yes
-	# ebpf = yes
-	# charts.d = yes
-	# statsd = yes
+    # timex = yes
+    # idlejitter = yes
+    # netdata monitoring = yes
+    # tc = yes
+    # diskspace = yes
+    # proc = yes
+    # cgroups = yes
+    # enable running new plugins = yes
+    # check for new plugins every = 60
+    # slabinfo = no
+    # python.d = yes
+    # perf = yes
+    # ioping = yes
+    # fping = yes
+    # nfacct = yes
+    # go.d = yes
+    # apps = yes
+    # ebpf = yes
+    # charts.d = yes
+    # statsd = yes
 ```
 
 By default, most plugins are enabled, so you don't need to enable them explicitly to use their collectors. To enable or
@@ -63,11 +54,11 @@ disable any specific plugin, remove the comment (`#`) and change the boolean set
 
 ## Enable and disable a specific collection module
 
-You can enable/disable of the collection modules supported by `go.d`, `python.d` or `charts.d` individually, using the 
-configuration file of that orchestrator. For example, you can change the behavior of the Go orchestrator, or any of its 
+You can enable/disable of the collection modules supported by `go.d`, `python.d` or `charts.d` individually, using the
+configuration file of that orchestrator. For example, you can change the behavior of the Go orchestrator, or any of its
 collectors, by editing `go.d.conf`.
 
-Use `edit-config` from your [Netdata config directory](/docs/netdata-agent/configuration/README.md#the-netdata-config-directory) 
+Use `edit-config` from your [Netdata config directory](/docs/netdata-agent/configuration/README.md#the-netdata-config-directory)
 to open the orchestrator primary configuration file:
 
 ```bash
@@ -79,20 +70,19 @@ Within this file, you can either disable the orchestrator entirely (`enabled: ye
 enable/disable it with `yes` and `no` settings. Uncomment any line you change to ensure the Netdata daemon reads it on
 start.
 
-After you make your changes, restart the Agent with `sudo systemctl restart netdata`, or the [appropriate
-method](/packaging/installer/README.md#maintaining-a-netdata-agent-installation) for your system.
+After you make your changes, restart the Agent with the [appropriate method](/docs/netdata-agent/start-stop-restart.md) for your system.
 
 ## Configure a collector
 
 Most collector modules come with **auto-detection**, configured to work out-of-the-box on popular operating systems with
-the default settings. 
+the default settings.
 
 However, there are cases that auto-detection fails. Usually, the reason is that the applications to be monitored do not
 allow Netdata to connect. In most of the cases, allowing the user `netdata` from `localhost` to connect and collect
 metrics, will automatically enable data collection for the application in question (it will require a Netdata restart).
 
 When Netdata starts up, each collector searches for exposed metrics on the default endpoint established by that service
-or application's standard installation procedure. For example, 
+or application's standard installation procedure. For example,
 the [Nginx collector](/src/go/plugin/go.d/modules/nginx/README.md) searches at
 `http://127.0.0.1/stub_status` for exposed metrics in the correct format. If an Nginx web server is running and exposes
 metrics on that endpoint, the collector begins gathering them.
@@ -100,12 +90,12 @@ metrics on that endpoint, the collector begins gathering them.
 However, not every node or infrastructure uses standard ports, paths, files, or naming conventions. You may need to
 enable or configure a collector to gather all available metrics from your systems, containers, or applications.
 
-First, [find the collector](/src/collectors/COLLECTORS.md) you want to edit 
-and open its documentation. Some software has collectors written in multiple languages. In these cases, you should always 
+First, [find the collector](/src/collectors/COLLECTORS.md) you want to edit
+and open its documentation. Some software has collectors written in multiple languages. In these cases, you should always
 pick the collector written in Go.
 
-Use `edit-config` from your 
-[Netdata config directory](/docs/netdata-agent/configuration/README.md#the-netdata-config-directory) 
+Use `edit-config` from your
+[Netdata config directory](/docs/netdata-agent/configuration/README.md#the-netdata-config-directory)
 to open a collector's configuration file. For example, edit the Nginx collector with the following:
 
 ```bash
@@ -117,8 +107,7 @@ according to your needs. In addition, every collector's documentation shows the
 configure that collector. Uncomment any line you change to ensure the collector's orchestrator or the Netdata daemon
 read it on start.
 
-After you make your changes, restart the Agent with `sudo systemctl restart netdata`, or the [appropriate
-method](/packaging/installer/README.md#maintaining-a-netdata-agent-installation) for your system.
+After you make your changes, restart the Agent with the [appropriate method](/docs/netdata-agent/start-stop-restart.md) for your system.
 
 ## Troubleshoot a collector
 
@@ -131,7 +120,7 @@ cd /usr/libexec/netdata/plugins.d/
 sudo su -s /bin/bash netdata
 ```
 
-The next step is based on the collector's orchestrator. 
+The next step is based on the collector's orchestrator.
 
 ```bash
 # Go orchestrator (go.d.plugin)
@@ -145,5 +134,5 @@ The next step is based on the collector's orchestrator.
 ```
 
 The output from the relevant command will provide valuable troubleshooting information. If you can't figure out how to
-enable the collector using the details from this output, feel free to [join our Discord server](https://discord.com/invite/2mEmfW735j), 
+enable the collector using the details from this output, feel free to [join our Discord server](https://discord.com/invite/2mEmfW735j),
 to get help from our experts.