Merging upstream version 1.39.0.

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

2 files changed, 25 insertions, 3 deletions

diff --git a/collectors/python.d.plugin/icecast/README.md b/collectors/python.d.plugin/icecast/README.md
index 6fca34ba6..25bbf738e 100644
--- a/collectors/python.d.plugin/icecast/README.md
+++ b/collectors/python.d.plugin/icecast/README.md
@@ -4,10 +4,10 @@ custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/pyth
 sidebar_label: "Icecast"
 learn_status: "Published"
 learn_topic_type: "References"
-learn_rel_path: "References/Collectors references/Networking"
+learn_rel_path: "Integrations/Monitor/Networking"
 -->
 
-# Icecast monitoring with Netdata
+# Icecast collector
 
 Monitors the number of listeners for active sources.
 
@@ -42,6 +42,26 @@ remote:
 
 Without configuration, module attempts to connect to `http://localhost:8443/status-json.xsl`
 
----
 
 
+
+### Troubleshooting
+
+To troubleshoot issues with the `icecast` module, run the `python.d.plugin` with the debug option enabled. The 
+output will give you the output of the data collection job or error messages on why the collector isn't working.
+
+First, navigate to your plugins directory, usually they are located under `/usr/libexec/netdata/plugins.d/`. If that's 
+not the case on your system, open `netdata.conf` and look for the setting `plugins directory`. Once you're in the 
+plugin's directory, switch to the `netdata` user.
+
+```bash
+cd /usr/libexec/netdata/plugins.d/
+sudo su -s /bin/bash netdata
+```
+
+Now you can manually run the `icecast` module in debug mode:
+
+```bash
+./python.d.plugin icecast debug trace
+```
+
diff --git a/collectors/python.d.plugin/icecast/metrics.csv b/collectors/python.d.plugin/icecast/metrics.csv
new file mode 100644
index 000000000..e05c0504a
--- /dev/null
+++ b/collectors/python.d.plugin/icecast/metrics.csv
@@ -0,0 +1,2 @@
+metric,scope,dimensions,unit,description,chart_type,labels,plugin,module
+icecast.listeners,,a dimension for each active source,listeners,Number Of Listeners,line,,python.d.plugin,icecast