Merge branch 'dev'

Author: cuprumtan

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

@@ -59,7 +59,7 @@ jobs:
           echo "::set-output name=zabbix_address::$(hostname -I | awk '{print $1}')"
         id: zabbix_address
       - name: Edit Zabbix address in agent.conf
-        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.0.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.4.0.conf
 
       - name: Copy test scripts to container
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/

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

@@ -63,7 +63,7 @@ jobs:
           echo "::set-output name=zabbix_address::$(hostname -I | awk '{print $1}')"
         id: zabbix_address
       - name: Edit Zabbix address in agent.conf
-        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.0.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.4.0.conf
 
       - name: Copy test scripts to container
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/

github-actions-tests/mamonsu_build.sh

@@ -45,7 +45,7 @@ if [ "${OS%:*}" = "centos" ]; then
     chmod -R 777 /var/log/mamonsu/
     sudo mkdir -p /etc/mamonsu
     sudo touch /etc/mamonsu/agent.conf
-    cat /mamonsu/github-actions-tests/sources/agent_3.5.0.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.4.0.conf > /etc/mamonsu/agent.conf
     chmod -R 777 /etc/mamonsu/
     sudo yum -y install ./mamonsu*.rpm
     systemctl daemon-reload
@@ -74,7 +74,7 @@ elif [ "${OS%:*}" = "ubuntu" ]; then
     chmod -R 777 /var/log/mamonsu/
     sudo mkdir -p /etc/mamonsu
     sudo touch /etc/mamonsu/agent.conf
-    cat /mamonsu/github-actions-tests/sources/agent_3.5.0.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.4.0.conf > /etc/mamonsu/agent.conf
     chmod -R 777 /etc/mamonsu/
     sudo apt-get -y install ./mamonsu*.deb
     service mamonsu restart

github-actions-tests/sources/agent_3.5.0.conf renamed to github-actions-tests/sources/agent_3.4.0.conf

@@ -81,29 +81,17 @@ format = [%(levelname)s] %(asctime)s - %(name)s	-	%(message)s
 max_memory_usage = 41943040
 interval = 15
 
-[archivecommand]
-max_count_files = 2
-interval = 15
-
 [bgwriter]
 interval = 15
 
-[cfs]
-force_enable = False
-interval = 15
-
-[checkpoint]
-max_checkpoint_by_wal_in_hour = 12
-interval = 300
-
 [connections]
 percent_connections_tr = 90
 interval = 15
 
 [databases]
 bloat_scale = 0.2
 min_rows = 50
-interval = 300
+interval = 15
 
 [pghealth]
 uptime = 600
@@ -113,84 +101,82 @@ interval = 15
 [instance]
 interval = 15
 
-# 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
+[xlog]
+lag_more_than_in_sec = 300
 interval = 15
-private_anon_mem_threshold = 1GB
 
-[oldest]
-max_xid_age = 18000000
-max_query_time = 18000
+[statements]
 interval = 15
 
 [pgbuffercache]
 interval = 15
 
-[pglocks]
+[waitsampling]
 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]
-max_prepared_transaction_time = 60
+[checkpoint]
+max_checkpoint_by_wal_in_hour = 12
 interval = 15
 
-# 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 = 300
+[oldest]
+max_xid_age = 18000000
+max_query_time = 18000
+interval = 15
 
-[replication]
-lag_more_than_in_sec = 300
+[pglocks]
 interval = 15
 
-[statstatements]
+[cfs]
+force_enable = False
 interval = 15
 
-[waitsampling]
+[archivecommand]
+max_count_files = 2
+interval = 15
+
+[procstat]
 interval = 15
 
-[wal]
+[diskstats]
 interval = 15
 
 [disksizes]
 vfs_percent_free = 10
 vfs_inode_percent_free = 10
 interval = 15
 
-[diskstats]
+[memory]
 interval = 15
 
-[la]
+[systemuptime]
+up_time = 300
 interval = 15
 
-[memory]
+[openfiles]
 interval = 15
 
 [net]
 interval = 15
 
-[openfiles]
+[la]
+interval = 15
+
+[zbxsender]
+interval = 10
+
+[logsender]
+interval = 2
+
+[agentapi]
+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]
+max_prepared_transaction_time = 60
 interval = 15
 
 # Get size of backup catalogs stroring all WAL and backup files using pg_probackup
@@ -202,18 +188,29 @@ interval = 300
 backup_dirs = /backup_dir1,/backup_dir2
 pg_probackup_path = /usr/bin/pg_probackup-11
 
-[procstat]
-interval = 15
-
-[systemuptime]
-up_time = 300
+# 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
 
-[agentapi]
+# 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
-
-[logsender]
-interval = 2
-
-[zbxsender]
-interval = 10
+private_anon_mem_threshold = 1GB

mamonsu/__init__.py

@@ -1,7 +1,7 @@
 __author__ = 'Dmitry Vasilyev'
 __author_email__ = '[email protected]'
 __description__ = 'Monitoring agent for PostgreSQL'
-__version__ = '3.5.0'
+__version__ = '3.4.0'
 __licence__ = 'BSD'
 
 __url__ = 'https://github.com/postgrespro/mamonsu'

mamonsu/lib/zbx_template.py

@@ -91,7 +91,7 @@ class ZbxTemplate(object):
 
     graph_items_defaults = [
         ('sortorder', None), ('drawtype', 0),
-        ('color', '578159'), ('yaxisside', 0),
+        ('color', '00CC00'), ('yaxisside', 0),
         ('calc_fnc', 2), ('type', Template.GRAPH_TYPE.normal)
     ]
 

