Merge branch 'dev'

Author: cuprumtan

.github/workflows/mamonsu-tests-dev.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         docker_os: ['centos:7']
-        zabbix_version: ['6.0.2']
+        zabbix_version: ['6.0.4']
         pg_version: ['10', '11', '12', '13', '14']
 
     steps:

.github/workflows/mamonsu-tests-master.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         docker_os: ['ubuntu:20.04', 'centos:7']
-        zabbix_version: ['4.0.39', '5.0.22', '5.4.12', '6.0.2']
+        zabbix_version: ['4.0.40', '5.0.23', '5.4.12', '6.0.4']
         pg_version: ['10', '11', '12', '13', '14']
         exclude:
           # excludes PG 9.6 on CentOS 8

documentation/metrics.md

@@ -1304,7 +1304,7 @@ Default config:
 
 ### Triggers
 
-1. **Process fork-rate to frequently on {HOSTNAME}**  
+1. **Process fork-rate too frequently on {HOSTNAME}**  
     Triggers if *Processes: forkrate* greater than 500.
 
 2. **System was restarted on {HOSTNAME} (up_time={ITEM.LASTVALUE})**  
@@ -2240,7 +2240,7 @@ Default config:
 
 ### Triggers
 
-1. **PostgreSQL required checkpoints occurs to frequently on {HOSTNAME}**  
+1. **PostgreSQL required checkpoints occurs too frequently on {HOSTNAME}**  
     Triggers if *PostgreSQL checkpoints: by wal (in hour)* exceeds `max_checkpoint_by_wal_in_hour`.
 
 ### Connections

github-actions-tests/zbx_install.sh

@@ -24,7 +24,7 @@ sudo unzip ${ZBX_VERSION}.zip
 cd zabbix-docker-${ZBX_VERSION} 2>&1 1>/dev/null
 echo "---> Setting up docker with Zabbix ${ZBX_VERSION}..."
 # docker-compose dirty hack: it uses only file named 'docker-compose.yml'
-yes | sudo cp docker-compose_v3_ubuntu_mysql_latest.yaml docker-compose.yml
+yes | sudo cp docker-compose_v3_alpine_mysql_latest.yaml docker-compose.yml
 docker-compose -f ./docker-compose.yml up -d
 # wait for full set up
 sleep 1m

mamonsu/plugins/pgsql/checkpoint.py

