redis config

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index dd5d5102560fe300db099bfdd59f7ad67e06854c..20fc706230797f4e10f01e8967670b508fc683aa 100644 (file)
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -29,6 +29,7 @@ dist_pythonconfig_DATA = \
        python.d/nginx.conf \
        python.d/phpfpm.conf \
        python.d/postfix.conf \
+       python.d/redis.conf \
        python.d/sensors.conf \
        python.d/squid.conf \
        python.d/tomcat.conf \

diff --git a/conf.d/python.d/redis.conf b/conf.d/python.d/redis.conf
new file mode 100644 (file)
index 0000000..7d8d294
--- /dev/null
+++ b/conf.d/python.d/redis.conf
@@ -0,0 +1,14 @@
+# Example configuration of redis.chart.py
+# YAML format
+
+update_every: 1
+retries: 10
+
+socket:
+  name     : 'local'
+  socket   : '/tmp/redis.sock'
+
+tcp:
+  name     : 'local'
+  host     : 'localhost'
+  port     : '6379'
\ No newline at end of file

diff --git a/python.d/python_modules/base.py b/python.d/python_modules/base.py
index d0ec3b3a0bcf5b134653d783b130eb747062cd1f..e28469779cbf99bec47c89dbc3f91cc5e504c700 100644 (file)
--- a/python.d/python_modules/base.py
+++ b/python.d/python_modules/base.py
@@ -502,7 +502,7 @@ class SocketService(SimpleService):
         else:
             self.name = str(self.name)
         try:
-            self.unix_socket = int(self.configuration['unix_socket'])
+            self.unix_socket = int(self.configuration['socket'])
         except (KeyError, TypeError):
             self.error("No unix socket specified. Trying TCP/IP socket.")
             try: