feature: upgraded Autovacuum Count metric for PG 10+

Author: cuprumtan

mamonsu/plugins/pgsql/databases.py

@@ -64,7 +64,10 @@ def run(self, zbx):
         zbx.send('pgsql.database.discovery[]', zbx.json({'data': dbs}))
         del dbs, bloat_count, invalid_indexes_count
 
-        result = Pooler.run_sql_type('count_autovacuum')
+        if Pooler.server_version_greater('10.0'):
+            result = Pooler.run_sql_type('count_autovacuum', args=["backend_type = 'autovacuum worker'"])
+        else:
+            result = Pooler.run_sql_type('count_autovacuum', args=["query LIKE '%%autovacuum%%' AND state <> 'idle' AND pid <> pg_catalog.pg_backend_pid()"])
         zbx.send('pgsql.autovacumm.count[]', int(result[0][0]))
 
     def items(self, template, dashboard=False):
@@ -152,8 +155,7 @@ def discovery_rules(self, template, dashboard=False):
         return template.discovery_rule(rule=rule, conditions=conditions, items=items, graphs=graphs, triggers=triggers)
 
     def keys_and_queries(self, template_zabbix):
-        result = ['{0},$2 $1 -c "{1}"'.format(self.key_autovacumm.format("[*]"), Pooler.SQL['count_autovacuum'][0]),
-                  '{0},$2 $1 -c "{1}"'.format(self.key_db_discovery.format("[*]"), self.query_agent_discovery),
+        result = ['{0},$2 $1 -c "{1}"'.format(self.key_db_discovery.format("[*]"), self.query_agent_discovery),
                   '{0},echo "{1}" | $3 $2 -v p1="$1"'.format(self.key_db_size.format("[*]"), self.query_size),
                   '{0},echo "{1}" | $3 $2 -v p1="$1"'.format(self.key_db_age.format("[*]"), self.query_age),
                   '{0},$3 $2 -d "$1" -c "{1}"'.format(self.key_db_bloating_tables.format("[*]"),
@@ -162,4 +164,8 @@ def keys_and_queries(self, template_zabbix):
                                                           self.plugin_config('min_rows'))),
                   '{0},$3 $2 -d "$1" -c "{1}"'.format(self.key_invalid_indexes.format("[*]"),
                                                       self.query_invalid_indexes)]
+        if LooseVersion(self.VersionPG) >= LooseVersion('10'):
+            result.append('{0},$2 $1 -c "{1}"'.format(self.key_autovacumm.format("[*]"), Pooler.SQL['count_autovacuum'][0].format("backend_type = 'autovacuum worker'")))
+        else:
+            result.append('{0},$2 $1 -c "{1}"'.format(self.key_autovacumm.format("[*]"), Pooler.SQL['count_autovacuum'][0].format("query LIKE '%%autovacuum%%' AND state <> 'idle' AND pid <> pg_catalog.pg_backend_pid()")))
         return template_zabbix.key_and_query(result)

mamonsu/plugins/pgsql/driver/pool.py

@@ -23,9 +23,7 @@ class Pool(object):
             'select mamonsu.count_{0}_files()'
         ),
         'count_autovacuum': (
-            "select count(*) from pg_catalog.pg_stat_activity where "
-            "query like '%%autovacuum%%' and state <> 'idle' "
-            "and pid <> pg_catalog.pg_backend_pid() ",
+            "SELECT count(*) FROM pg_catalog.pg_stat_activity WHERE {0};",
             'select mamonsu.count_autovacuum()'
         ),
         'buffer_cache': (

mamonsu/tools/bootstrap/sql.py

@@ -58,16 +58,26 @@
   WHERE id = 1 LIMIT 1;
 $$ LANGUAGE SQL SECURITY DEFINER;
 
-CREATE OR REPLACE FUNCTION mamonsu.count_autovacuum()
-RETURNS BIGINT AS $$
-    SELECT
-        count(*)::BIGINT
-    FROM pg_catalog.pg_stat_activity
-    WHERE
-        query like '%%autovacuum%%'
-        and state <> 'idle'
-        and pid <> pg_catalog.pg_backend_pid()
-$$ LANGUAGE SQL SECURITY DEFINER;
+DO
+$do$
+BEGIN
+   IF (SELECT setting::integer FROM pg_settings WHERE name = 'server_version_num') >= 10000 THEN
+      CREATE OR REPLACE FUNCTION mamonsu.count_autovacuum()
+      RETURNS BIGINT AS $$
+         SELECT count(*)::bigint FROM pg_catalog.pg_stat_activity
+         WHERE backend_type = 'autovacuum worker'
+      $$ LANGUAGE SQL SECURITY DEFINER;
+   ELSE
+      CREATE OR REPLACE FUNCTION mamonsu.count_autovacuum()
+      RETURNS BIGINT AS $$
+         SELECT count(*)::bigint FROM pg_catalog.pg_stat_activity
+         WHERE query LIKE '%%autovacuum%%'
+         AND state <> 'idle'
+         AND pid <> pg_catalog.pg_backend_pid()
+      $$ LANGUAGE SQL SECURITY DEFINER;
+   END IF;
+END
+$do$;
 
 CREATE OR REPLACE FUNCTION mamonsu.get_connections_states()
 RETURNS TABLE(state text, waiting boolean) AS $$