Merge pull request ganglia#124 from moonranger/redis-support-auth

jbuchbinder · jbuchbinder · commit 58315819d967 · 2013-12-06T15:10:01.000-08:00
Make redis-gmond support redis authentication
diff --git a/redis-gmond/conf.d/redis-gmond.pyconf b/redis-gmond/conf.d/redis-gmond.pyconf
@@ -4,6 +4,7 @@ modules {
     language = "python"
     param host { value = "127.0.0.1" }
     param port { value = 6379 }
+    /* param auth { value = "passwordhere" } */
   }
 }
 collection_group {
diff --git a/redis-gmond/python_modules/redis-gmond.py b/redis-gmond/python_modules/redis-gmond.py
@@ -11,7 +11,12 @@ def metric_handler(name):
     if 15 < time.time() - metric_handler.timestamp:
         s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         s.connect((metric_handler.host, metric_handler.port))
-        s.send("INFO\r\n")
+        if metric_handler.auth is not None:
+            s.send("*2\r\n$4\r\nAUTH\r\n$%d\r\n%s\r\n" % (len(metric_handler.auth), metric_handler.auth));
+            result = s.recv(100)
+            if not 'OK' in result:
+                return 0
+        s.send("*1\r\n$4\r\nINFO\r\n")
         #logging.debug("sent INFO")
         info = s.recv(4096)
         #logging.debug("rcvd INFO")
@@ -70,6 +75,7 @@ def metric_handler(name):
 def metric_init(params={}):
     metric_handler.host = params.get("host", "127.0.0.1")
     metric_handler.port = int(params.get("port", 6379))
+    metric_handler.auth = params.get("auth", None)
     metric_handler.timestamp = 0
     metric_handler.prev_total_commands = 0
     metric_handler.prev_total_connections = 0

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ modules {`
`4`	`4`	`language = "python"`
`5`	`5`	`param host { value = "127.0.0.1" }`
`6`	`6`	`param port { value = 6379 }`
	`7`	`+ /* param auth { value = "passwordhere" } */`
`7`	`8`	`}`
`8`	`9`	`}`
`9`	`10`	`collection_group {`