More plugin fixes

Author: dagwieers

dstat

@@ -2211,7 +2211,7 @@ def csvheader(totlist):
 def info(level, msg):
     "Output info message"
 #   if level <= op.verbose:
-    print(string, file=sys.stderr)
+    print(msg, file=sys.stderr)
 
 def die(ret, msg):
     "Print error and exit with errorcode"

plugins/dstat_condor_queue.py

@@ -116,7 +116,7 @@ def extract(self):
         last_line = None
 
         try:
-	    for repeats in range(3):
+            for repeats in range(3):
                 for last_line in cmd_readlines(self.condor_status_cmd):
                     pass
 

plugins/dstat_disk_tps.py

@@ -68,7 +68,7 @@ def extract(self):
                             self.set2[diskset] = ( self.set2[diskset][0] + int(l[3]), self.set2[diskset][1] + int(l[7]) )
 
         for name in self.set2:
-            self.val[name] = map(lambda x, y: (y - x) / elapsed, self.set1[name], self.set2[name])
+            self.val[name] = list(map(lambda x, y: (y - x) / elapsed, self.set1[name], self.set2[name]))
 
         if step == op.delay:
             self.set1.update(self.set2)

plugins/dstat_disk_util.py

@@ -55,7 +55,7 @@ def basename(self, disk):
     def vars(self):
         ret = []
         if op.disklist:
-            varlist = map(self.basename, op.disklist)
+            varlist = list(map(self.basename, op.disklist))
         else:
             varlist = []
             for name in self.discover:

plugins/dstat_lustre.py

@@ -27,7 +27,7 @@ def extract(self):
                     write = int(l[6])
             self.set2[name] = (read, write)
 
-            self.val[name] = map(lambda x, y: (y - x) * 1.0 / elapsed, self.set1[name], self.set2[name])
+            self.val[name] = list(map(lambda x, y: (y - x) * 1.0 / elapsed, self.set1[name], self.set2[name]))
 
         if step == op.delay:
             self.set1.update(self.set2)

plugins/dstat_net_packets.py

@@ -59,7 +59,7 @@ def extract(self):
 
         if update:
             for name in self.set2:
-                self.val[name] = map(lambda x, y: (y - x) * 1.0 / elapsed, self.set1[name], self.set2[name])
+                self.val[name] = list(map(lambda x, y: (y - x) * 1.0 / elapsed, self.set1[name], self.set2[name]))
 
         if step == op.delay:
             self.set1.update(self.set2)

plugins/dstat_snmp_load.py

@@ -19,6 +19,6 @@ def check(self):
             raise Exception('Needs pysnmp and pyasn1 modules')
 
     def extract(self):
-        map(lambda x, y: self.val.update({x: float(y)}), self.vars, snmpwalk(self.server, self.community, (1,3,6,1,4,1,2021,10,1,3)))
+        list(map(lambda x, y: self.val.update({x: float(y)}), self.vars, snmpwalk(self.server, self.community, (1,3,6,1,4,1,2021,10,1,3))))
 
 # vim:ts=4:sw=4:et

plugins/dstat_snmp_net.py

@@ -22,11 +22,11 @@ def vars(self):
         return [ str(x) for x in snmpwalk(self.server, self.community, (1,3,6,1,2,1,2,2,1,2)) ]
 
     def extract(self):
-        map(lambda x, y, z: self.set2.update({x: (int(y), int(z))}), self.vars, snmpwalk(self.server, self.community, (1,3,6,1,2,1,2,2,1,10)), snmpwalk(self.server, self.community, (1,3,6,1,2,1,2,2,1,16)))
+        list(map(lambda x, y, z: self.set2.update({x: (int(y), int(z))}), self.vars, snmpwalk(self.server, self.community, (1,3,6,1,2,1,2,2,1,10)), snmpwalk(self.server, self.community, (1,3,6,1,2,1,2,2,1,16))))
 
         if update:
             for name in self.set2:
