Adding upstream version 1.39.0.upstream/1.39.0

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

3 files changed, 37 insertions, 4 deletions

diff --git a/collectors/python.d.plugin/monit/README.md b/collectors/python.d.plugin/monit/README.md
index 816143ebf..f762de0d3 100644
--- a/collectors/python.d.plugin/monit/README.md
+++ b/collectors/python.d.plugin/monit/README.md
@@ -4,10 +4,10 @@ custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/pyth
 sidebar_label: "Monit"
 learn_status: "Published"
 learn_topic_type: "References"
-learn_rel_path: "References/Collectors references/Storage"
+learn_rel_path: "Integrations/Monitor/Storage"
 -->
 
-# Monit monitoring with Netdata
+# Monit collector
 
 Monit monitoring module. Data is grabbed from stats XML interface (exists for a long time, but not mentioned in official
 documentation). Mostly this plugin shows statuses of monit targets, i.e.
@@ -53,6 +53,26 @@ local:
 
 If no configuration is given, module will attempt to connect to monit as `http://localhost:2812`.
 
----
 
 
+
+### Troubleshooting
+
+To troubleshoot issues with the `monit` 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 `monit` module in debug mode:
+
+```bash
+./python.d.plugin monit debug trace
+```
+
diff --git a/collectors/python.d.plugin/monit/metrics.csv b/collectors/python.d.plugin/monit/metrics.csv
new file mode 100644
index 000000000..1981a07e4
--- /dev/null
+++ b/collectors/python.d.plugin/monit/metrics.csv
@@ -0,0 +1,13 @@
+metric,scope,dimensions,unit,description,chart_type,labels,plugin,module
+monit.filesystems,,a dimension per target,filesystems,Filesystems,line,,python.d.plugin,monit
+monit.directories,,a dimension per target,directories,Directories,line,,python.d.plugin,monit
+monit.files,,a dimension per target,files,Files,line,,python.d.plugin,monit
+monit.fifos,,a dimension per target,pipes,Pipes (fifo),line,,python.d.plugin,monit
+monit.programs,,a dimension per target,programs,Programs statuses,line,,python.d.plugin,monit
+monit.services,,a dimension per target,processes,Processes statuses,line,,python.d.plugin,monit
+monit.process_uptime,,a dimension per target,seconds,Processes uptime,line,,python.d.plugin,monit
+monit.process_threads,,a dimension per target,threads,Processes threads,line,,python.d.plugin,monit
+monit.process_childrens,,a dimension per target,children,Child processes,line,,python.d.plugin,monit
+monit.hosts,,a dimension per target,hosts,Hosts,line,,python.d.plugin,monit
+monit.host_latency,,a dimension per target,milliseconds,Hosts latency,line,,python.d.plugin,monit
+monit.networks,,a dimension per target,interfaces,Network interfaces and addresses,line,,python.d.plugin,monit
diff --git a/collectors/python.d.plugin/monit/monit.chart.py b/collectors/python.d.plugin/monit/monit.chart.py
index bfc182349..5d926961b 100644
--- a/collectors/python.d.plugin/monit/monit.chart.py
+++ b/collectors/python.d.plugin/monit/monit.chart.py
@@ -99,7 +99,7 @@ CHARTS = {
         'lines': []
     },
     'process_children': {
-        'options': ['processes childrens', 'Child processes', 'childrens', 'applications',
+        'options': ['processes childrens', 'Child processes', 'children', 'applications',
                     'monit.process_childrens', 'line'],
         'lines': []
     },