Merge branch 'dev'

Author: cuprumtan

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

@@ -86,4 +86,4 @@ jobs:
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/tools/zabbix_cli.sh --zbx-address="${{ steps.zabbix_address.outputs.zabbix_address }}" --zbx-version="${{ matrix.zabbix_version }}"
 
       - name: Test Mamonsu metrics on master
-        run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/metrics.sh
+        run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/metrics.sh --pg-version="${{ matrix.pg_version }}" --os="${{ matrix.docker_os }}"

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

@@ -90,4 +90,4 @@ jobs:
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/tools/zabbix_cli.sh --zbx-address="${{ steps.zabbix_address.outputs.zabbix_address }}" --zbx-version="${{ matrix.zabbix_version }}"
 
       - name: Test Mamonsu metrics on master
-        run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/metrics.sh
+        run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/metrics.sh --pg-version="${{ matrix.pg_version }}" --os="${{ matrix.docker_os }}"

github-actions-tests/metrics.sh

@@ -1,16 +1,71 @@
 #!/bin/sh
 
+# mamonsu metrics tests
+
+# default parameters:
+PG_VERSION="14"
+OS="centos:7"
+
+for i in "$@"
+do
+case $i in
+    --os=*)
+    OS="${i#*=}"
+    shift
+    ;;
+    --pg-version=*)
+    PG_VERSION="${i#*=}"
+    shift
+    ;;
+    *)
+          # unknown option
+    ;;
+esac
+done
+
+METRICS_FILE="/mamonsu/github-actions-tests/sources/metrics-linux-${PG_VERSION}.txt"
+
 echo && echo
 echo "================================================================================================================="
 echo "---> Test MAMONSU metrics"
 echo
 
+# ======================================================================================================================
+# some PG preparations
+
+PG_PATH=""
+if [ "${OS%:*}" = "centos" ]; then
+    PACKAGE="postgresql${PG_VERSION//./}-server postgresql${PG_VERSION//./}-contrib"
+    PG_PATH="/usr/pgsql-${PG_VERSION}/bin/"
+elif [ "${OS%:*}" = "ubuntu" ]; then
+    PACKAGE="postgresql-${PG_VERSION} postgresql-contrib-${PG_VERSION}"
+    PG_PATH="/usr/lib/postgresql/${PG_VERSION}/bin/"
+fi
+
+# archive_mode preps
+sudo -u postgres ${PG_PATH}psql -d mamonsu_test_db -c "DO
+\$do\$
+DECLARE
+   func_name varchar;
+BEGIN
+   SELECT proname INTO func_name FROM pg_proc WHERE proname LIKE 'pg_switch_%';
+   EXECUTE FORMAT('SELECT %s();', func_name);
+END
+\$do\$;"
+
+# pg_stat_statements preps
+sudo -u postgres ${PG_PATH}psql -d mamonsu_test_db -c "CREATE EXTENSION pg_stat_statements;"
+
+# wait few intervals to get all possible metrics
+sleep 50
+
+# read metric for specific version
 while read metric; do
     GREP=$( mamonsu agent metric-get ${metric} | grep "pgsql\|sys\|mamonsu" )
     if [ -z "$GREP" ]; then
 	      echo "---> ERROR: Cannot found metric $metric"
-#        exit 11
+        exit 11
     fi
-done </mamonsu/github-actions-tests/sources/metrics-linux.txt
+done <"${METRICS_FILE}"
 
 echo && echo

github-actions-tests/pg_install.sh

@@ -67,6 +67,7 @@ sudo chmod 700 /pg${PG_VERSION}/data_slave_physical
 
 # create master-slave cluster
 sudo -u postgres ${PG_PATH}initdb -D /pg${PG_VERSION}/data_master/
+sudo -u postgres echo "shared_preload_libraries='pg_stat_statements'" >> /pg${PG_VERSION}/data_master/postgresql.conf
 sudo -u postgres echo "archive_mode=on" >> /pg${PG_VERSION}/data_master/postgresql.conf
 sudo -u postgres echo "archive_command='cp %p /pg"${PG_VERSION}"/wals/%f'" >> /pg${PG_VERSION}/data_master/postgresql.conf
 sudo -u postgres echo "wal_level=replica" >> /pg${PG_VERSION}/data_master/postgresql.conf

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

