added redis bandwidth; fixed memcached submenu, dimension names and colors

diff --git a/python.d/memcached.chart.py b/python.d/memcached.chart.py
index f0b782dea091985e4a8d3de63f4282b134b418f8..0d6807ba731580b8345a26527aee094ad59a1f9d 100644 (file)
--- a/python.d/memcached.chart.py
+++ b/python.d/memcached.chart.py
@@ -20,89 +20,89 @@ retries = 60
 #          }}
 
 ORDER = ['cache', 'net', 'connections', 'items', 'evicted_reclaimed',
-         'get', 'get_rate', 'set_rate', 'delete', 'cas', 'increment', 'decrement', 'touch', 'touch_rate']
+         'get', 'get_rate', 'set_rate', 'cas', 'delete', 'increment', 'decrement', 'touch', 'touch_rate']
 
 CHARTS = {
     'cache': {
-        'options': [None, 'Cache Size', 'megabytes', 'Cache', 'memcached.cache', 'stacked'],
+        'options': [None, 'Cache Size', 'megabytes', 'cache', 'memcached.cache', 'stacked'],
         'lines': [
-            ['used', 'used', 'absolute', 1, 1048576],
-            ['avail', 'available', 'absolute', 1, 1048576]
+            ['avail', 'available', 'absolute', 1, 1048576],
+            ['used', 'used', 'absolute', 1, 1048576]
         ]},
     'net': {
-        'options': [None, 'Network', 'kilobytes/s', 'Network', 'memcached.net', 'line'],
+        'options': [None, 'Network', 'kilobits/s', 'network', 'memcached.net', 'area'],
         'lines': [
-            ['bytes_read', 'read', 'incremental', 1, 1024],
-            ['bytes_written', 'write', 'incremental', 1, 1024]
+            ['bytes_read', 'in', 'incremental', 8, 1024],
+            ['bytes_written', 'out', 'incremental', -8, 1024]
         ]},
     'connections': {
-        'options': [None, 'Connections', 'connections/s', 'Cluster', 'memcached.connections', 'line'],
+        'options': [None, 'Connections', 'connections/s', 'connections', 'memcached.connections', 'line'],
         'lines': [
             ['curr_connections', 'current', 'incremental'],
             ['rejected_connections', 'rejected', 'incremental'],
             ['total_connections', 'total', 'incremental']
         ]},
     'items': {
-        'options': [None, 'Items', 'items', 'Cluster', 'memcached.items', 'line'],
+        'options': [None, 'Items', 'items', 'items', 'memcached.items', 'line'],
         'lines': [
             ['curr_items', 'current', 'absolute'],
             ['total_items', 'total', 'absolute']
         ]},
     'evicted_reclaimed': {
-        'options': [None, 'Items', 'items', 'Evicted and Reclaimed', 'memcached.evicted_reclaimed', 'line'],
+        'options': [None, 'Items', 'items', 'items', 'memcached.evicted_reclaimed', 'line'],
         'lines': [
-            ['evictions', 'evicted', 'absolute'],
-            ['reclaimed', 'reclaimed', 'absolute']
+            ['reclaimed', 'reclaimed', 'absolute'],
+            ['evictions', 'evicted', 'absolute']
         ]},
     'get': {
-        'options': [None, 'Requests', 'requests', 'GET', 'memcached.get', 'stacked'],
+        'options': [None, 'Requests', 'requests', 'get ops', 'memcached.get', 'stacked'],
         'lines': [
             ['get_hits', 'hits', 'percent-of-absolute-row'],
             ['get_misses', 'misses', 'percent-of-absolute-row']
         ]},
     'get_rate': {
-        'options': [None, 'Rate', 'requests/s', 'GET', 'memcached.get_rate', 'line'],
+        'options': [None, 'Rate', 'requests/s', 'get ops', 'memcached.get_rate', 'line'],
         'lines': [
             ['cmd_get', 'rate', 'incremental']
         ]},
     'set_rate': {
-        'options': [None, 'Rate', 'requests/s', 'SET', 'memcached.set_rate', 'line'],
+        'options': [None, 'Rate', 'requests/s', 'set ops', 'memcached.set_rate', 'line'],
         'lines': [
             ['cmd_set', 'rate', 'incremental']
         ]},
     'delete': {
-        'options': [None, 'Requests', 'requests', 'DELETE', 'memcached.delete', 'stacked'],
+        'options': [None, 'Requests', 'requests', 'delete ops', 'memcached.delete', 'stacked'],
         'lines': [
             ['delete_hits', 'hits', 'percent-of-absolute-row'],
             ['delete_misses', 'misses', 'percent-of-absolute-row'],
         ]},
     'cas': {
-        'options': [None, 'Requests', 'requests', 'CAS', 'memcached.cas', 'stacked'],
+        'options': [None, 'Requests', 'requests', 'check and set ops', 'memcached.cas', 'stacked'],
         'lines': [
             ['cas_hits', 'hits', 'percent-of-absolute-row'],
             ['cas_misses', 'misses', 'percent-of-absolute-row'],
             ['cas_badval', 'bad value', 'percent-of-absolute-row']
         ]},
     'increment': {
-        'options': [None, 'Requests', 'requests', 'Increment', 'memcached.increment', 'stacked'],
+        'options': [None, 'Requests', 'requests', 'increment ops', 'memcached.increment', 'stacked'],
         'lines': [
             ['incr_hits', 'hits', 'percent-of-absolute-row'],
             ['incr_misses', 'misses', 'percent-of-absolute-row']
         ]},
     'decrement': {
-        'options': [None, 'Requests', 'requests', 'Decrement', 'memcached.decrement', 'stacked'],
+        'options': [None, 'Requests', 'requests', 'decrement ops', 'memcached.decrement', 'stacked'],
         'lines': [
             ['decr_hits', 'hits', 'percent-of-absolute-row'],
             ['decr_misses', 'misses', 'percent-of-absolute-row']
         ]},
     'touch': {
-        'options': [None, 'Requests', 'requests', 'Touch', 'memcached.touch', 'stacked'],
+        'options': [None, 'Requests', 'requests', 'touch ops', 'memcached.touch', 'stacked'],
         'lines': [
             ['touch_hits', 'hits', 'percent-of-absolute-row'],
             ['touch_misses', 'misses', 'percent-of-absolute-row']
         ]},
     'touch_rate': {
-        'options': [None, 'Rate', 'requests/s', 'Touch', 'memcached.touch_rate', 'line'],
+        'options': [None, 'Rate', 'requests/s', 'touch ops', 'memcached.touch_rate', 'line'],
         'lines': [
             ['cmd_touch', 'rate', 'incremental']
         ]}

diff --git a/python.d/redis.chart.py b/python.d/redis.chart.py
index 8258c28744b2a2edadabb9e30c8ddb951a6df2cf..3fa8ab6d40cec0ec5f26735adb7622155c459041 100644 (file)
--- a/python.d/redis.chart.py
+++ b/python.d/redis.chart.py
@@ -19,50 +19,56 @@ retries = 60
 #             'unix_socket': None
 #          }}
 
-ORDER = ['operations', 'hit_rate', 'memory', 'keys', 'connections', 'clients', 'slaves', 'persistence']
+ORDER = ['operations', 'hit_rate', 'memory', 'keys', 'net', 'connections', 'clients', 'slaves', 'persistence']
 
 CHARTS = {
     'operations': {
-        'options': [None, 'Operations', 'operations/s', 'operations', 'redis.operations', 'line'],
+        'options': [None, 'Redis Operations', 'operations/s', 'operations', 'redis.operations', 'line'],
         'lines': [
             ['total_commands_processed', 'commands', 'incremental'],
             ['instantaneous_ops_per_sec', 'operations', 'absolute']
         ]},
     'hit_rate': {
-        'options': [None, 'Hit rate', 'percent', 'hits', 'redis.hit_rate', 'line'],
+        'options': [None, 'Redis Hit rate', 'percent', 'hits', 'redis.hit_rate', 'line'],
         'lines': [
             ['hit_rate', 'rate', 'absolute']
         ]},
     'memory': {
-        'options': [None, 'Memory utilization', 'kilobytes', 'memory', 'redis.memory', 'line'],
+        'options': [None, 'Redis Memory utilization', 'kilobytes', 'memory', 'redis.memory', 'line'],
         'lines': [
             ['used_memory', 'total', 'absolute', 1, 1024],
             ['used_memory_lua', 'lua', 'absolute', 1, 1024]
         ]},
+    'net': {
+        'options': [None, 'Redis Bandwidth', 'kilobits/s', 'network', 'redis.net', 'area'],
+        'lines': [
+            ['total_net_input_bytes', 'in', 'incremental', 8, 1024],
+            ['total_net_output_bytes', 'out', 'incremental', -8, 1024]
+        ]},
     'keys': {
-        'options': [None, 'Database keys', 'keys', 'keys', 'redis.keys', 'line'],
+        'options': [None, 'Redis Keys per Database', 'keys', 'keys', 'redis.keys', 'line'],
         'lines': [
             # lines are created dynamically in `check()` method
         ]},
     'connections': {
-        'options': [None, 'Connections', 'connections/s', 'connections', 'redis.connections', 'line'],
+        'options': [None, 'Redis Connections', 'connections/s', 'connections', 'redis.connections', 'line'],
         'lines': [
-            ['total_connections_received', 'received', 'incremental'],
-            ['rejected_connections', 'rejected', 'incremental']
+            ['total_connections_received', 'received', 'incremental', 1],
+            ['rejected_connections', 'rejected', 'incremental', -1]
         ]},
     'clients': {
-        'options': [None, 'Clients', 'clients', 'connections', 'redis.clients', 'line'],
+        'options': [None, 'Redis Clients', 'clients', 'connections', 'redis.clients', 'line'],
         'lines': [
-            ['connected_clients', 'connected', 'absolute'],
-            ['blocked_clients', 'blocked', 'absolute']
+            ['connected_clients', 'connected', 'absolute', 1],
+            ['blocked_clients', 'blocked', 'absolute', -1]
         ]},
     'slaves': {
-        'options': [None, 'Slaves', 'slaves', 'replication', 'redis.slaves', 'line'],
+        'options': [None, 'Redis Slaves', 'connected', 'replication', 'redis.slaves', 'line'],
         'lines': [
-            ['connected_slaves', 'connected', 'absolute']
+            ['connected_slaves', 'slaves', 'absolute']
         ]},
     'persistence': {
-        'options': [None, 'Changes since last save', 'changes', 'persistence', 'redis.rdb_changes', 'line'],
+        'options': [None, 'Redis Persistence Changes Since Last Save', 'changes', 'persistence', 'redis.rdb_changes', 'line'],
         'lines': [
             ['rdb_changes_since_last_save', 'changes', 'absolute']
         ]}