Merge branch 'dev'

Author: cuprumtan

Diff for: github-actions-tests/sources/agent_3.5.0.conf

@@ -78,112 +78,112 @@ format = [%(levelname)s] %(asctime)s - %(name)s	-	%(message)s
 # below listed all available parameters for each plugin to modify.
 
 [health]
-max_memory_usage = 41943040
-interval = 15
+interval = 60
 
-[bgwriter]
-interval = 15
+[archivecommand]
+interval = 60
 
 # Besides standard autovacuum workers count, mamonsu also counts autovacuum utilization.
 # But this metric is instantaneous, so recommended to run this plugin frequently
 # to get a complete picture of autovacuum utilization.
 [autovacuum]
 interval = 30
 
+[bgwriter]
+interval = 60
+
+[cfs]
+force_enable = False
+interval = 60
+
+[checkpoint]
+interval = 300
+
 [connections]
-percent_connections_tr = 90
-interval = 15
+interval = 60
 
 [databases]
-bloat_scale = 0.2
-min_rows = 50
-interval = 15
+interval = 300
 
 [pghealth]
-uptime = 600
-cache = 80
-interval = 15
+interval = 60
 
 [instance]
-interval = 15
+interval = 60
 
-[xlog]
-lag_more_than_in_sec = 300
+# This plugin allows detects possible memory leaks while working with PostgreSQL using /proc/pid/status and /proc/pid/statm
+# We use RES and SHR difference to calculate approximate volume of private anonymous backend memory.
+# If it exceeds private_anon_mem_threshold then that pid will be added to a message. An example is presented below
+# statm -  'pid: {pid},  RES {RES} - SHR {SHR} more then {private_anon_mem_threshold}\n'
+# Since Linux 4.5 RssAnon, RssFile and RssShmem have been added.
+# They allows to distinguish types of memory such as private anonymous, file-backed, and shared anonymous memory.
+# We are interested in RssAnon. If its value exceeds private_anon_mem_threshold then that pid will also be added to a message.
+# By default this plugin disabled. To enable this plugin - set bellow "enabled = False"
+# #interval - (onitoring frequency in seconds. 60 seconds by default
+# private_anon_mem_threshold - memory volume threshold after which we need an investigation about memory leak. 1GB by default.
+# Possible values MB, GB, TB. For example 1GB
+[memoryleakdiagnostic]
+enabled = True
 interval = 15
+private_anon_mem_threshold = 1GB
 
-[statements]
-interval = 15
+[oldest]
+interval = 60
 
 [pgbuffercache]
-interval = 15
-
-[waitsampling]
-interval = 15
-
-[checkpoint]
-max_checkpoint_by_wal_in_hour = 12
-interval = 15
-
-[oldest]
-max_xid_age = 18000000
-max_query_time = 18000
-interval = 15
+interval = 60
 
 [pglocks]
-interval = 15
-
-[cfs]
-force_enable = False
-interval = 15
+interval = 60
 
-[archivecommand]
-max_count_files = 2
-interval = 15
+# Get age (in seconds) of the oldest running prepared transaction and number of all prepared transactions for two-phase commit.
+# https://www.postgresql.org/docs/current/sql-prepare-transaction.html
+# https://www.postgresql.org/docs/12/view-pg-prepared-xacts.html
+# max_prepared_transaction_time - age of prepared transaction in seconds.
+# If pgsql.prepared.oldest exceeds max_prepared_transaction_time the trigger fires.
+[preparedtransaction]
+interval = 60
 
-[procstat]
+# Get size of relations defined in this section
+# Relations - comma separated list of objects - tables and endexes (database_name.schema.relation) used to calculate relations size.
+# Example:
+# relations=postgres.pg_catalog.pg_class,postgres.pg_catalog.pg_user
+# If the relation is blocked by some process such as vacuum full or create index, the result will be -1
+# by default this plugin disabled. To enable this plugin - set bellow "enabled = False" and define a list of relations.
+[relationssize]
+enabled = True
+relations=postgres.pg_catalog.pg_class,mamonsu_test_db.mamonsu.config
 interval = 15
 
-[diskstats]
-interval = 15
+[replication]
+interval = 60
 
-[disksizes]
-vfs_percent_free = 10
-vfs_inode_percent_free = 10
-interval = 15
+[statstatements]
+interval = 60
 
-[memory]
-interval = 15
+[waitsampling]
+interval = 60
 
-[systemuptime]
-up_time = 300
-interval = 15
+[wal]
+interval = 60
 
-[openfiles]
-interval = 15
+[disksizes]
+interval = 60
 
-[net]
-interval = 15
+[diskstats]
+interval = 60
 
 [la]
-interval = 15
-
-[zbxsender]
-interval = 10
+interval = 60
 
-[logsender]
-interval = 2
+[memory]
+interval = 60
 
