added redis bandwidth; fixed memcached submenu, dimension names and colors
Costa Tsaousis (ktsaou) committed
Nov 11, 2016 at 22:56 UTC
6c9b04e80fda66c43745cb35957cf5a7f386f8ce
2 files changed
+41
-35
python.d/memcached.chart.py
+21
-21
@@ -20,89 +20,89 @@ retries = 60
20
# }}
21
22
ORDER = ['cache', 'net', 'connections', 'items', 'evicted_reclaimed',
23
- 'get', 'get_rate', 'set_rate', 'delete', 'cas', 'increment', 'decrement', 'touch', 'touch_rate']
23
+ 'get', 'get_rate', 'set_rate', 'cas', 'delete', 'increment', 'decrement', 'touch', 'touch_rate']
24
25
CHARTS = {
26
'cache': {
27
- 'options': [None, 'Cache Size', 'megabytes', 'Cache', 'memcached.cache', 'stacked'],
27
+ 'options': [None, 'Cache Size', 'megabytes', 'cache', 'memcached.cache', 'stacked'],
28
'lines': [
29
- ['used', 'used', 'absolute', 1, 1048576],
30
- ['avail', 'available', 'absolute', 1, 1048576]
29
+ ['avail', 'available', 'absolute', 1, 1048576],
30
+ ['used', 'used', 'absolute', 1, 1048576]
31
]},
32
'net': {
33
- 'options': [None, 'Network', 'kilobytes/s', 'Network', 'memcached.net', 'line'],
33
+ 'options': [None, 'Network', 'kilobits/s', 'network', 'memcached.net', 'area'],
34
'lines': [
35
- ['bytes_read', 'read', 'incremental', 1, 1024],
36
- ['bytes_written', 'write', 'incremental', 1, 1024]
35
+ ['bytes_read', 'in', 'incremental', 8, 1024],
36
+ ['bytes_written', 'out', 'incremental', -8, 1024]
37
]},
38
'connections': {
39
- 'options': [None, 'Connections', 'connections/s', 'Cluster', 'memcached.connections', 'line'],
39
+ 'options': [None, 'Connections', 'connections/s', 'connections', 'memcached.connections', 'line'],
40
'lines': [
41
['curr_connections', 'current', 'incremental'],
42
['rejected_connections', 'rejected', 'incremental'],
43
['total_connections', 'total', 'incremental']
44
]},
45
'items': {
46
- 'options': [None, 'Items', 'items', 'Cluster', 'memcached.items', 'line'],
46
+ 'options': [None, 'Items', 'items', 'items', 'memcached.items', 'line'],
47
'lines': [
48
['curr_items', 'current', 'absolute'],
49
['total_items', 'total', 'absolute']
50
]},
51
'evicted_reclaimed': {
52
- 'options': [None, 'Items', 'items', 'Evicted and Reclaimed', 'memcached.evicted_reclaimed', 'line'],
52
+ 'options': [None, 'Items', 'items', 'items', 'memcached.evicted_reclaimed', 'line'],
53
'lines': [
54
- ['evictions', 'evicted', 'absolute'],
55
- ['reclaimed', 'reclaimed', 'absolute']
54
+ ['reclaimed', 'reclaimed', 'absolute'],
55
+ ['evictions', 'evicted', 'absolute']
56
]},
57
'get': {
58
- 'options': [None, 'Requests', 'requests', 'GET', 'memcached.get', 'stacked'],
58
+ 'options': [None, 'Requests', 'requests', 'get ops', 'memcached.get', 'stacked'],
59
'lines': [
60
['get_hits', 'hits', 'percent-of-absolute-row'],
61
['get_misses', 'misses', 'percent-of-absolute-row']
62
]},
63
'get_rate': {
64
- 'options': [None, 'Rate', 'requests/s', 'GET', 'memcached.get_rate', 'line'],
64
+ 'options': [None, 'Rate', 'requests/s', 'get ops', 'memcached.get_rate', 'line'],
65
'lines': [
66
['cmd_get', 'rate', 'incremental']
67
]},
68
'set_rate': {
69
- 'options': [None, 'Rate', 'requests/s', 'SET', 'memcached.set_rate', 'line'],
69
+ 'options': [None, 'Rate', 'requests/s', 'set ops', 'memcached.set_rate', 'line'],
70
'lines': [
71
['cmd_set', 'rate', 'incremental']
72
]},
73
'delete': {
74
- 'options': [None, 'Requests', 'requests', 'DELETE', 'memcached.delete', 'stacked'],
74
+ 'options': [None, 'Requests', 'requests', 'delete ops', 'memcached.delete', 'stacked'],
75
'lines': [
76
['delete_hits', 'hits', 'percent-of-absolute-row'],
77
['delete_misses', 'misses', 'percent-of-absolute-row'],
78
]},
79
'cas': {
80
- 'options': [None, 'Requests', 'requests', 'CAS', 'memcached.cas', 'stacked'],
80
+ 'options': [None, 'Requests', 'requests', 'check and set ops', 'memcached.cas', 'stacked'],
81
'lines': [
82
['cas_hits', 'hits', 'percent-of-absolute-row'],
83
['cas_misses', 'misses', 'percent-of-absolute-row'],
84
['cas_badval', 'bad value', 'percent-of-absolute-row']
85
]},
86
'increment': {
87
- 'options': [None, 'Requests', 'requests', 'Increment', 'memcached.increment', 'stacked'],
87
+ 'options': [None, 'Requests', 'requests', 'increment ops', 'memcached.increment', 'stacked'],
88
'lines': [
89
['incr_hits', 'hits', 'percent-of-absolute-row'],
90
['incr_misses', 'misses', 'percent-of-absolute-row']
91
]},
92
'decrement': {
93
- 'options': [None, 'Requests', 'requests', 'Decrement', 'memcached.decrement', 'stacked'],
93
+ 'options': [None, 'Requests', 'requests', 'decrement ops', 'memcached.decrement', 'stacked'],
94
'lines': [
95
['decr_hits', 'hits', 'percent-of-absolute-row'],
96
['decr_misses', 'misses', 'percent-of-absolute-row']
97
]},
98
'touch': {
99
- 'options': [None, 'Requests', 'requests', 'Touch', 'memcached.touch', 'stacked'],
99
+ 'options': [None, 'Requests', 'requests', 'touch ops', 'memcached.touch', 'stacked'],
100
'lines': [
101
['touch_hits', 'hits', 'percent-of-absolute-row'],
102
['touch_misses', 'misses', 'percent-of-absolute-row']
103
]},
104
'touch_rate': {
105
- 'options': [None, 'Rate', 'requests/s', 'Touch', 'memcached.touch_rate', 'line'],
105
+ 'options': [None, 'Rate', 'requests/s', 'touch ops', 'memcached.touch_rate', 'line'],
106
'lines': [
107
['cmd_touch', 'rate', 'incremental']
108
]}
python.d/redis.chart.py
+20
-14
@@ -19,50 +19,56 @@ retries = 60
19
# 'unix_socket': None
20
# }}
21
22
-ORDER = ['operations', 'hit_rate', 'memory', 'keys', 'connections', 'clients', 'slaves', 'persistence']
22
+ORDER = ['operations', 'hit_rate', 'memory', 'keys', 'net', 'connections', 'clients', 'slaves', 'persistence']
23
24
CHARTS = {
25
'operations': {
26
- 'options': [None, 'Operations', 'operations/s', 'operations', 'redis.operations', 'line'],
26
+ 'options': [None, 'Redis Operations', 'operations/s', 'operations', 'redis.operations', 'line'],
27
'lines': [
28
['total_commands_processed', 'commands', 'incremental'],
29
['instantaneous_ops_per_sec', 'operations', 'absolute']
30
]},
31
'hit_rate': {
32
- 'options': [None, 'Hit rate', 'percent', 'hits', 'redis.hit_rate', 'line'],
32
+ 'options': [None, 'Redis Hit rate', 'percent', 'hits', 'redis.hit_rate', 'line'],
33
'lines': [
34
['hit_rate', 'rate', 'absolute']
35
]},
36
'memory': {
37
- 'options': [None, 'Memory utilization', 'kilobytes', 'memory', 'redis.memory', 'line'],
37
+ 'options': [None, 'Redis Memory utilization', 'kilobytes', 'memory', 'redis.memory', 'line'],
38
'lines': [
39
['used_memory', 'total', 'absolute', 1, 1024],
40
['used_memory_lua', 'lua', 'absolute', 1, 1024]
41
]},
42
+ 'net': {
43
+ 'options': [None, 'Redis Bandwidth', 'kilobits/s', 'network', 'redis.net', 'area'],
44
+ 'lines': [
45
+ ['total_net_input_bytes', 'in', 'incremental', 8, 1024],
46
+ ['total_net_output_bytes', 'out', 'incremental', -8, 1024]
47
+ ]},
48
'keys': {
43
- 'options': [None, 'Database keys', 'keys', 'keys', 'redis.keys', 'line'],
49
+ 'options': [None, 'Redis Keys per Database', 'keys', 'keys', 'redis.keys', 'line'],
50
'lines': [
51
# lines are created dynamically in `check()` method
52
]},
53
'connections': {
48
- 'options': [None, 'Connections', 'connections/s', 'connections', 'redis.connections', 'line'],
54
+ 'options': [None, 'Redis Connections', 'connections/s', 'connections', 'redis.connections', 'line'],
55
'lines': [
50
- ['total_connections_received', 'received', 'incremental'],
51
- ['rejected_connections', 'rejected', 'incremental']
56
+ ['total_connections_received', 'received', 'incremental', 1],
57
+ ['rejected_connections', 'rejected', 'incremental', -1]
58
]},
59
'clients': {
54
- 'options': [None, 'Clients', 'clients', 'connections', 'redis.clients', 'line'],
60
+ 'options': [None, 'Redis Clients', 'clients', 'connections', 'redis.clients', 'line'],
61
'lines': [
56
- ['connected_clients', 'connected', 'absolute'],
57
- ['blocked_clients', 'blocked', 'absolute']
62
+ ['connected_clients', 'connected', 'absolute', 1],
63
+ ['blocked_clients', 'blocked', 'absolute', -1]
64
]},
65
'slaves': {
60
- 'options': [None, 'Slaves', 'slaves', 'replication', 'redis.slaves', 'line'],
66
+ 'options': [None, 'Redis Slaves', 'connected', 'replication', 'redis.slaves', 'line'],
67
'lines': [
62
- ['connected_slaves', 'connected', 'absolute']
68
+ ['connected_slaves', 'slaves', 'absolute']
69
]},
70
'persistence': {
65
- 'options': [None, 'Changes since last save', 'changes', 'persistence', 'redis.rdb_changes', 'line'],
71
+ 'options': [None, 'Redis Persistence Changes Since Last Save', 'changes', 'persistence', 'redis.rdb_changes', 'line'],
72
'lines': [
73
['rdb_changes_since_last_save', 'changes', 'absolute']
74
]}