Merge 74aa912 into 0f3eb04

src/collectors/redisstat/redisstat.py

@@ -306,17 +306,26 @@ def collect_instance(self, nick, host, port, unix_socket, auth):
 
         # Role needs to be handled outside the the _KEYS dict
         # since the value is a string, not a int / float
-        # Also, master_sync_in_progress is only available if the
-        # redis instance is a slave, so default it here so that
-        # the metric is cleared if the instance flips from slave
-        # to master
+        # Also, master_sync_in_progress and master_link_status
+        # are only available if the redis instance is a slave,
+        # so default it here so that the metric is cleared if
+        # the instance flips from slave to master
         if 'role' in info:
             if info['role'] == "master":
                 data['replication.master'] = 1
                 data['replication.master_sync_in_progress'] = 0
+                data['replication.master_link_status'] = 0
             else:
                 data['replication.master'] = 0
 
+        # Master link status needs to be handled outside the
+        # _KEYS dict since the value is a string, not a int / float
+        if 'master_link_status' in info:
+            if info['master_link_status'] == 'up':
+                data['replication.master_link_status'] = 1
+            else:
+                data['replication.master_link_status'] = 0
+
         # Connect to redis and get the maxmemory config value
         # Then calculate the % maxmemory of memory used
         maxmemory_config = self._get_config(host, port, unix_socket, auth,

src/collectors/redisstat/test/testredisstat.py

@@ -166,6 +166,7 @@ def test_real_data(self, publish_mock):
 
         metrics = {'6379.process.uptime': 95732,
                    '6379.replication.master': 1,
+                   '6379.replication.master_link_status': 0,
                    '6379.replication.master_sync_in_progress': 0,
                    '6379.pubsub.channels': 1,
                    '6379.slaves.connected': 2,