Adding upstream version 1.39.0.upstream/1.39.0

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

2 files changed, 32 insertions, 3 deletions

diff --git a/collectors/python.d.plugin/tomcat/README.md b/collectors/python.d.plugin/tomcat/README.md
index 66ed6d97a..923d6238f 100644
--- a/collectors/python.d.plugin/tomcat/README.md
+++ b/collectors/python.d.plugin/tomcat/README.md
@@ -4,10 +4,10 @@ custom_edit_url: "https://github.com/netdata/netdata/edit/master/collectors/pyth
 sidebar_label: "Tomcat"
 learn_status: "Published"
 learn_topic_type: "References"
-learn_rel_path: "References/Collectors references/Webapps"
+learn_rel_path: "Integrations/Monitor/Webapps"
 -->
 
-# Apache Tomcat monitoring with Netdata
+# Apache Tomcat collector
 
 Presents memory utilization of tomcat containers.
 
@@ -51,6 +51,26 @@ localhost:
 Without configuration, module attempts to connect to `http://localhost:8080/manager/status?XML=true`, without any credentials.
 So it will probably fail.
 
----
 
 
+
+### Troubleshooting
+
+To troubleshoot issues with the `tomcat` 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 `tomcat` module in debug mode:
+
+```bash
+./python.d.plugin tomcat debug trace
+```
+
diff --git a/collectors/python.d.plugin/tomcat/metrics.csv b/collectors/python.d.plugin/tomcat/metrics.csv
new file mode 100644
index 000000000..6769fa3f8
--- /dev/null
+++ b/collectors/python.d.plugin/tomcat/metrics.csv
@@ -0,0 +1,9 @@
+metric,scope,dimensions,unit,description,chart_type,labels,plugin,module
+tomcat.accesses,,"accesses, errors",requests/s,Requests,area,,python.d.plugin,tomcat
+tomcat.bandwidth,,"sent, received",KiB/s,Bandwidth,area,,python.d.plugin,tomcat
+tomcat.processing_time,,processing time,seconds,processing time,area,,python.d.plugin,tomcat
+tomcat.threads,,"current, busy",current threads,Threads,area,,python.d.plugin,tomcat
+tomcat.jvm,,"free, eden, survivor, tenured, code cache, compressed, metaspace",MiB,JVM Memory Pool Usage,stacked,,python.d.plugin,tomcat
+tomcat.jvm_eden,,"used, committed, max",MiB,Eden Memory Usage,area,,python.d.plugin,tomcat
+tomcat.jvm_survivor,,"used, committed, max",MiB,Survivor Memory Usage,area,,python.d.plugin,tomcat
+tomcat.jvm_tenured,,"used, committed, max",MiB,Tenured Memory Usage,area,,python.d.plugin,tomcat