feat: add support for PostgreSQL 13 metrics for both mamonsu mode and agent mode

casperr0 · casperr0 · commit c8b18bbd195b · 2020-10-19T14:04:14.000+03:00
diff --git a/mamonsu/lib/runner.py b/mamonsu/lib/runner.py
@@ -223,8 +223,8 @@ def is_any_equal(array):
 #  extract pg version from input
 def define_pg_version(version_args):
     if len(version_args) < 4:
-        if version_args == "11" or version_args == "12" or version_args == "10" or version_args == "9.6" \
-                or version_args == "9.5":
+        if version_args == "11" or version_args == "12" or version_args == "13" or version_args == "10" \
+                or version_args == "9.6" or version_args == "9.5":
             version_number = version_args[0].split('.')
             for num in version_number:
                 if not num.isdigit():
diff --git a/mamonsu/plugins/pgsql/oldest.py b/mamonsu/plugins/pgsql/oldest.py
@@ -23,6 +23,7 @@ class Oldest(Plugin):
     OldestTransactionSql_bootstrap = """
 select public.mamonsu_get_oldest_transaction();
 """
+    ParallelQueries = "SELECT count(*) FROM pg_stat_activity WHERE leader_pid is not NULL;"
 
     DEFAULT_CONFIG = {
         'max_xid_age': str(5000 * 60 * 60),
@@ -36,7 +37,9 @@ def run(self, zbx):
         else:
             xid = Pooler.query(self.OldestXidSql)[0][0]
             query = Pooler.query(self.OldestTransactionSql)[0][0]
-
+        if Pooler.server_version_greater('13'):
+            parallel_queries = Pooler.query(self.ParallelQueries)[0][0]
+            zbx.send('pgsql.parallel[queries]', parallel_queries)
         zbx.send('pgsql.oldest[xid_age]', xid)
         zbx.send('pgsql.oldest[transaction_time]', query)
 
@@ -55,6 +58,13 @@ def graphs(self, template):
                 'color': '00CC00'
             }]
         })
+        result += template.graph({
+            'name': 'PostgreSQL number of parallel queries being executed now',
+            'items': [{
+                'key': self.right_type("pgsql.parallel{0}", 'queries'),
+                'color': '0000CC'
+            }]
+        })
         return result
 
     def items(self, template):
@@ -64,11 +74,15 @@ def items(self, template):
             'delay': self.plugin_config('interval'),
             'value_type': Plugin.VALUE_TYPE.numeric_unsigned
         }) + template.item({
-
             'key': self.right_type(self.key, 'transaction_time'),
             'name': 'PostgreSQL: oldest transaction running time in sec',
             'delay': self.plugin_config('interval'),
             'units': Plugin.UNITS.s
+        }) + template.item({
+            'key': self.right_type("pgsql.parallel{0}", 'queries'),
+            'name': 'PostgreSQL: number of parallel queries being executed now',
+            'delay': self.plugin_config('interval'),
+            'value_type': Plugin.VALUE_TYPE.numeric_unsigned
         })
 
     def triggers(self, template):
@@ -84,5 +98,6 @@ def triggers(self, template):
 
     def keys_and_queries(self, template_zabbix):
         result = ['{0}[*],$2 $1 -c "{1}"'.format(self.key.format('.xid_age'), self.OldestXidSql),
-                  '{0}[*],$2 $1 -c "{1}"'.format(self.key.format('.transaction_time'), self.OldestTransactionSql)]
+                  '{0}[*],$2 $1 -c "{1}"'.format(self.key.format('.transaction_time'), self.OldestTransactionSql),
+                  '{0}[*],$2 $1 -c "{1}"'.format("pgsql.parallel{0}".format('.queries'), self.ParallelQueries)]
         return template_zabbix.key_and_query(result)
diff --git a/mamonsu/plugins/pgsql/pg_stat_statement.py b/mamonsu/plugins/pgsql/pg_stat_statement.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from mamonsu.plugins.pgsql.plugin import PgsqlPlugin as Plugin
+from distutils.version import LooseVersion
 from .pool import Pooler
 
 