@@ -79,87 +79,87 @@ format = [%(levelname)s] %(asctime)s - %(name)s	-	%(message)s
 
 [health]
 max_memory_usage = 41943040
-interval = 60
+interval = 15
 
 [bgwriter]
-interval = 60
+interval = 15
 
 [connections]
 percent_connections_tr = 90
-interval = 60
+interval = 15
 
 [databases]
 bloat_scale = 0.2
 min_rows = 50
-interval = 300
+interval = 15
 
 [pghealth]
 uptime = 600
 cache = 80
-interval = 60
+interval = 15
 
 [instance]
-interval = 60
+interval = 15
 
 [xlog]
 lag_more_than_in_sec = 300
-interval = 60
+interval = 15
 
 [pgstatstatement]
-interval = 60
+interval = 15
 
 [pgbuffercache]
-interval = 60
+interval = 15
 
 [pgwaitsampling]
-interval = 60
+interval = 15
 
 [checkpoint]
 max_checkpoint_by_wal_in_hour = 12
-interval = 300
+interval = 15
 
 [oldest]
 max_xid_age = 18000000
 max_query_time = 18000
-interval = 60
+interval = 15
 
 [pglocks]
-interval = 60
+interval = 15
 
 [cfs]
 force_enable = False
-interval = 60
+interval = 15
 
 [archivecommand]
 max_count_files = 2
-interval = 60
+interval = 15
 
 [procstat]
-interval = 60
+interval = 15
 
 [diskstats]
-interval = 60
+interval = 15
 
 [disksizes]
 vfs_percent_free = 10
 vfs_inode_percent_free = 10
-interval = 60
+interval = 15
 
 [memory]
-interval = 60
+interval = 15
 
 [systemuptime]
 up_time = 300
-interval = 60
+interval = 15
 
 [openfiles]
-interval = 60
+interval = 15
 
 [net]
-interval = 60
+interval = 15
 
 [la]
-interval = 60
+interval = 15
 
 [zbxsender]
 interval = 10
@@ -168,7 +168,7 @@ interval = 10
 interval = 2
 
 [agentapi]
-interval = 60
+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
@@ -177,7 +177,7 @@ interval = 60
 # If pgsql.prepared.oldest exceeds max_prepared_transaction_time the trigger fires.
 [preparedtransaction]
 max_prepared_transaction_time = 60
-interval = 60
+interval = 15
 
 # Get size of backup catalogs stroring all WAL and backup files using pg_probackup
 # (https://github.com/postgrespro/pg_probackup)
@@ -195,9 +195,9 @@ pg_probackup_path = /usr/bin/pg_probackup-11
 # 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 = False
-relations=postgres.pg_catalog.pg_class,postgres.pg_catalog.pg_user
-interval = 300
+enabled = True
+relations=postgres.pg_catalog.pg_class,mamonsu_test_db.mamonsu.config
+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.
@@ -211,6 +211,6 @@ interval = 300
 # 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 = False
-interval = 60
+enabled = True
+interval = 15
 private_anon_mem_threshold = 1GB

github-actions-tests/sources/metrics-linux-10.txt

