Merge pull request nkrode#25 from snikch/master

Add support for redis instances with password authentication

Author: kumarnitin

README.md

@@ -1,7 +1,7 @@
 RedisLive
 ---------
 
-Visualize your redis instances, analyze query patterns and spikes. 
+Visualize your redis instances, analyze query patterns and spikes.
 
 ![Redis Live](https://github.com/kumarnitin/RedisLive/blob/master/design/redis-live.png?raw=true "Redis Live")
 
@@ -23,8 +23,9 @@ You'll also need argparse if you're running Python < 2.7:
 + edit redis-live.conf :
   + update the value of the key `RedisServers` to the redis instances you want to monitor. You can monitor multiple instances by appending more values to the RedisServers list.
   + update the value of the key `RedisStatsServer` to the redis instance you will use to store RedisLive data (this redis instance is different from the redis instances you are monitoring).
-  
-if you don't have a spare redis instance to use to store RedisLive data, then you can configure RedisLive to use sqlite by changing to ` "DataStoreType" : "sqlite" ` 
+  + passwords can be added as an optional parameter for any redis instance
+
+if you don't have a spare redis instance to use to store RedisLive data, then you can configure RedisLive to use sqlite by changing to ` "DataStoreType" : "sqlite" `
 
 **Start RedisLive**
 + start the monitoring script `./redis-monitor.py --duration=120` duration is in seconds ([see caveat](#caveat-on-monitoring-redis))

src/redis-monitor.py

@@ -45,10 +45,11 @@ def listen(self):
 
 class MonitorThread(threading.Thread):
 
-	def __init__(self, server, port):
+	def __init__(self, server, port, password=None):
 		threading.Thread.__init__(self)
 		self.server = server
 		self.port = port
+		self.password = password
 		self.id = self.server + ":" + str(self.port)
 		self._stop = threading.Event()		
 
@@ -61,7 +62,7 @@ def stopped(self):
 	def run(self):
 
 		statsProvider = RedisLiveDataProvider.GetProvider()
-		pool = redis.ConnectionPool(host=self.server, port=self.port, db=0)
+		pool = redis.ConnectionPool(host=self.server, port=self.port, db=0, password=self.password)
 		monitor=Monitor(pool)
 		commands = monitor.monitor()
 
@@ -112,10 +113,11 @@ def run(self):
 
 class InfoThread(threading.Thread):
 
-	def __init__(self, server, port):
+	def __init__(self, server, port, password=None):
 		threading.Thread.__init__(self)
 		self.server = server
 		self.port = port
+		self.password = password
 		self.id = self.server + ":" + str(self.port)
 		self._stop = threading.Event()		
 
@@ -128,7 +130,7 @@ def stopped(self):
 	def run(self):
 
 		statsProvider = RedisLiveDataProvider.GetProvider()
-		redisClient = redis.StrictRedis(host=self.server, port=self.port, db=0)
+		redisClient = redis.StrictRedis(host=self.server, port=self.port, db=0, password=self.password)
 
 		while not self.stopped():	
 			try:		
@@ -180,12 +182,12 @@ def Run(self, duration):
  		redisServers = RedisLiveSettings.GetRedisServers()
 
 		for redisServer in redisServers:
-			monitor = MonitorThread(redisServer["server"], redisServer["port"])				
+			monitor = MonitorThread(redisServer["server"], redisServer["port"], redisServer.get("password", None))				
 			self.threads.append(monitor)		
 			monitor.setDaemon(True)
 			monitor.start()
 
-			info = InfoThread(redisServer["server"], redisServer["port"])		
+			info = InfoThread(redisServer["server"], redisServer["port"], redisServer.get("password", None))		
 			self.threads.append(info)
 			info.setDaemon(True)
 			info.start()