Skip to content

Commit 4501e4d

Browse files
cuprumtancuprumtan
committed
Rollback to "build: upgraded to 3.5.1"
1 parent 4b497c0 commit 4501e4d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+271
-499
lines changed

Diff for: ‎.github/workflows/mamonsu-tests-dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
echo "::set-output name=zabbix_address::$(hostname -I | awk '{print $1}')"
6060
id: zabbix_address
6161
- name: Edit Zabbix address in agent.conf
62-
run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.0.conf
62+
run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.1.conf
6363

6464
- name: Copy test scripts to container
6565
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/

Diff for: ‎.github/workflows/mamonsu-tests-master.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
echo "::set-output name=zabbix_address::$(hostname -I | awk '{print $1}')"
6464
id: zabbix_address
6565
- name: Edit Zabbix address in agent.conf
66-
run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.0.conf
66+
run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.1.conf
6767

6868
- name: Copy test scripts to container
6969
run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/

Diff for: ‎documentation/adding_custom_plugins.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class PLUGIN_NAME(Plugin):
9090
# screen name ('page')
9191
# graph size ('size')
9292
# position on screen ('position', but it's optionally - you can set 0 to avoid sorting)
93-
return [{'dashboard': {'name': self.right_type(self.key_autovacuum),
93+
return [{'dashboard': {'name': self.right_type(self.key_autovacumm),
9494
'page': ZbxTemplate.dashboard_page_PAGE['name'], # see available values in mamonsu/lib/zbx_template.py dashboard_page_*
9595
'size': ZbxTemplate.dashboard_widget_size_SIZE, # see available values in mamonsu/lib/zbx_template.py dashboard_widget_size_*
9696
'position': N}}]

Diff for: ‎documentation/metrics.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1761,7 +1761,7 @@ Default config:
17611761
</tr>
17621762
<tr>
17631763
<th>Key</th>
1764-
<td>pgsql.autovacuum.count[]</td>
1764+
<td>pgsql.autovacumm.count[]</td>
17651765
</tr>
17661766
<tr>
17671767
<th>Type</th>

Diff for: ‎github-actions-tests/mamonsu_build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if [ "${OS%:*}" = "centos" ]; then
4141
python3 setup.py build && python3 setup.py install
4242
make rpm
4343
sudo rpm -i ./mamonsu*.rpm
44-
cat /mamonsu/github-actions-tests/sources/agent_3.5.0.conf > /etc/mamonsu/agent.conf
44+
cat /mamonsu/github-actions-tests/sources/agent_3.5.1.conf > /etc/mamonsu/agent.conf
4545
systemctl daemon-reload
4646
systemctl restart mamonsu
4747
sleep 5
@@ -64,7 +64,7 @@ elif [ "${OS%:*}" = "ubuntu" ]; then
6464
python3 setup.py build && python3 setup.py install
6565
make deb
6666
sudo dpkg -i ./mamonsu*.deb
67-
cat /mamonsu/github-actions-tests/sources/agent_3.5.0.conf > /etc/mamonsu/agent.conf
67+
cat /mamonsu/github-actions-tests/sources/agent_3.5.1.conf > /etc/mamonsu/agent.conf
6868
service mamonsu restart
6969
sleep 5
7070
echo && echo && echo "mamonsu version:"

Diff for: ‎github-actions-tests/sources/agent_3.5.0.conf renamed to ‎github-actions-tests/sources/agent_3.5.1.conf

+94-88
Original file line numberDiff line numberDiff line change
@@ -78,112 +78,106 @@ format = [%(levelname)s] %(asctime)s - %(name)s - %(message)s
7878
# below listed all available parameters for each plugin to modify.
7979

8080
[health]
81-
interval = 60
82-
83-
[archivecommand]
84-
interval = 60
85-
86-
# Besides standard autovacuum workers count, mamonsu also counts autovacuum utilization.
87-
# But this metric is instantaneous, so recommended to run this plugin frequently
88-
# to get a complete picture of autovacuum utilization.
89-
[autovacuum]
90-
interval = 30
81+
max_memory_usage = 41943040
82+
interval = 15
9183

9284
[bgwriter]
93-
interval = 60
94-
95-
[cfs]
96-
force_enable = False
97-
interval = 60
98-
99-
[checkpoint]
100-
interval = 300
85+
interval = 15
10186

10287
[connections]
103-
interval = 60
88+
percent_connections_tr = 90
89+
interval = 15
10490

10591
[databases]
106-
interval = 300
92+
bloat_scale = 0.2
93+
min_rows = 50
94+
interval = 15
10795

10896
[pghealth]
109-
interval = 60
97+
uptime = 600
98+
cache = 80
99+
interval = 15
110100

111101
[instance]
112-
interval = 60
102+
interval = 15
113103

114-
# This plugin allows detects possible memory leaks while working with PostgreSQL using /proc/pid/status and /proc/pid/statm
115-
# We use RES and SHR difference to calculate approximate volume of private anonymous backend memory.
116-
# If it exceeds private_anon_mem_threshold then that pid will be added to a message. An example is presented below
117-
# statm - 'pid: {pid}, RES {RES} - SHR {SHR} more then {private_anon_mem_threshold}\n'
118-
# Since Linux 4.5 RssAnon, RssFile and RssShmem have been added.
119-
# They allows to distinguish types of memory such as private anonymous, file-backed, and shared anonymous memory.
120-
# We are interested in RssAnon. If its value exceeds private_anon_mem_threshold then that pid will also be added to a message.
121-
# By default this plugin disabled. To enable this plugin - set bellow "enabled = False"
122-
# #interval - (onitoring frequency in seconds. 60 seconds by default
123-
# private_anon_mem_threshold - memory volume threshold after which we need an investigation about memory leak. 1GB by default.
124-
# Possible values MB, GB, TB. For example 1GB
125-
[memoryleakdiagnostic]
126-
enabled = True
104+
[xlog]
105+
lag_more_than_in_sec = 300
127106
interval = 15
128-
private_anon_mem_threshold = 1GB
129107

130-
[oldest]
131-
interval = 60
108+
[statements]
109+
interval = 15
132110

133111
[pgbuffercache]
134-
interval = 60
135-
136-
[pglocks]
137-
interval = 60
112+
interval = 15
138113

139-
# Get age (in seconds) of the oldest running prepared transaction and number of all prepared transactions for two-phase commit.
140-
# https://www.postgresql.org/docs/current/sql-prepare-transaction.html
141-
# https://www.postgresql.org/docs/12/view-pg-prepared-xacts.html
142-
# max_prepared_transaction_time - age of prepared transaction in seconds.
143-
# If pgsql.prepared.oldest exceeds max_prepared_transaction_time the trigger fires.
144-
[preparedtransaction]
145-
interval = 60
114+
[waitsampling]
115+
interval = 15
146116

147-
# Get size of relations defined in this section
148-
# Relations - comma separated list of objects - tables and endexes (database_name.schema.relation) used to calculate relations size.
149-
# Example:
150-
# relations=postgres.pg_catalog.pg_class,postgres.pg_catalog.pg_user
151-
# If the relation is blocked by some process such as vacuum full or create index, the result will be -1
152-
# by default this plugin disabled. To enable this plugin - set bellow "enabled = False" and define a list of relations.
153-
[relationssize]
154-
enabled = True
155-
relations=postgres.pg_catalog.pg_class,mamonsu_test_db.mamonsu.config
117+
[checkpoint]
118+
max_checkpoint_by_wal_in_hour = 12
156119
interval = 15
157120

158-
[replication]
159-
interval = 60
121+
[oldest]
122+
max_xid_age = 18000000
123+
max_query_time = 18000
124+
interval = 15
160125

161-
[statstatements]
162-
interval = 60
126+
[pglocks]
127+
interval = 15
163128

164-
[waitsampling]
165-
interval = 60
129+
[cfs]
130+
force_enable = False
131+
interval = 15
166132

167-
[wal]
168-
interval = 60
133+
[archivecommand]
134+
max_count_files = 2
135+
interval = 15
169136

170-
[disksizes]
171-
interval = 60
137+
[procstat]
138+
interval = 15
172139

173140
[diskstats]
174-
interval = 60
141+
interval = 15
175142

176-
[la]
177-
interval = 60
143+
[disksizes]
144+
vfs_percent_free = 10
145+
vfs_inode_percent_free = 10
146+
interval = 15
178147

179148
[memory]
180-
interval = 60
149+
interval = 15
181150

182-
[net]
183-
interval = 60
151+
[systemuptime]
152+
up_time = 300
153+
interval = 15
184154

185155
[openfiles]
186-
interval = 60
156+
interval = 15
157+
158+
[net]
159+
interval = 15
160+
161+
[la]
162+
interval = 15
163+
164+
[zbxsender]
165+
interval = 10
166+
167+
[logsender]
168+
interval = 2
169+
170+
[agentapi]
171+
interval = 15
172+
173+
# Get age (in seconds) of the oldest running prepared transaction and number of all prepared transactions for two-phase commit.
174+
# https://www.postgresql.org/docs/current/sql-prepare-transaction.html
175+
# https://www.postgresql.org/docs/12/view-pg-prepared-xacts.html
176+
# max_prepared_transaction_time - age of prepared transaction in seconds.
177+
# If pgsql.prepared.oldest exceeds max_prepared_transaction_time the trigger fires.
178+
[preparedtransaction]
179+
max_prepared_transaction_time = 60
180+
interval = 15
187181

188182
# Get size of backup catalogs stroring all WAL and backup files using pg_probackup
189183
# (https://github.com/postgrespro/pg_probackup)
@@ -194,17 +188,29 @@ interval = 300
194188
backup_dirs = /backup_dir1,/backup_dir2
195189
pg_probackup_path = /usr/bin/pg_probackup-11
196190

197-
[procstat]
198-
interval = 60
199-
200-
[systemuptime]
201-
interval = 60
202-
203-
[agentapi]
204-
interval = 60
205-
206-
[logsender]
207-
interval = 2
191+
# Get size of relations defined in this section
192+
# Relations - comma separated list of objects - tables and endexes (database_name.schema.relation) used to calculate relations size.
193+
# Example:
194+
# relations=postgres.pg_catalog.pg_class,postgres.pg_catalog.pg_user
195+
# If the relation is blocked by some process such as vacuum full or create index, the result will be -1
196+
# by default this plugin disabled. To enable this plugin - set bellow "enabled = False" and define a list of relations.
197+
[relationssize]
198+
enabled = True
199+
relations=postgres.pg_catalog.pg_class,mamonsu_test_db.mamonsu.config
200+
interval = 15
208201

209-
[zbxsender]
210-
interval = 10
202+
# This plugin allows detects possible memory leaks while working with PostgreSQL using /proc/pid/status and /proc/pid/statm
203+
# We use RES and SHR difference to calculate approximate volume of private anonymous backend memory.
204+
# If it exceeds private_anon_mem_threshold then that pid will be added to a message. An example is presented below
205+
# statm - 'pid: {pid}, RES {RES} - SHR {SHR} more then {private_anon_mem_threshold}\n'
206+
# Since Linux 4.5 RssAnon, RssFile and RssShmem have been added.
207+
# They allows to distinguish types of memory such as private anonymous, file-backed, and shared anonymous memory.
208+
# We are interested in RssAnon. If its value exceeds private_anon_mem_threshold then that pid will also be added to a message.
209+
# By default this plugin disabled. To enable this plugin - set bellow "enabled = False"
210+
# #interval - (onitoring frequency in seconds. 60 seconds by default
211+
# private_anon_mem_threshold - memory volume threshold after which we need an investigation about memory leak. 1GB by default.
212+
# Possible values MB, GB, TB. For example 1GB
213+
[memoryleakdiagnostic]
214+
enabled = True
215+
interval = 15
216+
private_anon_mem_threshold = 1GB

Diff for: ‎github-actions-tests/sources/metrics-linux-10.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ pgsql.archive_command[archived_files]
55
pgsql.archive_command[count_files_to_archive]
66
pgsql.archive_command[failed_trying_to_archive]
77
pgsql.archive_command[size_files_to_archive]
8-
pgsql.autovacuum.count[]
9-
pgsql.autovacuum.utilization[]
8+
pgsql.autovacumm.count[]
109
pgsql.bgwriter[buffers_alloc]
1110
pgsql.bgwriter[buffers_backend]
1211
pgsql.bgwriter[buffers_backend_fsync]

Diff for: ‎github-actions-tests/sources/metrics-linux-11.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ pgsql.archive_command[archived_files]
55
pgsql.archive_command[count_files_to_archive]
66
pgsql.archive_command[failed_trying_to_archive]
77
pgsql.archive_command[size_files_to_archive]
8-
pgsql.autovacuum.count[]
9-
pgsql.autovacuum.utilization[]
8+
pgsql.autovacumm.count[]
109
pgsql.bgwriter[buffers_alloc]
1110
pgsql.bgwriter[buffers_backend]
1211
pgsql.bgwriter[buffers_backend_fsync]

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ pgsql.archive_command[archived_files]
55
pgsql.archive_command[count_files_to_archive]
66
pgsql.archive_command[failed_trying_to_archive]
77
pgsql.archive_command[size_files_to_archive]
8-
pgsql.autovacuum.count[]
9-
pgsql.autovacuum.utilization[]
8+
pgsql.autovacumm.count[]
109
pgsql.bgwriter[buffers_alloc]
1110
pgsql.bgwriter[buffers_backend]
1211
pgsql.bgwriter[buffers_backend_fsync]

Diff for: ‎github-actions-tests/sources/metrics-linux-13.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ pgsql.archive_command[archived_files]
55
pgsql.archive_command[count_files_to_archive]
66
pgsql.archive_command[failed_trying_to_archive]
77
pgsql.archive_command[size_files_to_archive]
8-
pgsql.autovacuum.count[]
9-
pgsql.autovacuum.utilization[]
8+
pgsql.autovacumm.count[]
109
pgsql.bgwriter[buffers_alloc]
1110
pgsql.bgwriter[buffers_backend]
1211
pgsql.bgwriter[buffers_backend_fsync]

Diff for: ‎github-actions-tests/sources/metrics-linux-14.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ pgsql.archive_command[archived_files]
55
pgsql.archive_command[count_files_to_archive]
66
pgsql.archive_command[failed_trying_to_archive]
77
pgsql.archive_command[size_files_to_archive]
8-
pgsql.autovacuum.count[]
9-
pgsql.autovacuum.utilization[]
8+
pgsql.autovacumm.count[]
109
pgsql.bgwriter[buffers_alloc]
1110
pgsql.bgwriter[buffers_backend]
1211
pgsql.bgwriter[buffers_backend_fsync]

Diff for: ‎github-actions-tests/sources/metrics-linux-9.6.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ pgsql.archive_command[archived_files]
55
pgsql.archive_command[count_files_to_archive]
66
pgsql.archive_command[failed_trying_to_archive]
77
pgsql.archive_command[size_files_to_archive]
8-
pgsql.autovacuum.count[]
9-
pgsql.autovacuum.utilization[]
8+
pgsql.autovacumm.count[]
109
pgsql.bgwriter[buffers_alloc]
1110
pgsql.bgwriter[buffers_backend]
1211
pgsql.bgwriter[buffers_backend_fsync]

Diff for: ‎github-actions-tests/sources/metrics-linux-full-list.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ pgsql.archive_command[archived_files]
55
pgsql.archive_command[count_files_to_archive]
66
pgsql.archive_command[failed_trying_to_archive]
77
pgsql.archive_command[size_files_to_archive]
8-
pgsql.autovacuum.count[]
9-
pgsql.autovacuum.utilization[]
8+
pgsql.autovacumm.count[]
109
pgsql.bgwriter[buffers_alloc]
1110
pgsql.bgwriter[buffers_backend]
1211
pgsql.bgwriter[buffers_backend_fsync]

Diff for: ‎mamonsu/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
__author__ = 'Dmitry Vasilyev'
22
__author_email__ = '[email protected]'
33
__description__ = 'Monitoring agent for PostgreSQL'
4-
__version__ = '3.5.0'
4+
__version__ = '3.5.1'
55
__licence__ = 'BSD'
66

77
__url__ = 'https://github.com/postgrespro/mamonsu'

Diff for: ‎mamonsu/lib/plugin.py

-3
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,6 @@ def items(self, template, dashboard=False):
148148
def graphs(self, template, dashboard=False):
149149
return None
150150

151-
def macros(self, template, dashboard=False):
152-
return None
153-
154151
def triggers(self, template, dashboard=False):
155152
return None
156153

0 commit comments

Comments
 (0)