Merging upstream version 1.39.0.

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

2 files changed, 31 insertions, 3 deletions

diff --git a/collectors/python.d.plugin/samba/README.md b/collectors/python.d.plugin/samba/README.md
index 41ae1c5ba..8fe133fd5 100644
--- a/collectors/python.d.plugin/samba/README.md
+++ b/collectors/python.d.plugin/samba/README.md
@@ -4,10 +4,10 @@ custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/pyth
 sidebar_label: "Samba"
 learn_status: "Published"
 learn_topic_type: "References"
-learn_rel_path: "References/Collectors references/Apps"
+learn_rel_path: "Integrations/Monitor/Apps"
 -->
 
-# Samba monitoring with Netdata
+# Samba collector
 
 Monitors the performance metrics of Samba file sharing using `smbstatus` command-line tool.
 
@@ -119,6 +119,26 @@ cd /etc/netdata   # Replace this path with your Netdata config directory, if dif
 sudo ./edit-config python.d/samba.conf
 ```
 
----
 
 
+
+### Troubleshooting
+
+To troubleshoot issues with the `samba` 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 `samba` module in debug mode:
+
+```bash
+./python.d.plugin samba debug trace
+```
+
diff --git a/collectors/python.d.plugin/samba/metrics.csv b/collectors/python.d.plugin/samba/metrics.csv
new file mode 100644
index 000000000..600181f63
--- /dev/null
+++ b/collectors/python.d.plugin/samba/metrics.csv
@@ -0,0 +1,8 @@
+metric,scope,dimensions,unit,description,chart_type,labels,plugin,module
+syscall.rw,,"sendfile, recvfile",KiB/s,R/Ws,area,,python.d.plugin,samba
+smb2.rw,,"readout, writein, readin, writeout",KiB/s,R/Ws,area,,python.d.plugin,samba
+smb2.create_close,,"create, close",operations/s,Create/Close,line,,python.d.plugin,samba
+smb2.get_set_info,,"getinfo, setinfo",operations/s,Info,line,,python.d.plugin,samba
+smb2.find,,find,operations/s,Find,line,,python.d.plugin,samba
+smb2.notify,,notify,operations/s,Notify,line,,python.d.plugin,samba
+smb2.sm_counters,,"tcon, negprot, tdis, cancel, logoff, flush, lock, keepalive, break, sessetup",count,Lesser Ops,stacked,,python.d.plugin,samba