-                self.val[name] = map(lambda x, y: (y - x) * 1.0 / elapsed, self.set1[name], self.set2[name])
+                self.val[name] = list(map(lambda x, y: (y - x) * 1.0 / elapsed, self.set1[name], self.set2[name]))
 
         if step == op.delay:
             self.set1.update(self.set2)

plugins/dstat_snmp_net_err.py

@@ -22,12 +22,12 @@ def vars(self):
         return [ str(x) for x in snmpwalk(self.server, self.community, (1,3,6,1,2,1,2,2,1,2)) ]
 
     def extract(self):
-        map(lambda x, y: self.set2.update({x: (int(y), )}), self.vars, snmpwalk(self.server, self.community, (1,3,6,1,2,1,2,2,1,20)))
+        list(map(lambda x, y: self.set2.update({x: (int(y), )}), self.vars, snmpwalk(self.server, self.community, (1,3,6,1,2,1,2,2,1,20))))
 
         if update:
             for name in self.set2:
-#                self.val[name] = map(lambda x, y: (y - x) * 1.0 / elapsed, self.set1[name], self.set2[name])
-                self.val[name] = map(lambda x, y: (y - x) * 1.0, self.set1[name], self.set2[name])
+#                self.val[name] = list(map(lambda x, y: (y - x) * 1.0 / elapsed, self.set1[name], self.set2[name]))
+                self.val[name] = list(map(lambda x, y: (y - x) * 1.0, self.set1[name], self.set2[name]))
 
         if step == op.delay:
             self.set1.update(self.set2)

plugins/dstat_vmk_hba.py

@@ -73,7 +73,7 @@ def extract(self):
                     self.set2[name] = ( int(l[2]), int(l[4]) )
 
             for name in self.set2:
-                self.val[name] = map(lambda x, y: (y - x) * 1024.0 / elapsed, self.set1[name], self.set2[name])
+                self.val[name] = list(map(lambda x, y: (y - x) * 1024.0 / elapsed, self.set1[name], self.set2[name]))
 
         if step == op.delay:
             self.set1.update(self.set2)

plugins/dstat_vmk_nic.py

@@ -69,7 +69,7 @@ def extract(self):
 
         if update:
             for name in self.set2:
-                self.val[name] = map(lambda x, y: (y - x) * 1.0 / elapsed, self.set1[name], self.set2[name])
+                self.val[name] = list(map(lambda x, y: (y - x) * 1.0 / elapsed, self.set1[name], self.set2[name]))
 
         if step == op.delay:
             self.set1.update(self.set2)

plugins/dstat_vz_io.py

@@ -59,7 +59,7 @@ def extract(self):
 #            print(name, self.val[name], self.set2[name][0], self.set2[name][1])
 #            print(name, self.val[name], self.set1[name][0], self.set1[name][1])
 
-            self.val[name] = map(lambda x, y: (y - x) / elapsed, self.set1[name], self.set2[name])
+            self.val[name] = list(map(lambda x, y: (y - x) / elapsed, self.set1[name], self.set2[name]))
 
         if step == op.delay:
             self.set1.update(self.set2)

plugins/dstat_zfs_arc.py

@@ -29,9 +29,9 @@ def extract(self):
 
         self.val['total'] = self.val['hits'] + self.val['misses']
 
-	if self.val['total'] > 0 :
+        if self.val['total'] > 0 :
             self.val['hit_rate'] = self.val['hits'] / self.val['total'] * 100.0
-	else:
+        else:
             self.val['hit_rate'] = 0
 
         if step == op.delay:

plugins/dstat_zfs_l2arc.py

@@ -29,9 +29,9 @@ def extract(self):
 
         probes = self.val['l2_hits'] + self.val['l2_misses']
 
-	if probes > 0 :
+        if probes > 0 :
             self.val['hit_rate'] = self.val['l2_hits'] / probes * 100.0
-	else:
+        else:
             self.val['hit_rate'] = 0
 
         if step == op.delay: