Merge tag 'upstream/1.3.0+dfsg'

Upstream version 1.3.0+dfsg

1 files changed, 140 insertions, 0 deletions

diff --git a/python.d/redis.chart.py b/python.d/redis.chart.py
new file mode 100644
index 000000000..218401e12
--- /dev/null
+++ b/python.d/redis.chart.py
@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+# Description: redis netdata python.d module
+# Author: Pawel Krupa (paulfantom)
+
+from base import SocketService
+
+# default module values (can be overridden per job in `config`)
+#update_every = 2
+priority = 60000
+retries = 60
+
+# default job configuration (overridden by python.d.plugin)
+# config = {'local': {
+#             'update_every': update_every,
+#             'retries': retries,
+#             'priority': priority,
+#             'host': 'localhost',
+#             'port': 6379,
+#             'unix_socket': None
+#          }}
+
+ORDER = ['operations', 'hit_rate', 'memory', 'keys', 'clients', 'slaves']
+
+CHARTS = {
+    'operations': {
+        'options': [None, 'Operations', 'operations/s', 'Statistics', 'redis.operations', 'line'],
+        'lines': [
+            ['instantaneous_ops_per_sec', 'operations', 'absolute']
+        ]},
+    'hit_rate': {
+        'options': [None, 'Hit rate', 'percent', 'Statistics', 'redis.hit_rate', 'line'],
+        'lines': [
+            ['hit_rate', 'rate', 'absolute']
+        ]},
+    'memory': {
+        'options': [None, 'Memory utilization', 'kilobytes', 'Memory', 'redis.memory', 'line'],
+        'lines': [
+            ['used_memory', 'total', 'absolute', 1, 1024],
+            ['used_memory_lua', 'lua', 'absolute', 1, 1024]
+        ]},
+    'keys': {
+        'options': [None, 'Database keys', 'keys', 'Keys', 'redis.keys', 'line'],
+        'lines': [
+            # lines are created dynamically in `check()` method
+        ]},
+    'clients': {
+        'options': [None, 'Clients', 'clients', 'Clients', 'redis.clients', 'line'],
+        'lines': [
+            ['connected_clients', 'connected', 'absolute'],
+            ['blocked_clients', 'blocked', 'absolute']
+        ]},
+    'slaves': {
+        'options': [None, 'Slaves', 'slaves', 'Replication', 'redis.slaves', 'line'],
+        'lines': [
+            ['connected_slaves', 'connected', 'absolute']
+        ]}
+}
+
+
+class Service(SocketService):
+    def __init__(self, configuration=None, name=None):
+        SocketService.__init__(self, configuration=configuration, name=name)
+        self.request = "INFO\r\n"
+        self.host = "localhost"
+        self.port = 6379
+        self.unix_socket = None
+        self.order = ORDER
+        self.definitions = CHARTS
+        self._keep_alive = True
+        self.chart_name = ""
+
+    def _get_data(self):
+        """
+        Get data from socket
+        :return: dict
+        """
+        try:
+            raw = self._get_raw_data().split("\n")
+        except AttributeError:
+            self.error("no data received")
+            return None
+        data = {}
+        for line in raw:
+            if line.startswith(('instantaneous', 'keyspace', 'used_memory', 'connected', 'blocked')):
+                try:
+                    t = line.split(':')
+                    data[t[0]] = int(t[1])
+                except (IndexError, ValueError):
+                    pass
+            elif line.startswith('db'):
+                tmp = line.split(',')[0].replace('keys=', '')
+                record = tmp.split(':')
+                data[record[0]] = int(record[1])
+        try:
+            data['hit_rate'] = int((data['keyspace_hits'] / float(data['keyspace_hits'] + data['keyspace_misses'])) * 100)
+        except:
+            data['hit_rate'] = 0
+
+        if len(data) == 0:
+            self.error("received data doesn't have needed records")
+            return None
+        else:
+            return data
+
+    def _check_raw_data(self, data):
+        """
+        Check if all data has been gathered from socket.
+        Parse first line containing message length and check against received message
+        :param data: str
+        :return: boolean
+        """
+        length = len(data)
+        supposed = data.split('\n')[0][1:]
+        offset = len(supposed) + 4  # 1 dollar sing, 1 new line character + 1 ending sequence '\r\n'
+        supposed = int(supposed)
+        if length - offset >= supposed:
+            return True
+        else:
+            return False
+
+        return False
+
+    def check(self):
+        """
+        Parse configuration, check if redis is available, and dynamically create chart lines data
+        :return: boolean
+        """
+        self._parse_config()
+        if self.name == "":
+            self.name = "local"
+            self.chart_name += "_" + self.name
+        data = self._get_data()
+        if data is None:
+            return False
+
+        for name in data:
+            if name.startswith('db'):
+                self.definitions['keys']['lines'].append([name, None, 'absolute'])
+
+        return True