New upstream version 1.9.0+dfsgupstream/1.9.0+dfsg

1 files changed, 21 insertions, 16 deletions

diff --git a/python.d/apache.chart.py b/python.d/apache.chart.py
index 71fe0300..789b3c09 100644
--- a/python.d/apache.chart.py
+++ b/python.d/apache.chart.py
@@ -2,7 +2,7 @@
 # Description: apache netdata python.d module
 # Author: Pawel Krupa (paulfantom)
 
-from base import UrlService
+from bases.FrameworkServices.UrlService import UrlService
 
 # default module values (can be overridden per job in `config`)
 # update_every = 2
@@ -31,9 +31,7 @@ CHARTS = {
         'options': [None, 'apache Workers', 'workers', 'workers', 'apache.workers', 'stacked'],
         'lines': [
             ["idle"],
-            ["idle_servers", 'idle'],
             ["busy"],
-            ["busy_servers", 'busy']
         ]},
     'reqpersec': {
         'options': [None, 'apache Lifetime Avg. Requests/s', 'requests/s', 'statistics',
@@ -42,10 +40,10 @@ CHARTS = {
             ["requests_sec"]
         ]},
     'bytespersec': {
-        'options': [None, 'apache Lifetime Avg. Bandwidth/s', 'kilobytes/s', 'statistics',
+        'options': [None, 'apache Lifetime Avg. Bandwidth/s', 'kilobits/s', 'statistics',
                     'apache.bytesperreq', 'area'],
         'lines': [
-            ["size_sec", None, 'absolute', 1, 1000]
+            ["size_sec", None, 'absolute', 8, 1000]
         ]},
     'requests': {
         'options': [None, 'apache Requests', 'requests/s', 'requests', 'apache.requests', 'line'],
@@ -53,9 +51,9 @@ CHARTS = {
             ["requests", None, 'incremental']
         ]},
     'net': {
-        'options': [None, 'apache Bandwidth', 'kilobytes/s', 'bandwidth', 'apache.net', 'area'],
+        'options': [None, 'apache Bandwidth', 'kilobits/s', 'bandwidth', 'apache.net', 'area'],
         'lines': [
-            ["sent", None, 'incremental']
+            ["sent", None, 'incremental', 8, 1]
         ]},
     'connections': {
         'options': [None, 'apache Connections', 'connections', 'connections', 'apache.connections', 'line'],
@@ -94,15 +92,22 @@ class Service(UrlService):
         self.url = self.configuration.get('url', 'http://localhost/server-status?auto')
 
     def check(self):
-        if UrlService.check(self):
-            if 'idle_servers' in self._data_from_check:
-                self.__module__ = 'lighttpd'
-                for chart in self.definitions:
-                    opts = self.definitions[chart]['options']
-                    opts[1] = opts[1].replace('apache', 'lighttpd')
-                    opts[4] = opts[4].replace('apache', 'lighttpd')
-            return True
-        return False
+        self._manager = self._build_manager()
+        data = self._get_data()
+        if not data:
+            return None
+
+        if 'idle_servers' in data:
+            self.module_name = 'lighttpd'
+            for chart in self.definitions:
+                if chart == 'workers':
+                    lines = self.definitions[chart]['lines']
+                    lines[0] = ["idle_servers", 'idle']
+                    lines[1] = ["busy_servers", 'busy']
+                opts = self.definitions[chart]['options']
+                opts[1] = opts[1].replace('apache', 'lighttpd')
+                opts[4] = opts[4].replace('apache', 'lighttpd')
+        return True
 
     def _get_data(self):
         """