feature: added new zabbix cli 'dashboard' feature (only for Zabbix 6.0+)

Author: cuprumtan

mamonsu/lib/parser.py

@@ -92,6 +92,7 @@
     {prog} zabbix item error <host name>
     {prog} zabbix item lastvalue <host name>
     {prog} zabbix item lastclock <host name>
+    {prog} zabbix dashboard upload <template name>
     {prog} zabbix version
 
 Options:

mamonsu/plugins/pgsql/bgwriter.py

@@ -47,6 +47,9 @@ class BgWriter(Plugin):
          Plugin.DELTA.simple_change)
     ]
 
+    graph_name_buffers = "PostgreSQL bgwriter buffers"
+    graph_name_ws = "PostgreSQL bgwriter write/sync"
+
     def run(self, zbx):
         columns = [x[0] for x in self.Items]
         result = Pooler.query(self.query.format(", ".join(columns)))
@@ -88,24 +91,23 @@ def graphs(self, template, dashboard=False):
                     "color": item[3][1]
                 })
         result = template.graph({
-            "name": "PostgreSQL bgwriter buffers",
+            "name": self.graph_name_buffers,
             "items": items_buffers
-        }) + \
-                 template.graph({
-                     "name": "PostgreSQL bgwriter write/sync",
-                     "items": items_write_sync
-                 })
+        }) + template.graph({
+            "name": self.graph_name_ws,
+            "items": items_write_sync
+        })
         if not dashboard:
             return result
         else:
             return [{
-                "dashboard": {"name": "PostgreSQL bgwriter buffers",
+                "dashboard": {"name": self.graph_name_buffers,
                               "page": ZbxTemplate.dashboard_page_overview["name"],
                               "size": ZbxTemplate.dashboard_widget_size_medium,
                               "position": 7}
             },
                 {
-                    "dashboard": {"name": "PostgreSQL bgwriter write/sync",
+                    "dashboard": {"name": self.graph_name_ws,
                                   "page": ZbxTemplate.dashboard_page_overview["name"],
                                   "size": ZbxTemplate.dashboard_widget_size_medium,
                                   "position": 8}

mamonsu/plugins/pgsql/checkpoint.py

@@ -48,6 +48,9 @@ class Checkpoint(Plugin):
          Plugin.UNITS.ms, Plugin.DELTA.speed_per_second, 1)
     ]
 
+    graph_name_count = "PostgreSQL checkpoints count"
+    graph_name_ws = "PostgreSQL checkpoints write/sync"
+
     def run(self, zbx):
         columns = [x[0] for x in self.Items]
         result = Pooler.query(self.query.format(", ".join(columns)))
@@ -92,13 +95,12 @@ def graphs(self, template, dashboard=False):
                     "delay": self.Interval
                 })
         result = template.graph({
-            "name": "PostgreSQL checkpoints count",
+            "name": self.graph_name_count,
             "items": items_checkpoints
-        }) + \
-                 template.graph({
-                     "name": "PostgreSQL checkpoints write/sync",
-                     "items": items_checkpoints_write_sync
-                 })
+        }) + template.graph({
+             "name": self.graph_name_ws,
+             "items": items_checkpoints_write_sync
+        })
         if not dashboard:
             return result
         else:

mamonsu/plugins/pgsql/connections.py

@@ -68,6 +68,7 @@ class Connections(Plugin):
     WHERE name = 'max_connections';
     """
     key = "pgsql.connections{0}"
+    graph_name = "PostgreSQL connections"
 
     def run(self, zbx):
         if Pooler.is_bootstraped() and Pooler.bootstrap_version_greater("2.3.4"):
@@ -201,7 +202,7 @@ def graphs(self, template, dashboard=False):
             })
 
         graph = {
-            "name": "PostgreSQL connections",
+            "name": self.graph_name,
             "items": items
         }
 

mamonsu/plugins/pgsql/instance.py

@@ -76,6 +76,12 @@ class Instance(Plugin):
            END;
     """
 
+    graphs_name = {
+        "rate": "PostgreSQL instance: rate",
+        "events": "PostgreSQL instance: events",
+        "temp": "PostgreSQL instance: temp files",
+        "tuples": "PostgreSQL instance: tuples"}
+
     def run(self, zbx):
         all_items = self.Items
         if Pooler.server_version_greater("12.0"):
@@ -144,13 +150,8 @@ def items(self, template, dashboard=False):
                 }]
 
     def graphs(self, template, dashboard=False):
-        graphs_name = [
-            "PostgreSQL instance: rate",
-            "PostgreSQL instance: events",
-            "PostgreSQL instance: temp files",
-            "PostgreSQL instance: tuples"]
         result = ""
-        for name in graphs_name:
+        for name in self.graphs_name.values():
             items = []
             for num, item in enumerate(self.Items + self.Items_pg_12):
                 if item[3][0] == name:

mamonsu/plugins/pgsql/pg_buffercache.py

@@ -28,6 +28,8 @@ class PgBufferCache(Plugin):
         ("dirty", "PostgreSQL: shared buffer dirty size", "00CC00")
     ]
 
+    graph_name = "PostgreSQL: shared buffer"
+
     def run(self, zbx):
         if not self.extension_installed("pg_buffercache"):
             return
@@ -57,11 +59,11 @@ def graphs(self, template, dashboard=False):
                 "color": item[2]})
         if not dashboard:
             return template.graph({
-                "name": "PostgreSQL: shared buffer",
+                "name": self.graph_name,
                 "items": items})
         else:
             return [{
-                "dashboard": {"name": "PostgreSQL: shared buffer",
+                "dashboard": {"name": self.graph_name,
                               "page": ZbxTemplate.dashboard_page_overview["name"],
                               "size": ZbxTemplate.dashboard_widget_size_medium,
                               "position": 2}

mamonsu/plugins/pgsql/pg_locks.py

@@ -47,6 +47,8 @@ class PgLocks(Plugin):
          "00CCCC")
     ]
 
+    graph_name = "PostgreSQL locks sampling"
+
     def run(self, zbx):
         result = Pooler.query(self.query)
         for item in self.Items:
@@ -81,7 +83,8 @@ def items(self, template, dashboard=False):
             return lock_graphs
 
     def graphs(self, template, dashboard=False):
-        name, items = "PostgreSQL locks sampling", []
+        name = self.graph_name
+        items = []
         for item in self.Items:
             items.append({
                 "key": self.right_type(self.key, item[0]),

mamonsu/plugins/pgsql/pg_stat_statement.py

@@ -75,6 +75,11 @@ class PgStatStatement(Plugin):
          ("PostgreSQL statements info: last statistics reset", "0000CC", 0))
     ]
 
+    all_graphs = [
+        ("PostgreSQL statements: bytes", None),
+        ("PostgreSQL statements: spend time", 1),
+        ("PostgreSQL statements: wal statistics", None)]
+
     def run(self, zbx):
         if not self.extension_installed("pg_stat_statements"):
             return
@@ -124,12 +129,8 @@ def items(self, template, dashboard=False):
             return []
 
     def graphs(self, template, dashboard=False):
-        all_graphs = [
-            ("PostgreSQL statements: bytes", None),
-            ("PostgreSQL statements: spend time", 1),
-            ("PostgreSQL statements: wal statistics", None)]
         result = ""
-        for graph_item in all_graphs:
+        for graph_item in self.all_graphs:
             items = []
             for item in self.Items + self.Items_pg_13:
                 if item[5][0] == graph_item[0]: