X-Git-Url: https://arthur.barton.de/gitweb/?p=netdata.git;a=blobdiff_plain;f=python.d%2Fovpn_status_log.chart.py;fp=python.d%2Fovpn_status_log.chart.py;h=b3cc6723fff2878251468db596d25871837a1e24;hp=c5fca002af67d143089594bcb45b33eab58cd672;hb=aa6b96fc2d421517a59a1aaaf91be5f201d34287;hpb=b060bae83cc36fdc4f14120228e4c9b0d1ec42e8

diff --git a/python.d/ovpn_status_log.chart.py b/python.d/ovpn_status_log.chart.py
index c5fca002..b3cc6723 100644
--- a/python.d/ovpn_status_log.chart.py
+++ b/python.d/ovpn_status_log.chart.py
@@ -3,7 +3,7 @@
 # Author: l2isbad
 
 from base import SimpleService
-from re import compile, findall, search, subn
+from re import compile as r_compile
 priority = 60000
 retries = 60
 update_every = 10
@@ -11,35 +11,41 @@ update_every = 10
 ORDER = ['users', 'traffic']
 CHARTS = {
     'users': {
-        'options': [None, 'OpenVPN active users', 'active users', 'Users', 'openvpn_status.users', 'line'],
+        'options': [None, 'OpenVPN Active Users', 'active users', 'users', 'openvpn_status.users', 'line'],
         'lines': [
             ["users", None, "absolute"],
         ]},
     'traffic': {
-        'options': [None, 'OpenVPN traffic', 'kilobit/s', 'Traffic', 'openvpn_status.traffic', 'area'],
+        'options': [None, 'OpenVPN Traffic', 'Kb/s', 'traffic', 'openvpn_status.traffic', 'area'],
         'lines': [
             ["in", None, "incremental", 8, 1000], ["out", None, "incremental", 8, -1000]
         ]},
 
 }
 
+
 class Service(SimpleService):
     def __init__(self, configuration=None, name=None):
         SimpleService.__init__(self, configuration=configuration, name=name)
         self.order = ORDER
         self.definitions = CHARTS
         self.log_path = self.configuration.get('log_path')
-        self.regex_data_inter = compile(r'(?<=Since ).*?(?=.ROUTING)')
-        self.regex_data_final = compile(r'\d{1,3}(?:\.\d{1,3}){3}[:0-9,. ]*')
-        self.regex_users = compile(r'\d{1,3}(?:\.\d{1,3}){3}:\d+')
-        self.regex_traffic = compile(r'(?<=(?:,| ))\d+(?=(?:,| ))')
+        self.regex_data_inter = r_compile(r'(?<=Since ).*?(?=.ROUTING)')
+        self.regex_data_final = r_compile(r'\d{1,3}(?:\.\d{1,3}){3}[:0-9,. ]*')
+        self.regex_users = r_compile(r'\d{1,3}(?:\.\d{1,3}){3}:\d+')
+        self.regex_traffic = r_compile(r'(?<=(?:,| ))\d+(?=(?:,| ))')
 
     def check(self):
-        if not self._get_raw_data():
+        if not (self.log_path and isinstance(self.log_path, str)):
+            self.error('\'log_path\' is not defined')
+            return False
+
+        data = self._get_data()
+        if not data:
             self.error('Make sure that the openvpn status log file exists and netdata has permission to read it')
             return False
         else:
-            self.info('Plugin was started succesfully')
+            self._data_from_check = data
             return True
 
     def _get_raw_data(self):
@@ -47,13 +53,14 @@ class Service(SimpleService):
         Open log file
         :return: str
         """
+
         try:
             with open(self.log_path, 'rt') as log:
                 result = log.read()
-        except Exception:
+        except OSError:
             return None
         else:
-            return result
+            return result or None
 
     def _get_data(self):
         """
@@ -62,16 +69,20 @@ class Service(SimpleService):
         """
 
         raw_data = self._get_raw_data()
-        try:
-            data_inter = self.regex_data_inter.search(' '.join(raw_data.splitlines())).group()
-        except AttributeError:
-            data_inter = ''
+        if not raw_data:
+            return None
+
+        data_inter = self.regex_data_inter.search(' '.join(raw_data.splitlines()))
+        if not data_inter:
+            return None
+        else:
+            data_inter = data_inter.group()
 
         data_final = ' '.join(self.regex_data_final.findall(data_inter))
         users = self.regex_users.subn('', data_final)[1]
         traffic = self.regex_traffic.findall(data_final)
 
-        bytes_in = sum([int(traffic[i]) for i in range(len(traffic)) if (i + 1) % 2 is 1])
-        bytes_out = sum([int(traffic[i]) for i in range(len(traffic)) if (i + 1) % 2 is 0])
+        bytes_in = sum(int(traffic[i[0]]) for i in enumerate(traffic) if (i[0] + 1) % 2 is 1)
+        bytes_out = sum(int(traffic[i[0]]) for i in enumerate(traffic) if (i[0] + 1) % 2 is 0)
 
         return {'users': users, 'in': bytes_in, 'out': bytes_out}