Skip to content

Commit 0e0fa53

Browse files
cuprumtancuprumtan
committed
Merge branch 'dev'
2 parents c14e564 + f946167 commit 0e0fa53

27 files changed

+246
-294
lines changed

‎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_autovacumm),
93+
return [{'dashboard': {'name': self.right_type(self.key_autovacuum),
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}}]

‎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.autovacumm.count[]</td>
1764+
<td>pgsql.autovacuum.count[]</td>
17651765
</tr>
17661766
<tr>
17671767
<th>Type</th>

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

-216
This file was deleted.

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

+6
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ interval = 15
8484
[bgwriter]
8585
interval = 15
8686

87+
# Besides standard autovacuum workers count, mamonsu also counts autovacuum utilization.
88+
# But this metric is instantaneous, so recommended to run this plugin frequently
89+
# to get a complete picture of autovacuum utilization.
90+
[autovacuum]
91+
interval = 30
92+
8793
[connections]
8894
percent_connections_tr = 90
8995
interval = 15

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ 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.autovacumm.count[]
8+
pgsql.autovacuum.count[]
9+
pgsql.autovacuum.utilization[]
910
pgsql.bgwriter[buffers_alloc]
1011
pgsql.bgwriter[buffers_backend]
1112
pgsql.bgwriter[buffers_backend_fsync]

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ 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.autovacumm.count[]
8+
pgsql.autovacuum.count[]
9+
pgsql.autovacuum.utilization[]
910
pgsql.bgwriter[buffers_alloc]
1011
pgsql.bgwriter[buffers_backend]
1112
pgsql.bgwriter[buffers_backend_fsync]

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ 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.autovacumm.count[]
8+
pgsql.autovacuum.count[]
9+
pgsql.autovacuum.utilization[]
910
pgsql.bgwriter[buffers_alloc]
1011
pgsql.bgwriter[buffers_backend]
1112
pgsql.bgwriter[buffers_backend_fsync]

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ 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.autovacumm.count[]
8+
pgsql.autovacuum.count[]
9+
pgsql.autovacuum.utilization[]
910
pgsql.bgwriter[buffers_alloc]
1011
pgsql.bgwriter[buffers_backend]
1112
pgsql.bgwriter[buffers_backend_fsync]

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ 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.autovacumm.count[]
8+
pgsql.autovacuum.count[]
9+
pgsql.autovacuum.utilization[]
910
pgsql.bgwriter[buffers_alloc]
1011
pgsql.bgwriter[buffers_backend]
1112
pgsql.bgwriter[buffers_backend_fsync]

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ 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.autovacumm.count[]
8+
pgsql.autovacuum.count[]
9+
pgsql.autovacuum.utilization[]
910
pgsql.bgwriter[buffers_alloc]
1011
pgsql.bgwriter[buffers_backend]
1112
pgsql.bgwriter[buffers_backend_fsync]

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ 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.autovacumm.count[]
8+
pgsql.autovacuum.count[]
9+
pgsql.autovacuum.utilization[]
910
pgsql.bgwriter[buffers_alloc]
1011
pgsql.bgwriter[buffers_backend]
1112
pgsql.bgwriter[buffers_backend_fsync]

‎mamonsu/plugins/common/health.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,21 @@ def items(self, template, dashboard=False):
5555
def triggers(self, template, dashboard=False):
5656
if self.Type == "mamonsu":
5757
result = template.trigger({
58-
"name": "Mamonsu plugin errors on {HOSTNAME}. {ITEM.LASTVALUE}",
58+
"name": "Mamonsu health: plugin errors on {HOSTNAME}. {ITEM.LASTVALUE}",
5959
"expression": "{#TEMPLATE:mamonsu.plugin.errors[].strlen()}&gt;1"
6060
}) + template.trigger({
61-
"name": "Mamonsu nodata from {HOSTNAME}",
61+
"name": "Mamonsu health: nodata from {HOSTNAME}",
6262
"expression": "{#TEMPLATE:" + self.right_type("mamonsu.plugin.keepalive{0}") + ".nodata(180)}=1"
6363
})
6464
if platform.LINUX:
6565
result += template.trigger({
66-
"name": "Mamonsu agent memory usage alert on {HOSTNAME}: {ITEM.LASTVALUE} bytes",
66+
"name": "Mamonsu health: agent memory usage alert on {HOSTNAME}: {ITEM.LASTVALUE} bytes",
6767
"expression": "{#TEMPLATE:mamonsu.memory.rss[max].last()}&gt;" + self.plugin_config(
6868
"max_memory_usage")
6969
})
7070
else:
7171
result = template.trigger({
72-
"name": "Mamonsu nodata from {HOSTNAME}",
72+
"name": "Mamonsu health: nodata from {HOSTNAME}",
7373
"expression": "{#TEMPLATE:" + self.right_type("mamonsu.plugin.keepalive{0}") + ".nodata(180)}=1"
7474
})
7575
return result

0 commit comments

Comments
 (0)