@@ -0,0 +1,121 @@
+mamonsu.memory.rss[max]
+mamonsu.plugin.errors[]
+mamonsu.plugin.keepalive[]
+pgsql.archive_command[archived_files]
+pgsql.archive_command[count_files_to_archive]
+pgsql.archive_command[failed_trying_to_archive]
+pgsql.archive_command[size_files_to_archive]
+pgsql.autovacumm.count[]
+pgsql.bgwriter[buffers_alloc]
+pgsql.bgwriter[buffers_backend]
+pgsql.bgwriter[buffers_backend_fsync]
+pgsql.bgwriter[buffers_checkpoint]
+pgsql.bgwriter[buffers_clean]
+pgsql.bgwriter[maxwritten_clean]
+pgsql.blocks[hit]
+pgsql.blocks[read]
+pgsql.buffers[dirty]
+pgsql.buffers[size]
+pgsql.buffers[twice_used]
+pgsql.checkpoint[checkpoint_sync_time]
+pgsql.checkpoint[count_timed]
+pgsql.checkpoint[count_wal]
+pgsql.checkpoint[write_time]
+pgsql.connections[active]
+pgsql.connections[disabled]
+pgsql.connections[fastpath_function_call]
+pgsql.connections[idle]
+pgsql.connections[idle_in_transaction]
+pgsql.connections[idle_in_transaction_aborted]
+pgsql.connections[max_connections]
+pgsql.connections[other]
+pgsql.connections[total]
+pgsql.connections[waiting]
+pgsql.database.discovery[]
+pgsql.database.bloating_tables[mamonsu_test_db]
+pgsql.database.bloating_tables[postgres]
+pgsql.database.invalid_indexes[mamonsu_test_db]
+pgsql.database.invalid_indexes[postgres]
+pgsql.database.max_age[mamonsu_test_db]
+pgsql.database.max_age[postgres]
+pgsql.database.size[mamonsu_test_db]
+pgsql.database.size[postgres]
+pgsql.events[conflicts]
+pgsql.events[deadlocks]
+pgsql.events[xact_rollback]
+pgsql.memory_leak_diagnostic.count_diff[]
+pgsql.memory_leak_diagnostic.msg_text[]
+pgsql.oldest[transaction_time]
+pgsql.oldest[xid_age]
+pgsql.ping[]
+pgsql.pg_locks[accessexclusive]
+pgsql.pg_locks[accessshare]
+pgsql.pg_locks[exclusive]
+pgsql.pg_locks[rowexclusive]
+pgsql.pg_locks[rowshare]
+pgsql.pg_locks[share]
+pgsql.pg_locks[sharerowexclusive]
+pgsql.pg_locks[shareupdateexclusive]
+pgsql.prepared.count
+pgsql.prepared.oldest
+pgsql.relation.size[]
+pgsql.relation.size[mamonsu_test_db.mamonsu.config]
+pgsql.relation.size[postgres.pg_catalog.pg_class]
+pgsql.replication.non_active_slots[]
+pgsql.replication_lag[sec]
+pgsql.replication_lag[sec]
+pgsql.stat[dirty_bytes]
+pgsql.stat[other_time]
+pgsql.stat[read_bytes]
+pgsql.stat[read_time]
+pgsql.stat[write_bytes]
+pgsql.stat[write_time]
+pgsql.temp[bytes]
+pgsql.temp[files]
+pgsql.transactions[committed]
+pgsql.tuples[deleted]
+pgsql.tuples[fetched]
+pgsql.tuples[inserted]
+pgsql.tuples[returned]
+pgsql.tuples[updated]
+pgsql.uptime[]
+pgsql.wal.count[]
+pgsql.wal.write[]
+system.cpu[idle]
+system.cpu[iowait]
+system.cpu[irq]
+system.cpu[nice]
+system.cpu[softirq]
+system.cpu[system]
+system.cpu[user]
+system.disk.discovery[]
+system.disk.all_read[]
+system.disk.all_write[]
+system.disk.all_read_b[]
+system.disk.all_write_b[]
+system.la[1]
+system.memory[active]
+system.memory[apps]
+system.memory[available]
+system.memory[buffers]
+system.memory[cached]
+system.memory[committed]
+system.memory[inactive]
+system.memory[mapped]
+system.memory[page_tables]
+system.memory[slab]
+system.memory[swap]
+system.memory[swap_cache]
+system.memory[vmalloc_used]
+system.memory[unused]
+system.net.discovery[]
+system.open_files[]
+system.processes[blocked]
+system.processes[forkrate]
+system.processes[running]
+system.vfs.discovery[]
+system.vfs.free[/]
+system.vfs.percent_free[/]
+system.vfs.percent_inode_free[/]
+system.vfs.used[/]
+system.up_time[]