@@ -121,7 +121,7 @@ def graphs(self, template, dashboard=False):
 
     def triggers(self, template, dashboard=False):
         return template.trigger({
-            "name": "PostgreSQL Checkpoints: required checkpoints occurs to frequently on {HOSTNAME}",
+            "name": "PostgreSQL Checkpoints: required checkpoints occurs too frequently on {HOSTNAME}",
             "expression": "{#TEMPLATE:" + self.right_type(self.key,
                                                           self.Items[1][1]) + ".last()}>" + self.plugin_config(
                 "max_checkpoint_by_wal_in_hour")

mamonsu/plugins/pgsql/databases.py

@@ -37,13 +37,6 @@ class Databases(Plugin):
     AND l.relation IS NULL;
     """
 
-    # PG 14+ queries
-    query_sessions = """
-    SELECT {0}
-    FROM pg_catalog.pg_stat_database
-    WHERE datname = '{1}';
-    """
-
     # queries for zabbix agent
     query_agent_discovery = """
     SELECT json_build_object ('data',json_agg(json_build_object('{#DATABASE}',d.datname)))
@@ -60,15 +53,6 @@ class Databases(Plugin):
     key_autovacumm = "pgsql.autovacumm.count{0}"
     key_invalid_indexes = "pgsql.database.invalid_indexes{0}"
 
-    # PG 14+ keys
-    key_db_sessions = [("sessions", "pgsql.database.sessions[{0}]", "Total Number of Sessions", Plugin.UNITS.none, Plugin.VALUE_TYPE.numeric_unsigned),
-                       ("sessions_abandoned", "pgsql.database.sessions_abandoned[{0}]", "Client Lost Connection Terminated Sessions", Plugin.UNITS.none, Plugin.VALUE_TYPE.numeric_unsigned),
-                       ("sessions_fatal", "pgsql.database.sessions_fatal[{0}]", "Fatal Errors Terminated Sessions", Plugin.UNITS.none, Plugin.VALUE_TYPE.numeric_unsigned),
-                       ("sessions_killed", "pgsql.database.sessions_killed[{0}]", "Operator Intervention Terminated Sessions", Plugin.UNITS.none, Plugin.VALUE_TYPE.numeric_unsigned),
-                       ("session_time", "pgsql.database.session_time[{0}]", "Time Spent by Sessions", Plugin.UNITS.ms, Plugin.VALUE_TYPE.numeric_float),
-                       ("active_time", "pgsql.database.active_time[{0}]", "Time Spent Executing SQL Statements", Plugin.UNITS.ms, Plugin.VALUE_TYPE.numeric_float),
-                       ("idle_in_transaction_time", "pgsql.database.idle_in_transaction_time[{0}]", "Time Spent Idling While in a Transaction", Plugin.UNITS.ms, Plugin.VALUE_TYPE.numeric_float)]
-
     DEFAULT_CONFIG = {
         "min_rows": str(50),
         "bloat_scale": str(0.2)
@@ -94,12 +78,6 @@ def run(self, zbx):
             zbx.send("pgsql.database.bloating_tables[{0}]".format(info[0]), int(bloat_count))
             invalid_indexes_count = Pooler.query(self.query_invalid_indexes, info[0])[0][0]
             zbx.send("pgsql.database.invalid_indexes[{0}]".format(info[0]), int(invalid_indexes_count))
-
-            if Pooler.server_version_greater("14"):
-                for session_item in self.key_db_sessions:
-                    session_result = Pooler.query(self.query_sessions.format(session_item[0], info[0]), info[0])[0][0]
-                    zbx.send(session_item[1].format(info[0]), int(session_result))
-
         zbx.send("pgsql.database.discovery[]", zbx.json({"data": dbs}))
         del dbs, bloat_count, invalid_indexes_count
 
@@ -173,17 +151,6 @@ def discovery_rules(self, template, dashboard=False):
              "name": "PostgreSQL Databases: Count of Invalid Indexes in {#DATABASE}",
              "delay": self.plugin_config("interval")}
         ]
-
-        if Pooler.server_version_greater("14"):
-            for session_item in self.key_db_sessions:
-                items.append({
-                    "key": self.right_type(session_item[1], var_discovery="{#DATABASE},"),
-                    "name": "PostgreSQL Databases {{#DATABASE}}: {0}".format(session_item[2]),
-                    "units": session_item[3],
-                    "value_type": session_item[4],
-                    "delay": self.plugin_config("interval")
-                })
-
         graphs = [{
             "name": "PostgreSQL Databases: {#DATABASE} size",
             "type": 1,

mamonsu/plugins/pgsql/wal.py

@@ -129,7 +129,7 @@ def items(self, template, dashboard=False):
             "value_type": Plugin.VALUE_TYPE.numeric_float,
             "units": Plugin.UNITS.percent,
             "type": Plugin.TYPE.CALCULATED,
-            "params": "last(" + self.key_wal_sync_time + ")/10/" + self.plugin_config("interval")
+            "params": "last(" + self.key_wal_sync_time + ")/10"
         })
         if not dashboard:
             return result

mamonsu/plugins/system/linux/proc_stat.py

@@ -142,7 +142,7 @@ def graphs(self, template, dashboard=False):
     def triggers(self, template, dashboard=False):
         return template.trigger(
             {
-                "name": "Process fork-rate to frequently on {HOSTNAME}",
+                "name": "Process fork-rate too frequently on {HOSTNAME}",
                 "expression": "{#TEMPLATE:" + self.right_type("system.processes{0}", "forkrate") +
                               ".min(5m)}>" + str(self.ForkRate)
             }