Merge pull request cloudartisan#1 from josephholsten/master

Add configurable password

Author: cloudartisan

Redis.py

@@ -5,9 +5,6 @@
 import commands
 
 
-REDIS_INFO_CMD = "redis-cli info"
-
-
 class Redis:
     def __init__(self, agent_config, checks_logger, raw_config):
         self.agent_config = agent_config
@@ -16,7 +13,7 @@ def __init__(self, agent_config, checks_logger, raw_config):
 
     def run(self):
         stats = {}
-        status, out = commands.getstatusoutput(REDIS_INFO_CMD)
+        status, out = commands.getstatusoutput(self.redis_info_cmd())
         if status != 0:
             return stats
         # Grab every statistic available and leave it to the end user to
@@ -25,6 +22,13 @@ def run(self):
             stats[key] = val
         return stats
 
+    def redis_info_cmd(self):
+        if self.raw_config.get('Redis') and self.raw_config['Redis'].get('password'):
+                self.checks_logger.debug('Found Redis password in config')
+                return "redis_cli -a %s info" % self.raw_config['Redis']['password']
+        else:
+                return "redis_cli info"
+
 
 if __name__ == '__main__':
     redis = Redis(None, None, None)