mamonsu/plugins/pgsql/archive_command.py

@@ -57,10 +57,10 @@ class ArchiveCommand(Plugin):
     key = "pgsql.archive_command{0}"
     Items = [
         # key, desc, color, side, graph, delta, units
-        ("count_files_to_archive", "Files in archive_status Need to Archive Count", "9C8A4E", 0, 1, Plugin.DELTA.as_is, Plugin.UNITS.none),
+        ("count_files_to_archive", "Files in archive_status Need to Archive Count", "006AAE", 0, 1, Plugin.DELTA.as_is, Plugin.UNITS.none),
         ("size_files_to_archive", "Files Need to Archive Size", "793F5D", 0, 0, Plugin.DELTA.as_is, Plugin.UNITS.bytes),
-        ("archived_files", "Archived Files Count", "578159", 0, 1, Plugin.DELTA.simple_change, Plugin.UNITS.none),
-        ("failed_trying_to_archive", "Attempts to Archive Files Count", "E57862", 0, 1, Plugin.DELTA.simple_change, Plugin.UNITS.none),
+        ("archived_files", "Archived Files Count", "00CC00", 0, 1, Plugin.DELTA.simple_change, Plugin.UNITS.none),
+        ("failed_trying_to_archive", "Attempts to Archive Files Count", "FF5656", 0, 1, Plugin.DELTA.simple_change, Plugin.UNITS.none),
     ]
     old_archived_count = None
     old_failed_count = None

mamonsu/plugins/pgsql/bgwriter.py

@@ -18,32 +18,32 @@ class BgWriter(Plugin):
 
         ("buffers_checkpoint", "bgwriter[buffers_checkpoint]",
          "Buffers Written During Checkpoints",
-         ("PostgreSQL bgwriter", "793F5D", 1),
+         ("PostgreSQL bgwriter", "006AAE", 1),
          Plugin.DELTA.simple_change),
 
         ("buffers_clean", "bgwriter[buffers_clean]",
          "Buffers Written",
-         ("PostgreSQL bgwriter", "9C8A4E", 1),
+         ("PostgreSQL bgwriter", "00CC00", 1),
          Plugin.DELTA.simple_change),
 
         ("maxwritten_clean", "bgwriter[maxwritten_clean]",
          "Number of bgwriter Stopped by Max Write Count",
-         ("PostgreSQL bgwriter", "00B0B8", 0),
+         ("PostgreSQL bgwriter", "FF5656", 0),
          Plugin.DELTA.simple_change),
 
         ("buffers_backend", "bgwriter[buffers_backend]",
          "Buffers Written Directly by a Backend",
-         ("PostgreSQL bgwriter", "7EB29B", 1),
+         ("PostgreSQL bgwriter", "9C8A4E", 1),
          Plugin.DELTA.simple_change),
 
         ("buffers_backend_fsync", "bgwriter[buffers_backend_fsync]",
          "Times a Backend Execute Its Own Fsync",
-         ("PostgreSQL bgwriter", "9C8A4E", 0),
+         ("PostgreSQL bgwriter", "00CC00", 0),
          Plugin.DELTA.simple_change),
 
         ("buffers_alloc", "bgwriter[buffers_alloc]",
          "Buffers Allocated",
-         ("PostgreSQL bgwriter", "3B415A", 1),
+         ("PostgreSQL bgwriter", "FF5656", 1),
          Plugin.DELTA.simple_change)
     ]
 

mamonsu/plugins/pgsql/cfs.py

@@ -155,7 +155,7 @@ def discovery_rules(self, template, dashboard=False):
             "name": "PostgreSQL CFS: Relation {#COMPRESSED_RELATION} Compress Ratio",
             "delay": self.timeRatioInterval,
             "items": [{
-                "color": "8B817C",
+                "color": "A39B98",
                 "key": "pgsql.cfs.compress_ratio[{#COMPRESSED_RELATION}]"
             }]
         }]

mamonsu/plugins/pgsql/checkpoint.py

@@ -29,22 +29,22 @@ class Checkpoint(Plugin):
 
         ("checkpoints_timed", "count_timed",
          "by Timeout (in hour)",
-         ("PostgreSQL: checkpoint", "578159", 0),
+         ("PostgreSQL: checkpoint", "00CC00", 0),
          Plugin.UNITS.none, Plugin.DELTA.speed_per_second, 60 * 60),
 
         ("checkpoints_req", "count_wal",
          "by WAL (in hour)",
-         ("PostgreSQL: Checkpoint", "793F5D", 0),
+         ("PostgreSQL: Checkpoint", "FF5656", 0),
          Plugin.UNITS.none, Plugin.DELTA.speed_per_second, 60 * 60),
 
         ("checkpoint_write_time", "write_time",
          "Write Time",
-         ("PostgreSQL: Checkpoints", "00B0B8", 1),
+         ("PostgreSQL: Checkpoints", "00CC00", 1),
          Plugin.UNITS.ms, Plugin.DELTA.speed_per_second, 1),
 
         ("checkpoint_sync_time", "checkpoint_sync_time",
          "Sync Time",
-         ("PostgreSQL: checkpoints", "9C8A4E", 1),
+         ("PostgreSQL: checkpoints", "FF5656", 1),
          Plugin.UNITS.ms, Plugin.DELTA.speed_per_second, 1)
     ]