Adding upstream version 1.39.0.upstream/1.39.0

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

2 files changed, 34 insertions, 7 deletions

diff --git a/collectors/python.d.plugin/sensors/README.md b/collectors/python.d.plugin/sensors/README.md
index f5f435854..7ee31bd67 100644
--- a/collectors/python.d.plugin/sensors/README.md
+++ b/collectors/python.d.plugin/sensors/README.md
@@ -4,10 +4,10 @@ custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/pyth
 sidebar_label: "sensors-python.d.plugin"
 learn_status: "Published"
 learn_topic_type: "References"
-learn_rel_path: "References/Collectors references/Devices"
+learn_rel_path: "Integrations/Monitor/Devices"
 -->
 
-# Linux machine sensors monitoring with Netdata
+# Linux machine sensors collector
 
 Reads system sensors information (temperature, voltage, electric current, power, etc.).
 
@@ -25,12 +25,31 @@ sudo ./edit-config python.d/sensors.conf
 
 ### possible issues
 
-There have been reports from users that on certain servers, ACPI ring buffer errors are printed by the kernel (`dmesg`) when ACPI sensors are being accessed.
-We are tracking such cases in issue [#827](https://github.com/netdata/netdata/issues/827).
-Please join this discussion for help.
+There have been reports from users that on certain servers, ACPI ring buffer errors are printed by the kernel (`dmesg`) 
+when ACPI sensors are being accessed. We are tracking such cases in 
+issue [#827](https://github.com/netdata/netdata/issues/827). Please join this discussion for help.
 
-When `lm-sensors` doesn't work on your device (e.g. for RPi temperatures), use [the legacy bash collector](https://github.com/netdata/netdata/blob/master/collectors/charts.d.plugin/sensors/README.md)
+When `lm-sensors` doesn't work on your device (e.g. for RPi temperatures), 
+use [the legacy bash collector](https://github.com/netdata/netdata/blob/master/collectors/charts.d.plugin/sensors/README.md)
 
----
 
+### Troubleshooting
+
+To troubleshoot issues with the `sensors` 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 `sensors` module in debug mode:
+
+```bash
+./python.d.plugin sensors debug trace
+```
 
diff --git a/collectors/python.d.plugin/sensors/metrics.csv b/collectors/python.d.plugin/sensors/metrics.csv
new file mode 100644
index 000000000..d49e19384
--- /dev/null
+++ b/collectors/python.d.plugin/sensors/metrics.csv
@@ -0,0 +1,8 @@
+metric,scope,dimensions,unit,description,chart_type,labels,plugin,module
+sensors.temperature,chip,a dimension per sensor,Celsius,Temperature,line,,python.d.plugin,sensors
+sensors.voltage,chip,a dimension per sensor,Volts,Voltage,line,,python.d.plugin,sensors
+sensors.current,chip,a dimension per sensor,Ampere,Current,line,,python.d.plugin,sensors
+sensors.power,chip,a dimension per sensor,Watt,Power,line,,python.d.plugin,sensors
+sensors.fan,chip,a dimension per sensor,Rotations/min,Fans speed,line,,python.d.plugin,sensors
+sensors.energy,chip,a dimension per sensor,Joule,Energy,line,,python.d.plugin,sensors
+sensors.humidity,chip,a dimension per sensor,Percent,Humidity,line,,python.d.plugin,sensors