after tests fixes (redis module)
paulfantom committed
Jul 12, 2016 at 17:07 UTC
e4ff061fa74dd8007abc928005123077aad3cfe7
2 files changed
+11
-11
python.d/Makefile.am
+1
@@ -18,6 +18,7 @@ dist_python_SCRIPTS = \
18
nginx.chart.py \
19
phpfpm.chart.py \
20
postfix.chart.py \
21
+ redis.chart.py \
22
sensors.chart.py \
23
squid.chart.py \
24
tomcat.chart.py \
python.d/redis.chart.py
+10
-11
@@ -25,19 +25,18 @@ CHARTS = {
25
'operations': {
26
'options': [None, 'Operations', 'operations/s', 'Statistics', 'redis.statistics', 'line'],
27
'lines': [
28
- ['instantaneous_ops_per_sec', None, 'absolute']
28
+ ['instantaneous_ops_per_sec', 'operations', 'absolute']
29
]},
30
'hit_rate': {
31
'options': [None, 'Hit rate', 'percent', 'Statistics', 'redis.statistics', 'line'],
32
'lines': [
33
- ['hit_rate', None, 'absolute']
33
+ ['hit_rate', 'rate', 'absolute']
34
]},
35
'memory': {
36
- 'options': [None, 'Memory utilization', 'bytes', 'Memory', 'redis.memory', 'line'],
36
+ 'options': [None, 'Memory utilization', 'kilobytes', 'Memory', 'redis.memory', 'line'],
37
'lines': [
38
- ['used_memory', None, 'absolute'],
39
- ['memory_', None, 'absolute'],
40
- ['memory_', None, 'absolute']
38
+ ['used_memory', 'total', 'absolute', 1, 1024],
39
+ ['used_memory_lua', 'lua', 'absolute', 1, 1024]
40
]},
41
'keys': {
42
'options': [None, 'Database keys', 'keys', 'Keys', 'redis.keys', 'line'],
@@ -47,13 +46,13 @@ CHARTS = {
46
'clients': {
47
'options': [None, 'Clients', 'clients', 'Clients', 'redis.clients', 'line'],
48
'lines': [
50
- ['connected_clients', None, 'absolute'],
51
- ['blocked_clients', None, 'absolute']
49
+ ['connected_clients', 'connected', 'absolute'],
50
+ ['blocked_clients', 'blocked', 'absolute']
51
]},
52
'slaves': {
53
'options': [None, 'Slaves', 'slaves', 'Replication', 'redis.replication', 'line'],
54
'lines': [
56
- ['connected_slaves', None, 'absolute']
55
+ ['connected_slaves', 'connected', 'absolute']
56
]}
57
}
58
@@ -90,7 +89,7 @@ class Service(SocketService):
89
record = tmp.split(':')
90
data[record[0]] = int(record[1])
91
try:
93
- data['hit_rate'] = int((data['keyspace_hits'] / (data['keyspace_hits'] + data['keyspace_misses'])) * 100)
92
+ data['hit_rate'] = int((data['keyspace_hits'] / float(data['keyspace_hits'] + data['keyspace_misses'])) * 100)
93
except:
94
data['hit_rate'] = 0
95
@@ -109,6 +108,6 @@ class Service(SocketService):
108
109
for name in data:
110
if name.startswith('db'):
112
- self.definitions['keys']['lines'].append(data[name, None, 'absolute'])
111
+ self.definitions['keys']['lines'].append([name.decode(), None, 'absolute'])
112
113
return True