feature: created detached Autovacuum plugin

Author: cuprumtan

github-actions-tests/sources/agent_3.4.0.conf

@@ -84,6 +84,9 @@ interval = 15
 [bgwriter]
 interval = 15
 
+[autovacuum]
+interval = 60
+
 [connections]
 percent_connections_tr = 90
 interval = 15

github-actions-tests/sources/agent_3.5.0.conf

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+from distutils.version import LooseVersion
+from mamonsu.plugins.pgsql.plugin import PgsqlPlugin as Plugin
+from .pool import Pooler
+from mamonsu.lib.zbx_template import ZbxTemplate
+
+class Autovacuum(Plugin):
+    
+    AgentPluginType = "pg"
+    key = "pgsql.autovacuum.count{0}"
+
+    def run(self, zbx):
+        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.autovacuum.count[]", int(result[0][0]))
+    
+    def items(self, template, dashboard=False):
+        if not dashboard:
+            return template.item({
+                "name": "PostgreSQL Autovacuum: Count of Autovacuum Workers",
+                "key": self.right_type(self.key),
+                "delay": self.plugin_config("interval")
+            })
+        else:
+            return []
+    
+    def graphs(self, template, dashboard=False):
+        result = template.graph({
+            "name": "PostgreSQL Autovacuum: Count of Autovacuum Workers",
+            "items": [{
+                "key": self.right_type(self.key),
+                "color": "87C2B9",
+                "drawtype": 2
+            }]
+        })
+        if not dashboard:
+            return result
+        else:
+            return [{
+                "dashboard": {"name": "PostgreSQL Autovacuum: Count of Autovacuum Workers",
+                              "page": ZbxTemplate.dashboard_page_overview["name"],
+                              "size": ZbxTemplate.dashboard_widget_size_medium,
+                              "position": 5}
+            }]
+
+    def keys_and_queries(self, template_zabbix):
+        result = []
+        if LooseVersion(self.VersionPG) >= LooseVersion("10"):
+            result.append("{0},$2 $1 -c \"{1}\"".format(self.key.format("[*]"), 
+                                                        Pooler.SQL["count_autovacuum"][0].format("backend_type = 'autovacuum worker'")))
+        else:
+            result.append("{0},$2 $1 -c \"{1}\"".format(self.key.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/autovacuum.py

@@ -4,6 +4,7 @@
 from mamonsu.plugins.pgsql.plugin import PgsqlPlugin as Plugin
 from .pool import Pooler
 from mamonsu.lib.zbx_template import ZbxTemplate
+from mamonsu.plugins.pgsql.autovacuum import Autovacuum
 
 
 class Databases(Plugin):
@@ -50,7 +51,6 @@ class Databases(Plugin):
     key_db_size = "pgsql.database.size{0}"
     key_db_age = "pgsql.database.max_age{0}"
     key_db_bloating_tables = "pgsql.database.bloating_tables{0}"
-    key_autovacumm = "pgsql.autovacumm.count{0}"
     key_invalid_indexes = "pgsql.database.invalid_indexes{0}"
 
     DEFAULT_CONFIG = {
@@ -81,42 +81,6 @@ def run(self, zbx):
         zbx.send("pgsql.database.discovery[]", zbx.json({"data": dbs}))
         del dbs, bloat_count, invalid_indexes_count
 
-        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):
-        if not dashboard:
-            return template.item({
-                "name": "PostgreSQL Autovacuum: Count of Autovacuum Workers",
-                "key": self.right_type(self.key_autovacumm),
-                "delay": self.plugin_config("interval")
-            })
-        else:
-            return []
-
-    def graphs(self, template, dashboard=False):
-        result = template.graph({
-            "name": "PostgreSQL Autovacuum: Count of Autovacuum Workers",
-            "items": [{
-                "key": self.right_type(self.key_autovacumm),
-                "color": "87C2B9",
-                "drawtype": 2
-            }]
-        })
-        if not dashboard:
-            return result
-        else:
-            return [{
-                "dashboard": {"name": "PostgreSQL Autovacuum: Count of Autovacuum Workers",
-                              "page": ZbxTemplate.dashboard_page_overview["name"],
-                              "size": ZbxTemplate.dashboard_widget_size_medium,
-                              "position": 5}
-            }]
-
     def discovery_rules(self, template, dashboard=False):
         rule = {
             "name": "PostgreSQL Databases Discovery",
@@ -166,7 +130,7 @@ def discovery_rules(self, template, dashboard=False):
                      "key": self.right_type(self.key_db_bloating_tables, var_discovery="{#DATABASE},"),
                      "drawtype": 2},
                     {"color": "793F5D",
-                     "key": self.right_type(self.key_autovacumm),
+                     "key": self.right_type(Autovacuum.key),
                      "yaxisside": 1,
                      "drawtype": 2}]
             },
@@ -177,7 +141,7 @@ def discovery_rules(self, template, dashboard=False):
                      "key": self.right_type(self.key_db_age, var_discovery="{#DATABASE},"),
                      "drawtype": 2},
                     {"color": "793F5D",
-                     "key": self.right_type(self.key_autovacumm),
+                     "key": self.right_type(Autovacuum.key),
                      "yaxisside": 1,
                      "drawtype": 2}]
             }]
@@ -197,12 +161,4 @@ 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/databases.py

@@ -85,6 +85,9 @@ interval = 60
 max_count_files = 2
 interval = 60
 
+[autovacuum]
+interval = 60
+
 [bgwriter]
 interval = 60
 

packaging/conf/example_linux.conf

@@ -85,6 +85,9 @@ interval = 60
 max_count_files = 2
 interval = 60
 
+[autovacuum]
+interval = 60
+
 [bgwriter]
 interval = 60