Merge pull request #1819 from alonbl/spec

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

diff --git a/python.d/isc_dhcpd.chart.py b/python.d/isc_dhcpd.chart.py
index 959576d0788f252378ae202ce7b959de3e68222a..88002a69b641a69451f525cecc4f558acd0d1aff 100644 (file)
--- a/python.d/isc_dhcpd.chart.py
+++ b/python.d/isc_dhcpd.chart.py
@@ -30,7 +30,6 @@ class Service(SimpleService):
         # Will work only with 'default' db-time-format (weekday year/month/day hour:minute:second)
         # TODO: update algorithm to parse correctly 'local' db-time-format
         # (epoch <seconds-since-epoch>; # <day-name> <month-name> <day-number> <hours>:<minutes>:<seconds> <year>)
-        # TODO: use threading to iter through file
         # Also only ipv4 supported
 
     def check(self):
@@ -43,32 +42,37 @@ class Service(SimpleService):
         else:
             try:
                 self.pools = self.pools.split()
-                if not [ip_network(pool) for pool in self.pools]:
+                if not [ip_network(return_utf(pool)) for pool in self.pools]:
                     self.error('Pools list is empty')
                     return False
-            except (ValueError, IndexError, AttributeError, SyntaxError):
-                self.error('Pools configurations is incorrect')
+            except (ValueError, IndexError, AttributeError, SyntaxError) as e:
+                self.error('Pools configurations is incorrect', str(e))
                 return False
-            
-            # Creating dynamic charts
-            self.order = ['parse_time', 'leases_size', 'utilization']
+
+            # Creating static charts
+            self.order = ['parse_time', 'leases_size', 'utilization', 'total']
             self.definitions = {'utilization':
                                     {'options':
-                                         [None, 'Pools utilization', 'used %', 'Utulization', 'isc_dhcpd.util', 'line'],
+                                         [None, 'Pools utilization', 'used %', 'Utilization', 'isc_dhcpd.util', 'line'],
                                      'lines': []},
+                                 'total':
+                                   {'options':
+                                        [None, 'Total all pools', 'leases', 'Utilization', 'isc_dhcpd.total', 'line'],
+                                    'lines': [['total', 'leases', 'absolute']]},
                                'parse_time':
                                    {'options':
-                                        [None, 'Parse time', 'ms', 'Parse statistics', 'isc_dhcpd.parse', 'line'],
+                                        [None, 'Parse time', 'ms', 'Parse stats', 'isc_dhcpd.parse', 'line'],
                                     'lines': [['ptime', 'time', 'absolute']]},
                                'leases_size':
                                    {'options':
-                                        [None, 'dhcpd.leases file size', 'kilobytes', 'Parse statistics', 'isc_dhcpd.lsize', 'line'],
+                                        [None, 'dhcpd.leases file size', 'kilobytes', 'Parse stats', 'isc_dhcpd.lsize', 'line'],
                                     'lines': [['lsize', 'size', 'absolute']]}}
+            # Creating dynamic charts
             for pool in self.pools:
                 self.definitions['utilization']['lines'].append([''.join(['ut_', pool]), pool, 'absolute'])
                 self.order.append(''.join(['leases_', pool]))
                 self.definitions[''.join(['leases_', pool])] = \
-                    {'options': [None, 'Active leases', 'leases', 'Leases', 'isc_dhcpd.lease', 'area'], 
+                    {'options': [None, 'Active leases', 'leases', 'Pools', 'isc_dhcpd.lease', 'area'], 
                      'lines': [[''.join(['le_', pool]), pool, 'absolute']]}
 
             self.info('Plugin was started succesfully')
@@ -92,7 +96,8 @@ class Service(SimpleService):
 
                 file_parse_time = round((time_end - time_start) * 1000)
 
-        except Exception:
+        except Exception as e:
+            self.error("Failed to parse leases file:", str(e))
             return None
 
         else:
@@ -104,15 +109,14 @@ class Service(SimpleService):
         :return: dict
         """
         raw_leases = self._get_raw_data()
-        
         if not raw_leases:
             return None
 
         # Result: {ipaddress: end lease time, ...}
-        all_leases = {k[6:len(k)-3]:v[7:len(v)-2] for k, v in raw_leases[0].items()}
+        all_leases = dict([(k[6:len(k)-3], v[7:len(v)-2]) for k, v in raw_leases[0].items()])
 
         # Result: [active binding, active binding....]. (Expire time (ends date;) - current time > 0)
-        active_leases = [k for k, v in all_leases.items() if is_bind_active(all_leases[k])]
+        active_leases = [k for k, v in all_leases.items() if is_binding_active(all_leases[k])]
 
         # Result: {pool: number of active bindings in pool, ...}
         pools_count = {pool: len([lease for lease in active_leases if is_address_in(lease, pool)])
@@ -127,23 +131,24 @@ class Service(SimpleService):
                       for pool in self.pools}
 
         # Bulding dicts to send to netdata
-        final_count = {''.join(['le_', k]): v for k, v in pools_count.items()}
-        final_util = {''.join(['ut_', k]): v for k, v in pools_util.items()}
-        
-        to_netdata = {'lsize': int(stat(self.leases_path)[6] / 1024)}
+        final_count = dict([(''.join(['le_', k]), v) for k, v in pools_count.items()])
+        final_util = dict([(''.join(['ut_', k]), v) for k, v in pools_util.items()])
+
+        to_netdata = {'total': len(active_leases)}
+        to_netdata.update({'lsize': int(stat(self.leases_path)[6] / 1024)})
         to_netdata.update({'ptime': int(raw_leases[1])})
         to_netdata.update(final_util)
         to_netdata.update(final_count)
- 
+
         return to_netdata
 
 
-def is_bind_active(binding):
+def is_binding_active(binding):
     return mktime(strptime(binding, '%w %Y/%m/%d %H:%M:%S')) - mktime(gmtime()) > 0
 
 
 def is_address_in(address, pool):
-    return ipaddress(address) in ip_network(pool)
+    return ipaddress(return_utf(address)) in ip_network(return_utf(pool))
 
 
 def find_lease(value):
@@ -152,3 +157,10 @@ def find_lease(value):
 
 def find_ends(value):
     return value[2:6] != 'ends'
+
+def return_utf(s):
+    # python2 returns "<type 'str'>" for simple strings
+    # python3 returns "<class 'str'>" for unicode strings
+    if str(type(s)) == "<type 'str'>":
+        return unicode(s, 'utf-8')
+    return s