1. changed arguments from decode() in base.py to support versions of Python 2.6

2. added pass parameters to redis for AUTH command
3. optimized nginx.chart.py and phpfpm.chart.py submenu name
4. optimized phpfpm.chart.py average display

1 files changed, 8 insertions, 0 deletions

diff --git a/conf.d/python.d/redis.conf b/conf.d/python.d/redis.conf
index e1ce2de2e6..983fbfbdb3 100644
--- a/conf.d/python.d/redis.conf
+++ b/conf.d/python.d/redis.conf
@@ -62,6 +62,8 @@
 #     host: 'IP or HOSTNAME' # the host to connect to
 #     port: PORT             # the port to connect to
 #
+#  and
+#     pass: 'password'       # the redis password to use for AUTH command
 #
 
 # ----------------------------------------------------------------------
@@ -71,27 +73,33 @@
 socket1:
   name     : 'local'
   socket   : '/tmp/redis.sock'
+  # pass     : ''
 
 socket2:
   name     : 'local'
   socket   : '/var/run/redis/redis.sock'
+  # pass     : ''
 
 socket3:
   name     : 'local'
   socket   : '/var/lib/redis/redis.sock'
+  # pass     : ''
 
 localhost:
   name     : 'local'
   host     : 'localhost'
   port     : 6379
+  # pass     : ''
 
 localipv4:
   name     : 'local'
   host     : '127.0.0.1'
   port     : 6379
+  # pass     : ''
 
 localipv6:
   name     : 'local'
   host     : '::1'
   port     : 6379
+  # pass     : ''