Skip to content

Commit 3213862

Browse files
cuprumtancuprumtan
committed
cicd:
- upgraded default tools versions in test scripts; - added different lists of metrics depending on PG version; - edited default mamonsu config to use additional plugins;
1 parent 0ec07fd commit 3213862

File tree

11 files changed

+661
-90
lines changed

11 files changed

+661
-90
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,4 @@ jobs:
8686
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 }}"
8787

8888
- name: Test Mamonsu metrics on master
89-
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/metrics.sh
89+
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/metrics.sh --pg-version="${{ matrix.pg_version }}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ jobs:
9090
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 }}"
9191

9292
- name: Test Mamonsu metrics on master
93-
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/metrics.sh
93+
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/metrics.sh --pg-version="${{ matrix.pg_version }}"

‎github-actions-tests/metrics.sh‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
#!/bin/sh
22

3+
# mamonsu metrics tests
4+
5+
# default parameters:
6+
PG_VERSION="14"
7+
8+
for i in "$@"
9+
do
10+
case $i in
11+
--pg-version=*)
12+
PG_VERSION="${i#*=}"
13+
shift
14+
;;
15+
*)
16+
# unknown option
17+
;;
18+
esac
19+
done
20+
321
echo && echo
422
echo "================================================================================================================="
523
echo "---> Test MAMONSU metrics"
@@ -11,6 +29,6 @@ while read metric; do
1129
echo "---> ERROR: Cannot found metric $metric"
1230
# exit 11
1331
fi
14-
done </mamonsu/github-actions-tests/sources/metrics-linux.txt
32+
done </mamonsu/github-actions-tests/sources/metrics-linux-${PG_VERSION}.txt
1533

1634
echo && echo

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ pg_probackup_path = /usr/bin/pg_probackup-11
195195
# If the relation is blocked by some process such as vacuum full or create index, the result will be -1
196196
# by default this plugin disabled. To enable this plugin - set bellow "enabled = False" and define a list of relations.
197197
[relationssize]
198-
enabled = False
199-
relations=postgres.pg_catalog.pg_class,postgres.pg_catalog.pg_user
198+
enabled = True
199+
relations=postgres.pg_catalog.pg_class,mamonsu_test_db.mamonsu.config
200200
interval = 300
201201

202202
# This plugin allows detects possible memory leaks while working with PostgreSQL using /proc/pid/status and /proc/pid/statm
@@ -211,6 +211,6 @@ interval = 300
211211
# private_anon_mem_threshold - memory volume threshold after which we need an investigation about memory leak. 1GB by default.
212212
# Possible values MB, GB, TB. For example 1GB
213213
[memoryleakdiagnostic]
214-
enabled = False
214+
enabled = True
215215
interval = 60
216216
private_anon_mem_threshold = 1GB