@@ -33,30 +34,53 @@ class PgStatStatement(Plugin):
          'sum(blk_write_time)/float4(100)',
          'write io time', Plugin.UNITS.s, Plugin.DELTA.speed_per_second,
          ('PostgreSQL statements: spend time', '0000CC', 0)),
-        ('stat[other_time]',
-         'sum(total_time-blk_read_time-blk_write_time)/float4(100)',
+        ['stat[other_time]',
+         'sum({0}-blk_read_time-blk_write_time)/float4(100)',
          'other (mostly cpu) time', Plugin.UNITS.s, Plugin.DELTA.speed_per_second,
-         ('PostgreSQL statements: spend time', 'BBBB00', 0))
+         ('PostgreSQL statements: spend time', 'BBBB00', 0)]]
+
+    Items_pg_13 = [
+
+        # PostgreSQL 13 specific metrics:
+        ('stat[wal_bytes]',
+         'sum(wal_bytes)',
+         'amount of wal files', Plugin.UNITS.bytes, Plugin.DELTA.speed_per_second,
+         ('PostgreSQL statements: wal statistics', 'BCC000', 0)),
+        ('stat[wal_records]',
+         'sum(wal_records)',
+         'amount of wal records', Plugin.UNITS.none, Plugin.DELTA.speed_per_second,
+         ('PostgreSQL statements: wal statistics', 'CC6600', 0)),
+        ('stat[wal_fpi]',
+         'sum(wal_fpi)',
+         'full page writes', Plugin.UNITS.none, Plugin.DELTA.speed_per_second,
+         ('PostgreSQL statements: wal statistics', '00CCCC', 0))
     ]
 
     def run(self, zbx):
         if not self.extension_installed('pg_stat_statements'):
             return
-        params = [x[1] for x in self.Items]
+        if Pooler.server_version_greater('13'):
+            self.Items[5][1] = self.Items[5][1].format("total_exec_time+total_plan_time")
+            all_items = self.Items + self.Items_pg_13
+            params = [x[1] for x in all_items]
+        else:
+            self.Items[5][1] = self.Items[5][1].format("total_time")
+            all_items = self.Items
+            params = [x[1] for x in all_items]
         result = Pooler.query(self.query.format(
             ', '.join(params)))
         for idx, val in enumerate(result[0]):
             key, val = 'pgsql.{0}'.format(
-                self.Items[idx][0]), int(val)
-            zbx.send(key, val, self.Items[idx][4])
+                all_items[idx][0]), int(val)
+            zbx.send(key, val, all_items[idx][4])
 
     def items(self, template):
         result = ''
         if self.Type == "mamonsu":
             delta = Plugin.DELTA.as_is
         else:
             delta = Plugin.DELTA.speed_per_second
-        for item in self.Items:
+        for item in self.Items + self.Items_pg_13:
             # split each item to get values for keys of both agent type and mamonsu type
             keys = item[0].split('[')
             result += template.item({
@@ -71,11 +95,12 @@ def items(self, template):
     def graphs(self, template):
         all_graphs = [
             ('PostgreSQL statements: bytes', None),
-            ('PostgreSQL statements: spend time', 1)]
+            ('PostgreSQL statements: spend time', 1),
+            ('PostgreSQL statements: wal statistics', None)]
         result = ''
         for graph_item in all_graphs:
             items = []
-            for item in self.Items:
+            for item in self.Items + self.Items_pg_13:
                 if item[5][0] == graph_item[0]:
                     keys = item[0].split('[')
                     items.append({
@@ -91,7 +116,14 @@ def graphs(self, template):
 
     def keys_and_queries(self, template_zabbix):
         result = []
-        for i, item in enumerate(self.Items):
+        if LooseVersion(self.VersionPG) < LooseVersion('13'):
+            self.Items[5][1] = self.Items[5][1].format("total_time")
+            all_items = self.Items
+        else:
+            self.Items[5][1] = self.Items[5][1].format("total_exec_time+total_plan_time")
+            all_items = self.Items + self.Items_pg_13
+
+        for i, item in enumerate(all_items):
             keys = item[0].split('[')
             result.append('{0}[*],$2 $1 -c "{1}"'.format('{0}{1}.{2}'.format(self.key, keys[0], keys[1][:-1]),
                                                          self.query.format(item[1])))
