fix description in bgwriter plugin

Author: vadv

mamonsu/plugins/pgsql/bgwriter.py

@@ -13,32 +13,32 @@ class BgWriter(Plugin):
         ('buffers_checkpoint', 'bgwriter[buffers_checkpoint]',
             'bgwriter: buffers written during checkpoints',
             ('PostgreSQL bgwriter', 'CCCC00', 1),
-            Plugin.UNITS.bytes, Plugin.DELTA.simple_change),
+            Plugin.DELTA.simple_change),
 
         ('buffers_clean', 'bgwriter[buffers_clean]',
             'bgwriter: buffers written',
             ('PostgreSQL bgwriter', '0000CC', 1),
-            Plugin.UNITS.bytes, Plugin.DELTA.simple_change),
+            Plugin.DELTA.simple_change),
 
         ('maxwritten_clean', 'bgwriter[maxwritten_clean]',
             'bgwriter: number of bgwriter stopped by max write count',
             ('PostgreSQL bgwriter', '777777', 0),
-            Plugin.UNITS.ms, Plugin.DELTA.simple_change),
+            Plugin.DELTA.simple_change),
 
         ('buffers_backend', 'bgwriter[buffers_backend]',
             'bgwriter: buffers written directly by a backend',
             ('PostgreSQL bgwriter', 'CC0000', 1),
-            Plugin.UNITS.bytes, Plugin.DELTA.simple_change),
+            Plugin.DELTA.simple_change),
 
         ('buffers_backend_fsync', 'bgwriter[buffers_backend_fsync]',
             'bgwriter: times a backend execute its own fsync',
             ('PostgreSQL bgwriter', 'CC00CC', 0),
-            Plugin.UNITS.none, Plugin.DELTA.simple_change),
+            Plugin.DELTA.simple_change),
 
         ('buffers_alloc', 'bgwriter[buffers_alloc]',
             'bgwriter: buffers allocated',
             ('PostgreSQL bgwriter', '00CC00', 1),
-            Plugin.UNITS.bytes, Plugin.DELTA.simple_change)
+            Plugin.DELTA.simple_change)
     ]
 
     def run(self, zbx):
@@ -49,7 +49,7 @@ def run(self, zbx):
         for idx, val in enumerate(result[0]):
             key, val = 'pgsql.{0}'.format(
                 self.Items[idx][1]), int(val)
-            zbx.send(key, val, self.Items[idx][5])
+            zbx.send(key, val, self.Items[idx][4])
         del params, result
 
     def items(self, template):
@@ -58,8 +58,7 @@ def items(self, template):
             result += template.item({
                 'key': 'pgsql.{0}'.format(item[1]),
                 'name': 'PostgreSQL {0}'.format(item[2]),
-                'value_type': self.VALUE_TYPE.numeric_unsigned,
-                'units': item[4]
+                'value_type': self.VALUE_TYPE.numeric_unsigned
             })
         return result
 

mamonsu/plugins/system/linux/disk_stats.py

@@ -31,13 +31,13 @@ def run(self, zbx):
                 if self.OnlyPhysicalDevices and re.search('\d+$', dev):
                     continue
                 val = [int(x) for x in val.split()]
-                read_op, read_sc, write_ops, write_sc, ticks = val[0], val[2], val[4], val[6], val[9]
+                read_op, read_sc, write_op, write_sc, ticks = val[0], val[2], val[4], val[6], val[9]
                 read_b, write_b = read_sc * 512, write_sc * 512  # https://github.com/sysstat/sysstat/blob/v11.5.2/iostat.c#L940
 
                 zbx.send('system.disk.read[{0}]'.format(
                     dev), read_op, self.DELTA_SPEED)
                 zbx.send('system.disk.write[{0}]'.format(
-                    dev), write_ops, self.DELTA_SPEED)
+                    dev), write_op, self.DELTA_SPEED)
                 zbx.send('system.disk.read_b[{0}]'.format(
                     dev), read_b, self.DELTA_SPEED)
                 zbx.send('system.disk.write_b[{0}]'.format(
@@ -46,7 +46,7 @@ def run(self, zbx):
                     dev), ticks / 10, self.DELTA_SPEED)
 
                 all_read_op += read_op
-                all_write_op += write_ops
+                all_write_op += write_op
                 all_read_b += read_b
                 all_write_b += write_b
                 devices.append({'{#BLOCKDEVICE}': dev})

packaging/conf/template.xml

@@ -36,7 +36,7 @@
                     <value_type>3</value_type>
                     <allowed_hosts/>
                     <valuemap/>
-                    <units>b</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -78,7 +78,7 @@
                     <value_type>3</value_type>
                     <allowed_hosts/>
                     <valuemap/>
-                    <units>b</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -120,7 +120,7 @@
                     <value_type>3</value_type>
                     <allowed_hosts/>
                     <valuemap/>
-                    <units>ms</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -162,7 +162,7 @@
                     <value_type>3</value_type>
                     <allowed_hosts/>
                     <valuemap/>
-                    <units>b</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>
@@ -246,7 +246,7 @@
                     <value_type>3</value_type>
                     <allowed_hosts/>
                     <valuemap/>
-                    <units>b</units>
+                    <units/>
                     <delta>0</delta>
                     <snmpv3_contextname/>
                     <snmpv3_securityname/>