isc_dhcpd_plugin: python 2.6 compatibility fix

[netdata.git] / python.d / mdstat.chart.py

diff --git a/python.d/mdstat.chart.py b/python.d/mdstat.chart.py
index f2c7ab584c531a4e065a522500f1232a83546120..0f7d2b444ef4b6b5ab7a20b6a8e2f49050f9f927 100644 (file)
--- a/python.d/mdstat.chart.py
+++ b/python.d/mdstat.chart.py
@@ -26,28 +26,33 @@ class Service(SimpleService):
         if not raw_data:
             self.error('Cant read mdstat data from %s' % (self.proc_mdstat))
             return False
+        
+        md_list = [md[0] for md in self.regex_disks.findall(raw_data)]
+
+        if not md_list:
+            self.error('No active arrays in %s' % (self.proc_mdstat))
+            return False
         else:
-            md_list = [md[0] for md in self.regex_disks.findall(raw_data)]
             for md in md_list:
                 self.order.append(md)
                 self.order.append(''.join([md, '_status']))
                 self.order.append(''.join([md, '_rate']))
                 self.definitions['agr_health']['lines'].append([''.join([md, '_health']), md, 'absolute'])
                 self.definitions[md] = {'options':
-                                            [None, 'MD disks stats', 'disks', md, 'md.disks', 'stacked'],
+                                            [None, '%s disks stats' % md, 'disks', md, 'md.disks', 'stacked'],
                                         'lines': [[''.join([md, '_total']), 'total', 'absolute'],
                                                   [''.join([md, '_inuse']), 'inuse', 'absolute']]}
                 self.definitions[''.join([md, '_status'])] = {'options':
-                                            [None, 'MD current status', 'percent', md, 'md.status', 'line'],
+                                            [None, '%s current status' % md, 'percent', md, 'md.status', 'line'],
                                         'lines': [[''.join([md, '_resync']), 'resync', 'absolute', 1, 100],
                                                   [''.join([md, '_recovery']), 'recovery', 'absolute', 1, 100],
+                                                  [''.join([md, '_reshape']), 'reshape', 'absolute', 1, 100],
                                                   [''.join([md, '_check']), 'check', 'absolute', 1, 100]]}
                 self.definitions[''.join([md, '_rate'])] = {'options':
-                                            [None, 'MD operation status', 'rate', md, 'md.rate', 'line'],
+                                            [None, '%s operation status' % md, 'rate', md, 'md.rate', 'line'],
                                         'lines': [[''.join([md, '_finishin']), 'finish min', 'absolute', 1, 100],
                                                   [''.join([md, '_rate']), 'megabyte/s', 'absolute', -1, 100]]}
             self.info('Plugin was started successfully. MDs to monitor %s' % (md_list))
-            to_netdata = {}
 
             return True
 
@@ -81,6 +86,7 @@ class Service(SimpleService):
             to_netdata[''.join([md[0], '_health'])] = int(md[1]) - int(md[2])
             to_netdata[''.join([md[0], '_check'])] = 0
             to_netdata[''.join([md[0], '_resync'])] = 0
+            to_netdata[''.join([md[0], '_reshape'])] = 0
             to_netdata[''.join([md[0], '_recovery'])] = 0
             to_netdata[''.join([md[0], '_finishin'])] = 0
             to_netdata[''.join([md[0], '_rate'])] = 0