isc_dhcpd_plugin: python2.6 comp fix
Ilya committed
Mar 2, 2017 at 22:35 UTC
5b7ec51dc7d2794cee5f07a15bbd826339112430
1 file changed
+12
-14
python.d/isc_dhcpd.chart.py
+12
-14
@@ -53,26 +53,26 @@ class Service(SimpleService):
53
self.order = ['parse_time', 'leases_size', 'utilization', 'total']
54
self.definitions = {'utilization':
55
{'options':
56
- [None, 'Pools utilization', 'used %', 'Utilization', 'isc_dhcpd.util', 'line'],
56
+ [None, 'Pools utilization', 'used %', 'utilization', 'isc_dhcpd.util', 'line'],
57
'lines': []},
58
'total':
59
{'options':
60
- [None, 'Total all pools', 'leases', 'Utilization', 'isc_dhcpd.total', 'line'],
60
+ [None, 'Total all pools', 'leases', 'utilization', 'isc_dhcpd.total', 'line'],
61
'lines': [['total', 'leases', 'absolute']]},
62
'parse_time':
63
{'options':
64
- [None, 'Parse time', 'ms', 'Parse stats', 'isc_dhcpd.parse', 'line'],
64
+ [None, 'Parse time', 'ms', 'parse stats', 'isc_dhcpd.parse', 'line'],
65
'lines': [['ptime', 'time', 'absolute']]},
66
'leases_size':
67
{'options':
68
- [None, 'dhcpd.leases file size', 'kilobytes', 'Parse stats', 'isc_dhcpd.lsize', 'line'],
68
+ [None, 'dhcpd.leases file size', 'kilobytes', 'parse stats', 'isc_dhcpd.lsize', 'line'],
69
'lines': [['lsize', 'size', 'absolute']]}}
70
# Creating dynamic charts
71
for pool in self.pools:
72
self.definitions['utilization']['lines'].append([''.join(['ut_', pool]), pool, 'absolute'])
73
self.order.append(''.join(['leases_', pool]))
74
self.definitions[''.join(['leases_', pool])] = \
75
- {'options': [None, 'Active leases', 'leases', 'Pools', 'isc_dhcpd.lease', 'area'],
75
+ {'options': [None, 'Active leases', 'leases', 'pools', 'isc_dhcpd.lease', 'area'],
76
'lines': [[''.join(['le_', pool]), pool, 'absolute']]}
77
78
self.info('Plugin was started succesfully')
@@ -93,13 +93,10 @@ class Service(SimpleService):
93
part2 = filterfalse(find_ends, dhcp_leases)
94
raw_result = dict(zip(part1, part2))
95
time_end = time()
96
-
96
file_parse_time = round((time_end - time_start) * 1000)
98
-
97
except Exception as e:
98
self.error("Failed to parse leases file:", str(e))
99
return None
102
-
100
else:
101
result = (raw_result, file_parse_time)
102
return result
@@ -119,16 +116,16 @@ class Service(SimpleService):
116
active_leases = [k for k, v in all_leases.items() if is_binding_active(all_leases[k])]
117
118
# Result: {pool: number of active bindings in pool, ...}
122
- pools_count = {pool: len([lease for lease in active_leases if is_address_in(lease, pool)])
123
- for pool in self.pools}
119
+ pools_count = dict([(pool, len([lease for lease in active_leases if is_address_in(lease, pool)]))
120
+ for pool in self.pools])
121
122
# Result: {pool: number of host ip addresses in pool, ...}
126
- pools_max = {pool: (2 ** (32 - int(pool.split('/')[1])) - 2)
127
- for pool in self.pools}
123
+ pools_max = dict([(pool, (2 ** (32 - int(pool.split('/')[1])) - 2))
124
+ for pool in self.pools])
125
126
# Result: {pool: % utilization, ....} (percent)
130
- pools_util = {pool:int(round(float(pools_count[pool]) / pools_max[pool] * 100, 0))
131
- for pool in self.pools}
127
+ pools_util = dict([(pool, int(round(float(pools_count[pool]) / pools_max[pool] * 100, 0)))
128
+ for pool in self.pools])
129
130
# Bulding dicts to send to netdata
131
final_count = dict([(''.join(['le_', k]), v) for k, v in pools_count.items()])
@@ -158,6 +155,7 @@ def find_lease(value):
155
def find_ends(value):
156
return value[2:6] != 'ends'
157
158
+
159
def return_utf(s):
160
# python2 returns "<type 'str'>" for simple strings
161
# python3 returns "<class 'str'>" for unicode strings