‎github-actions-tests/sources/metrics-linux-12.txt‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
mamonsu.memory.rss[max]
2+
mamonsu.plugin.errors[]
3+
mamonsu.plugin.keepalive[]
4+
pgsql.archive_command[archived_files]
5+
pgsql.archive_command[count_files_to_archive]
6+
pgsql.archive_command[failed_trying_to_archive]
7+
pgsql.archive_command[size_files_to_archive]
8+
pgsql.autovacumm.count[]
9+
pgsql.bgwriter[buffers_alloc]
10+
pgsql.bgwriter[buffers_backend]
11+
pgsql.bgwriter[buffers_backend_fsync]
12+
pgsql.bgwriter[buffers_checkpoint]
13+
pgsql.bgwriter[buffers_clean]
14+
pgsql.bgwriter[maxwritten_clean]
15+
pgsql.blocks[hit]
16+
pgsql.blocks[read]
17+
pgsql.buffers[dirty]
18+
pgsql.buffers[size]
19+
pgsql.buffers[twice_used]
20+
pgsql.cache[hit]
21+
pgsql.checkpoint[checkpoint_sync_time]
22+
pgsql.checkpoint[count_timed]
23+
pgsql.checkpoint[count_wal]
24+
pgsql.checkpoint[write_time]
25+
pgsql.connections[active]
26+
pgsql.connections[disabled]
27+
pgsql.connections[fastpath_function_call]
28+
pgsql.connections[idle]
29+
pgsql.connections[idle_in_transaction]
30+
pgsql.connections[idle_in_transaction_aborted]
31+
pgsql.connections[max_connections]
32+
pgsql.connections[other]
33+
pgsql.connections[total]
34+
pgsql.connections[waiting]
35+
pgsql.database.discovery[]
36+
pgsql.database.bloating_tables[mamonsu_test_db]
37+
pgsql.database.bloating_tables[postgres]
38+
pgsql.database.invalid_indexes[mamonsu_test_db]
39+
pgsql.database.invalid_indexes[postgres]
40+
pgsql.database.max_age[mamonsu_test_db]
41+
pgsql.database.max_age[postgres]
42+
pgsql.database.size[mamonsu_test_db]
43+
pgsql.database.size[postgres]
44+
pgsql.events[checksum_failures]
45+
pgsql.events[conflicts]
46+
pgsql.events[deadlocks]
47+
pgsql.events[xact_rollback]
48+
pgsql.memory_leak_diagnostic.count_diff[]
49+
pgsql.memory_leak_diagnostic.msg_text[]
50+
pgsql.oldest[transaction_time]
51+
pgsql.oldest[xid_age]
52+
pgsql.ping[]
53+
pgsql.pg_locks[accessexclusive]
54+
pgsql.pg_locks[accessshare]
55+
pgsql.pg_locks[exclusive]
56+
pgsql.pg_locks[rowexclusive]
57+
pgsql.pg_locks[rowshare]
58+
pgsql.pg_locks[share]
59+
pgsql.pg_locks[sharerowexclusive]
60+
pgsql.pg_locks[shareupdateexclusive]
61+
pgsql.prepared.count
62+
pgsql.prepared.oldest
63+
pgsql.relation.size[]
64+
pgsql.relation.size[mamonsu_test_db.mamonsu.config]
65+
pgsql.relation.size[postgres.pg_catalog.pg_class]
66+
pgsql.replication.non_active_slots[]
67+
pgsql.replication_lag[sec]
68+
pgsql.replication_lag[sec]
69+
pgsql.stat[dirty_bytes]
70+
pgsql.stat[other_time]
71+
pgsql.stat[read_bytes]
72+
pgsql.stat[read_time]
73+
pgsql.stat[wal_bytes]
74+
pgsql.stat[wal_fpi]
75+
pgsql.stat[wal_records]
76+
pgsql.stat[write_bytes]
77+
pgsql.stat[write_time]
78+
pgsql.stat_info[dealloc]
79+
pgsql.stat_info[stats_reset]
80+
pgsql.temp[bytes]
81+
pgsql.temp[files]
82+
pgsql.transactions[committed]
83+
pgsql.tuples[deleted]
84+
pgsql.tuples[fetched]
85+
pgsql.tuples[inserted]
86+
pgsql.tuples[returned]
87+
pgsql.tuples[updated]
88+
pgsql.uptime[]
89+
pgsql.wal.count[]
90+
pgsql.wal.write[]
91+
system.cpu[idle]
92+
system.cpu[iowait]
93+
system.cpu[irq]
94+
system.cpu[nice]
95+
system.cpu[softirq]
96+
system.cpu[system]
97+
system.cpu[user]
98+
system.disk.discovery[]
99+
system.disk.all_read[]
100+
system.disk.all_write[]
101+
system.disk.all_read_b[]
102+
system.disk.all_write_b[]
103+
system.la[1]
104+
system.memory[active]
105+
system.memory[apps]
106+
system.memory[available]
107+
system.memory[buffers]
108+
system.memory[cached]
109+
system.memory[committed]
110+
system.memory[inactive]
111+
system.memory[mapped]
112+
system.memory[page_tables]
113+
system.memory[slab]
114+
system.memory[swap]
115+
system.memory[swap_cache]
116+
system.memory[vmalloc_used]
117+
system.memory[unused]
118+
system.net.discovery[]
119+
system.open_files[]
120+
system.processes[blocked]
121+
system.processes[forkrate]
122+
system.processes[running]
123+
system.vfs.discovery[]
124+
system.vfs.free[/]
125+
system.vfs.percent_free[/]
126+
system.vfs.percent_inode_free[/]
127+
system.vfs.used[/]
128+
system.up_time[]

0 commit comments

Comments
 (0)