implement `_get_raw_data`

diff --git a/python.d/apache.chart.py b/python.d/apache.chart.py
index bc1540912ffaadf253f823137a60a88d9a39297f..f0f4fe2e13c53db0d2d0fdae85e07a7eae720e2a 100644 (file)
--- a/python.d/apache.chart.py
+++ b/python.d/apache.chart.py
@@ -92,7 +92,7 @@ class Service(UrlService):
         :return: dict
         """
         try:
-            raw = self._get_data().split("\n")
+            raw = self._get_raw_data().split("\n")
         except AttributeError:
             return None
         data = {}

diff --git a/python.d/apache_cache.chart.py b/python.d/apache_cache.chart.py
index a05b4ba4a48fc06523c8556c9ee0c6a2025ca1fb..438296b42a127c812bc60b39602639f1a5a24580 100644 (file)
--- a/python.d/apache_cache.chart.py
+++ b/python.d/apache_cache.chart.py
@@ -34,7 +34,7 @@ class Service(LogService):
         :return: dict
         """
         try:
-            raw = self._get_data()
+            raw = self._get_raw_data()
             if raw is None:
                 return None
         except (ValueError, AttributeError):

diff --git a/python.d/nginx.chart.py b/python.d/nginx.chart.py
index 668209c5d945734920fa702783bbfc3a89a90895..c50d0b72c675990e16c054e9980ac4f0111f71bd 100644 (file)
--- a/python.d/nginx.chart.py
+++ b/python.d/nginx.chart.py
@@ -61,7 +61,7 @@ class Service(UrlService):
         :return: dict
         """
         try:
-            raw = self._get_data().split(" ")
+            raw = self._get_raw_data().split(" ")
             return {'active': int(raw[2]),
                     'requests': int(raw[7]),
                     'reading': int(raw[11]),

diff --git a/python.d/phpfpm.chart.py b/python.d/phpfpm.chart.py
index e8c01fd015cfb76a6465dac1c113477e40984616..024e6f5c7383afda668a15629708fa302b77efaa 100755 (executable)
--- a/python.d/phpfpm.chart.py
+++ b/python.d/phpfpm.chart.py
@@ -62,7 +62,7 @@ class Service(UrlService):
         :return: dict
         """
         try:
-            raw = self._get_data().split('\n')
+            raw = self._get_raw_data().split('\n')
         except AttributeError:
             return None
         data = {}

diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py
index 114e9fda7d75b97569aec92840a3d175a109ef42..7b338c972c2f566cdb60b4435990f6a08e9c51e8 100644 (file)
--- a/python.d/python_modules/base.py
+++ b/python.d/python_modules/base.py
@@ -303,16 +303,9 @@ class SimpleService(BaseService):
         self.definitions = {}
         BaseService.__init__(self, configuration=configuration, name=name)
 
-    def _get_raw_data(self):
-        """
-        Get raw data from http request
-        :return: str
-        """
-        return ""
-
     def _get_data(self):
         """
-        Format data received from request
+        Get some data
         :return: dict
         """
         return {}