From 2e665f093141992ad0cf1bc53de766d0834168bc Mon Sep 17 00:00:00 2001 From: Ilya Date: Mon, 20 Feb 2017 22:18:15 +0900 Subject: [PATCH 1/1] isc_dhcpd_plugin: python 2.6 compatibility fix --- python.d/isc_dhcpd.chart.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/python.d/isc_dhcpd.chart.py b/python.d/isc_dhcpd.chart.py index 54fbfb1f..88002a69 100644 --- a/python.d/isc_dhcpd.chart.py +++ b/python.d/isc_dhcpd.chart.py @@ -48,7 +48,7 @@ class Service(SimpleService): except (ValueError, IndexError, AttributeError, SyntaxError) as e: self.error('Pools configurations is incorrect', str(e)) return False - + # Creating static charts self.order = ['parse_time', 'leases_size', 'utilization', 'total'] self.definitions = {'utilization': @@ -109,12 +109,11 @@ 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_binding_active(all_leases[k])] @@ -132,9 +131,9 @@ 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()} - + 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])}) -- 2.39.2