fix: fixed Speed Per Second items units

Author: cuprumtan

mamonsu/lib/const.py

@@ -20,8 +20,8 @@ class _template(object):
     VALUE_TYPE = _value_type(0, 1, 2, 3, 4)
     # item unit
     _item_type = namedtuple(
-        'item_type', ['none', 'bytes', 's', 'ms', 'uptime', 'unixtime', 'percent'])
-    UNITS = _item_type(None, 'b', 's', 'ms', 'uptime', 'unixtime', '%')
+        'item_type', ['none', 'bytes', 's', 'ms', 'uptime', 'unixtime', 'percent', 'bytes_per_second'])
+    UNITS = _item_type(None, 'b', 's', 'ms', 'uptime', 'unixtime', '%', 'Bps')
     # type of information
     _type = namedtuple(
         'type', ['ZABBIX_PASSIVE', 'TRAP', 'SIMPLE', 'INTERNAL', 'ZABBIX_ACTIVE',

mamonsu/plugins/pgsql/cfs.py

@@ -99,12 +99,12 @@ def items(self, template, dashboard=False):
             return template.item({
                 'name': 'PostgreSQL cfs compression: written byte/s',
                 'key': 'pgsql.cfs.activity[written_bytes]',
-                'units': self.UNITS.bytes,
+                'units': self.UNITS.bytes_per_second,
                 'delay': self.Interval
             }) + template.item({
                 'name': 'PostgreSQL cfs compression: scanned byte/s',
                 'key': 'pgsql.cfs.activity[scanned_bytes]',
-                'units': self.UNITS.bytes,
+                'units': self.UNITS.bytes_per_second,
                 'delay': self.Interval
             }) + template.item({
                 'name': 'PostgreSQL cfs compression: compressed files',

mamonsu/plugins/pgsql/pg_stat_statement.py

@@ -15,16 +15,16 @@ class PgStatStatement(Plugin):
 
         ('stat[read_bytes]',
          'sum(shared_blks_read+local_blks_read+temp_blks_read)*8*1024',
-         'read bytes/s', Plugin.UNITS.bytes, Plugin.DELTA.speed_per_second,
+         'read bytes/s', Plugin.UNITS.bytes_per_second, Plugin.DELTA.speed_per_second,
          ('PostgreSQL statements: bytes', 'BBBB00', 0)),
         ('stat[write_bytes]',
          'sum(shared_blks_written+local_blks_written'
          '+temp_blks_written)*8*1024',
-         'write bytes/s', Plugin.UNITS.bytes, Plugin.DELTA.speed_per_second,
+         'write bytes/s', Plugin.UNITS.bytes_per_second, Plugin.DELTA.speed_per_second,
          ('PostgreSQL statements: bytes', '00CC00', 0)),
         ('stat[dirty_bytes]',
          'sum(shared_blks_dirtied+local_blks_dirtied)*8*1024',
-         'dirty bytes/s', Plugin.UNITS.bytes, Plugin.DELTA.speed_per_second,
+         'dirty bytes/s', Plugin.UNITS.bytes_per_second, Plugin.DELTA.speed_per_second,
          ('PostgreSQL statements: bytes', '0000CC', 0)),
 
         ('stat[read_time]',
@@ -45,7 +45,7 @@ class PgStatStatement(Plugin):
         # PostgreSQL 13 specific metrics:
         ('stat[wal_bytes]',
          'sum(wal_bytes)',
-         'amount of wal files', Plugin.UNITS.bytes, Plugin.DELTA.speed_per_second,
+         'amount of wal files', Plugin.UNITS.bytes_per_second, Plugin.DELTA.speed_per_second,
          ('PostgreSQL statements: wal statistics', 'BCC000', 0)),
         ('stat[wal_records]',
          'sum(wal_records)',

mamonsu/plugins/pgsql/xlog.py

@@ -124,7 +124,7 @@ def items(self, template, dashboard=False):
         result += template.item({
             'name': 'PostgreSQL: wal write speed',
             'key': self.right_type(self.key_wall),
-            'units': Plugin.UNITS.bytes,
+            'units': Plugin.UNITS.bytes_per_second,
             'delay': self.plugin_config('interval'),
             'delta': delta
         }) + template.item({