-[agentapi]
-interval = 15
+[net]
+interval = 60
 
-# Get age (in seconds) of the oldest running prepared transaction and number of all prepared transactions for two-phase commit.
-# https://www.postgresql.org/docs/current/sql-prepare-transaction.html
-# https://www.postgresql.org/docs/12/view-pg-prepared-xacts.html
-# max_prepared_transaction_time - age of prepared transaction in seconds.
-# If pgsql.prepared.oldest exceeds max_prepared_transaction_time the trigger fires.
-[preparedtransaction]
-max_prepared_transaction_time = 60
-interval = 15
+[openfiles]
+interval = 60
 
 # Get size of backup catalogs stroring all WAL and backup files using pg_probackup
 # (https://github.com/postgrespro/pg_probackup)
@@ -194,29 +194,17 @@ interval = 300
 backup_dirs = /backup_dir1,/backup_dir2
 pg_probackup_path = /usr/bin/pg_probackup-11
 
-# Get size of relations defined in this section
-# Relations - comma separated list of objects - tables and endexes (database_name.schema.relation) used to calculate relations size.
-# Example:
-# relations=postgres.pg_catalog.pg_class,postgres.pg_catalog.pg_user
-# If the relation is blocked by some process such as vacuum full or create index, the result will be -1
-# by default this plugin disabled. To enable this plugin - set bellow "enabled = False" and define a list of relations.
-[relationssize]
-enabled = True
-relations=postgres.pg_catalog.pg_class,mamonsu_test_db.mamonsu.config
-interval = 15
+[procstat]
+interval = 60
 
-# This plugin allows detects possible memory leaks while working with PostgreSQL using /proc/pid/status and /proc/pid/statm
-# We use RES and SHR difference to calculate approximate volume of private anonymous backend memory.
-# If it exceeds private_anon_mem_threshold then that pid will be added to a message. An example is presented below
-# statm -  'pid: {pid},  RES {RES} - SHR {SHR} more then {private_anon_mem_threshold}\n'
-# Since Linux 4.5 RssAnon, RssFile and RssShmem have been added.
-# They allows to distinguish types of memory such as private anonymous, file-backed, and shared anonymous memory.
-# We are interested in RssAnon. If its value exceeds private_anon_mem_threshold then that pid will also be added to a message.
-# By default this plugin disabled. To enable this plugin - set bellow "enabled = False"
-# #interval - (onitoring frequency in seconds. 60 seconds by default
-# private_anon_mem_threshold - memory volume threshold after which we need an investigation about memory leak. 1GB by default.
-# Possible values MB, GB, TB. For example 1GB
-[memoryleakdiagnostic]
-enabled = True
-interval = 15
-private_anon_mem_threshold = 1GB
+[systemuptime]
+interval = 60
+
+[agentapi]
+interval = 60
+
+[logsender]
+interval = 2
+
+[zbxsender]
+interval = 10

Diff for: mamonsu/lib/plugin.py

@@ -148,6 +148,9 @@ def items(self, template, dashboard=False):
     def graphs(self, template, dashboard=False):
         return None
 
+    def macros(self, template, dashboard=False):
+        return None
+
     def triggers(self, template, dashboard=False):
         return None
 

Diff for: mamonsu/lib/sender.py

@@ -41,7 +41,10 @@ def send(self, key, value, delta=None, host=None, clock=None, only_positive_spee
                     last_value, last_time = self._last_values[hash_key]
                     self._last_values[hash_key] = (value, clock)
                     if delta == Plugin.DELTA.speed_per_second:
-                        value = float(value - last_value) / (clock - last_time)
+                        if last_time == clock:
+                            pass
+                        else:
+                            value = float(value - last_value) / (clock - last_time)
                     if delta == Plugin.DELTA.simple_change:
                         value = float(value - last_value)
                 else:

Diff for: mamonsu/lib/zbx_template.py

@@ -32,8 +32,8 @@ class ZbxTemplate(object):
             </applications>
             <items>{items}</items>
             <discovery_rules>{discovery_rules}</discovery_rules>
-            <screens>{screens}</screens>
             <macros>{macros}</macros>
+            <screens>{screens}</screens>
         </template>
     </templates>
     <triggers>{triggers}</triggers>
@@ -172,15 +172,14 @@ def xml(self, plg_type, plugins=None):
         self.plg_type = plg_type
         # create template
         template_data = {'template': self.Template, 'application': self.Application}
-        if Plugin.Type == 'agent':
-            template_data['macros'] = self._macro()
-        else:
-            template_data['macros'] = ""
-        template_data['triggers'] = self._get_all('triggers', plugins)
         template_data['items'] = self._get_all('items', plugins)
-        template_data['graphs'] = self._get_all('graphs', plugins)
         template_data['discovery_rules'] = self._get_all('discovery_rules', plugins)
+        if Plugin.Type == 'agent':
+            template_data['macros'] = self.agent_macro()
+        template_data['macros'] = self._get_all('macros', plugins)
         template_data['screens'] = self.screen(plugins)
+        template_data['triggers'] = self._get_all('triggers', plugins)
+        template_data['graphs'] = self._get_all('graphs', plugins)
         output_xml = self.mainTemplate.format(**template_data)
         if Plugin.Type == 'agent':
             output_xml = ZbxTemplate.turn_agent_type(self, output_xml)
@@ -300,14 +299,21 @@ def screen(self, plugins=None, xml_key='screen'):
                                                     xml_key)
         return result
 
