Merge pull request #1568 from l2isbad/varnish_plugin

[netdata.git] / python.d / tomcat.chart.py

diff --git a/python.d/tomcat.chart.py b/python.d/tomcat.chart.py
index 060331cdcc12c20ba076b4d7a2048443963fbb3a..31f6ab2483b4f0660ad250fc1f47be394352f64f 100644 (file)
--- a/python.d/tomcat.chart.py
+++ b/python.d/tomcat.chart.py
@@ -2,30 +2,33 @@
 # Description: tomcat netdata python.d module
 # Author: Pawel Krupa (paulfantom)
 
+# Python version higher than 2.7 is needed to run this module.
+
 from base import UrlService
 import xml.etree.ElementTree as ET  # phone home...
+#from xml.parsers.expat import errors
 
 # default module values (can be overridden per job in `config`)
 # update_every = 2
 priority = 60000
-retries = 5
+retries = 60
 
 # charts order (can be overridden if you want less charts, or different order)
 ORDER = ['accesses', 'volume', 'threads', 'jvm']
 
 CHARTS = {
     'accesses': {
-        'options': [None, "tomcat requests", "requests/s", "statistics", "tomcat.accesses", "area"],
+        'options': [None, "Requests", "requests/s", "statistics", "tomcat.accesses", "area"],
         'lines': [
-            ["accesses"]
+            ["accesses", None, 'incremental']
         ]},
     'volume': {
-        'options': [None, "tomcat volume", "KB/s", "volume", "tomcat.volume", "area"],
+        'options': [None, "Volume", "KB/s", "volume", "tomcat.volume", "area"],
         'lines': [
-            ["volume", None, 'incremental']
+            ["volume", None, 'incremental', 1, 1024]
         ]},
     'threads': {
-        'options': [None, "tomcat threads", "current threads", "statistics", "tomcat.threads", "line"],
+        'options': [None, "Threads", "current threads", "statistics", "tomcat.threads", "line"],
         'lines': [
             ["current", None, "absolute"],
             ["busy", None, "absolute"]
@@ -33,7 +36,7 @@ CHARTS = {
     'jvm': {
         'options': [None, "JVM Free Memory", "MB", "statistics", "tomcat.jvm", "area"],
         'lines': [
-            ["jvm", None, "absolute"]
+            ["jvm", None, "absolute", 1, 1048576]
         ]}
 }
 
@@ -45,6 +48,12 @@ class Service(UrlService):
             self.url = "http://localhost:8080/manager/status?XML=true"
         self.order = ORDER
         self.definitions = CHARTS
+        self.port = 8080
+
+    def check(self):
+        if UrlService.check(self):
+            return True
+
         # get port from url
         self.port = 0
         for i in self.url.split('/'):
@@ -57,6 +66,12 @@ class Service(UrlService):
         if self.port == 0:
             self.port = 80
 
+        test = self._get_data()
+        if test is None or len(test) == 0:
+            return False
+        else:
+            return True
+
     def _get_data(self):
         """
         Format data received from http request
@@ -64,7 +79,19 @@ class Service(UrlService):
         """
         try:
             raw = self._get_raw_data()
-            data = ET.fromstring(raw)
+            try:
+                data = ET.fromstring(raw)
+            except ET.ParseError as e:
+                # if e.code == errors.codes[errors.XML_ERROR_JUNK_AFTER_DOC_ELEMENT]:
+                if e.code == 9:
+                    end = raw.find('</status>')
+                    end += 9
+                    raw = raw[:end]
+                    self.debug(raw)
+                    data = ET.fromstring(raw)
+                else:
+                    raise Exception(e)
+
             memory = data.find('./jvm/memory')
             threads = data.find("./connector[@name='\"http-bio-" + str(self.port) + "\"']/threadInfo")
             requests = data.find("./connector[@name='\"http-bio-" + str(self.port) + "\"']/requestInfo")
@@ -74,5 +101,11 @@ class Service(UrlService):
                     'current': threads.attrib['currentThreadCount'],
                     'busy': threads.attrib['currentThreadsBusy'],
                     'jvm': memory.attrib['free']}
-        except (ValueError, AttributeError):
+        except (ValueError, AttributeError) as e:
+            self.debug(str(e))
             return None
+        except SyntaxError as e:
+            self.error("Tomcat module needs python 2.7 at least. Stopping")
+            self.debug(str(e))
+        except Exception as e:
+            self.debug(str(e))