Merging upstream version 1.39.0.

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

2 files changed, 28 insertions, 3 deletions

diff --git a/collectors/python.d.plugin/boinc/README.md b/collectors/python.d.plugin/boinc/README.md
index 149d37ca1..ea4397754 100644
--- a/collectors/python.d.plugin/boinc/README.md
+++ b/collectors/python.d.plugin/boinc/README.md
@@ -4,10 +4,10 @@ custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/pyth
 sidebar_label: "BOINC"
 learn_status: "Published"
 learn_topic_type: "References"
-learn_rel_path: "References/Collectors references/Distributed computing"
+learn_rel_path: "Integrations/Monitor/Distributed computing"
 -->
 
-# BOINC monitoring with Netdata
+# BOINC collector
 
 Monitors task counts for the Berkeley Open Infrastructure Networking Computing (BOINC) distributed computing client using the same RPC interface that the BOINC monitoring GUI does.
 
@@ -39,6 +39,26 @@ remote:
   password: some-password
 ```
 
----
 
 
+
+### Troubleshooting
+
+To troubleshoot issues with the `boinc` 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 `boinc` module in debug mode:
+
+```bash
+./python.d.plugin boinc debug trace
+```
+
diff --git a/collectors/python.d.plugin/boinc/metrics.csv b/collectors/python.d.plugin/boinc/metrics.csv
new file mode 100644
index 000000000..98c6e8660
--- /dev/null
+++ b/collectors/python.d.plugin/boinc/metrics.csv
@@ -0,0 +1,5 @@
+metric,scope,dimensions,unit,description,chart_type,labels,plugin,module
+boinc.tasks,,"Total, Active",tasks,Overall Tasks,line,,python.d.plugin,boinc
+boinc.states,,"New, Downloading, Ready to Run, Compute Errors, Uploading, Uploaded, Aborted, Failed Uploads",tasks,Tasks per State,line,,python.d.plugin,boinc
+boinc.sched,,"Uninitialized, Preempted, Scheduled",tasks,Tasks per Scheduler State,line,,python.d.plugin,boinc
+boinc.process,,"Uninitialized, Executing, Suspended, Aborted, Quit, Copy Pending",tasks,Tasks per Process State,line,,python.d.plugin,boinc