-    def _macro(self, xml_key='macro'):
+    def agent_macro(self, xml_key='macro'):
         result = ''
         value = {'value': '-qAt -p 5433 -U postgres ', 'macro': "{$PG_CONNINFO}"}
         result += '<{1}>{0}</{1}>'.format(self._format_args(self.macro_defaults, value), xml_key)
         value = {'value': '/opt/pgpro/std-10/bin/psql', 'macro': "{$PG_PATH}"}
         result += '<{1}>{0}</{1}>'.format(self._format_args(self.macro_defaults, value), xml_key)
         return result
 
+    def mamonsu_macro(self, args=None, xml_key='macro', defaults=None):
+        if args is None:
+            args = {}
+        if defaults is None:
+            defaults = self.macro_defaults
+        return '<{1}>{0}</{1}>'.format(self._format_args(defaults, args), xml_key)
+
     def item(self, args=None, xml_key='item', prototype=False):
         if args is None:
             args = {}

Diff for: mamonsu/plugins/common/health.py

@@ -9,8 +9,9 @@ class Health(Plugin):
 
     AgentPluginType = "sys"
 
-    DEFAULT_CONFIG = {
-        "max_memory_usage": str(40 * 1024 * 1024)
+    # key: (macro, value)
+    plugin_macros = {
+        "mamonsu_max_memory_usage": [("macro", "{$MAMONSU_MAX_MEMORY_USAGE}"), ("value", 40 * 1024 * 1024)]
     }
 
     counter = 0
@@ -52,6 +53,15 @@ def items(self, template, dashboard=False):
         else:
             return []
 
+    def macros(self, template, dashboard=False):
+        result = ""
+        for macro in self.plugin_macros.keys():
+            result += template.mamonsu_macro(defaults=self.plugin_macros[macro])
+        if not dashboard:
+            return result
+        else:
+            return []
+
     def triggers(self, template, dashboard=False):
         if self.Type == "mamonsu":
             result = template.trigger({
@@ -64,8 +74,7 @@ def triggers(self, template, dashboard=False):
             if platform.LINUX:
                 result += template.trigger({
                     "name": "Mamonsu health: agent memory usage alert on {HOSTNAME}: {ITEM.LASTVALUE} bytes",
-                    "expression": "{#TEMPLATE:mamonsu.memory.rss[max].last()}>" + self.plugin_config(
-                        "max_memory_usage")
+                    "expression": "{#TEMPLATE:mamonsu.memory.rss[max].last()}>" + self.plugin_macros["mamonsu_max_memory_usage"][0][1]
                 })
         else:
             result = template.trigger({

Diff for: mamonsu/plugins/pgsql/archive_command.py

@@ -9,11 +9,13 @@
 
 class ArchiveCommand(Plugin):
     AgentPluginType = "pg"
-    DEFAULT_CONFIG = {
-        "max_count_files": str(2)
-    }
     Interval = 60
 
+    # key: (macro, value)
+    plugin_macros = {
+        "archive_queue_files": [("macro", "{$ARCHIVE_QUEUE_FILES}"), ("value", 2)]
+    }
+
     # if streaming replication is on, archive queue length and size will always be 0 for replicas
     query_agent_count_files = """
     WITH values AS (
@@ -177,12 +179,20 @@ def graphs(self, template, dashboard=False):
                               "position": 1}
             }]
 
+    def macros(self, template, dashboard=False):
+        result = ""
+        for macro in self.plugin_macros.keys():
+            result += template.mamonsu_macro(defaults=self.plugin_macros[macro])
+        if not dashboard:
+            return result
+        else:
+            return []
+
     def triggers(self, template, dashboard=False):
         return template.trigger({
             "name": "PostgreSQL Archiver: count files need to archive on {HOSTNAME} more than 2",
             "expression": "{#TEMPLATE:" + self.right_type(self.key,
-                                                          self.Items[0][0]) + ".last()}>" + self.plugin_config(
-                "max_count_files")
+                                                          self.Items[0][0]) + ".last()}>" + self.plugin_macros["archive_queue_files"][0][1]
         })
 
     def keys_and_queries(self, template_zabbix):