Skip to content

Commit 72a9587

Browse files
committed
feat(podman-info,podman-stats): add dedicated Podman checks (fix #1023)
- Add podman-info and podman-stats as dedicated Podman counterparts to docker-info and docker-stats - Add Podman Service Set to Icinga Director basket - Modernize docker-info and docker-stats (remove pylint directives, fix bare except, use example-plugin perfdata format) - Fix docker-stats memory perfdata using CPU thresholds instead of memory thresholds - docker-info and docker-stats now detect Podman and point to the correct check
1 parent 2405789 commit 72a9587

File tree

32 files changed

+1569
-333
lines changed

32 files changed

+1569
-333
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ Monitoring Plugins:
4444
* librenms-alerts: add device-type `management`
4545
* librenms-health: add device-type `management`
4646
* nextcloud-enterprise: provides information about an installed Nextcloud Enterprise subscription
47+
* podman-info: displays system-wide Podman information (dedicated Podman counterpart to docker-info) ([#1023](https://github.com/Linuxfabrik/monitoring-plugins/issues/1023))
48+
* podman-stats: prints cpu and memory statistics for all running Podman containers (dedicated Podman counterpart to docker-stats) ([#1023](https://github.com/Linuxfabrik/monitoring-plugins/issues/1023))
4749
* procs: add `--lengthy` parameter for extended `--top` table output with all platform-specific memory fields
4850
* procs: add `--top` parameter to list the top N processes by CPU time and memory usage
4951
* procs: add `--warning-cpu-percent` / `--critical-cpu-percent` thresholds for aggregated CPU usage of filtered processes (requires SQLite for delta calculation between runs)
@@ -129,6 +131,7 @@ Monitoring Plugins:
129131
* about-me: fix various errors with `sys_dimensions` on some machines ([#1006](https://github.com/Linuxfabrik/monitoring-plugins/issues/1006))
130132
* by-ssh: add missing `--verbose` parameter
131133
* cpu-usage: fix false 100% readings on Windows with 64+ cores caused by all-zero CPU time samples from psutil ([#626](https://github.com/Linuxfabrik/monitoring-plugins/issues/626))
134+
* docker-stats: fix memory perfdata using CPU thresholds instead of memory thresholds
132135
* file-age: handle `FileNotFoundError` race condition when files disappear on busy file systems
133136
* fs-ro: ignore `/run/credentials` (https://systemd.io/CREDENTIALS/)
134137
* keycloak-stats: fix incorrect symlink for lib

assets/icingaweb2-module-director/all-the-rest.json

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,6 +1335,12 @@
13351335
"entry_value": "pip",
13361336
"format": "string"
13371337
},
1338+
{
1339+
"allowed_roles": null,
1340+
"entry_name": "podman",
1341+
"entry_value": "Podman",
1342+
"format": "string"
1343+
},
13381344
{
13391345
"allowed_roles": null,
13401346
"entry_name": "postfix-mta",
@@ -40782,6 +40788,101 @@
4078240788
},
4078340789
"uuid": "f2ebcf70-f8fc-4a4d-920d-0adead6d220c"
4078440790
},
40791+
"Podman Service Set": {
40792+
"assign_filter": "\"podman\"=host.vars.tags",
40793+
"description": null,
40794+
"object_name": "Podman Service Set",
40795+
"object_type": "template",
40796+
"services": {
40797+
"Podman Info": {
40798+
"action_url": null,
40799+
"apply_for": null,
40800+
"assign_filter": null,
40801+
"check_command": null,
40802+
"check_interval": null,
40803+
"check_period": null,
40804+
"check_timeout": null,
40805+
"command_endpoint": null,
40806+
"disabled": false,
40807+
"display_name": null,
40808+
"enable_active_checks": null,
40809+
"enable_event_handler": null,
40810+
"enable_flapping": null,
40811+
"enable_notifications": null,
40812+
"enable_passive_checks": null,
40813+
"enable_perfdata": null,
40814+
"event_command": null,
40815+
"fields": [],
40816+
"flapping_threshold_high": null,
40817+
"flapping_threshold_low": null,
40818+
"groups": [],
40819+
"host": null,
40820+
"icon_image": null,
40821+
"icon_image_alt": null,
40822+
"imports": [
40823+
"tpl-service-podman-info"
40824+
],
40825+
"max_check_attempts": null,
40826+
"notes": null,
40827+
"notes_url": null,
40828+
"object_name": "Podman Info",
40829+
"object_type": "object",
40830+
"retry_interval": null,
40831+
"service_set": null,
40832+
"template_choice": null,
40833+
"use_agent": null,
40834+
"use_var_overrides": null,
40835+
"uuid": "2c5186be-dbf0-476e-9167-007418bdc11e",
40836+
"vars": {},
40837+
"volatile": null,
40838+
"zone": null
40839+
},
40840+
"Podman Stats": {
40841+
"action_url": null,
40842+
"apply_for": null,
40843+
"assign_filter": null,
40844+
"check_command": null,
40845+
"check_interval": null,
40846+
"check_period": null,
40847+
"check_timeout": null,
40848+
"command_endpoint": null,
40849+
"disabled": false,
40850+
"display_name": null,
40851+
"enable_active_checks": null,
40852+
"enable_event_handler": null,
40853+
"enable_flapping": null,
40854+
"enable_notifications": null,
40855+
"enable_passive_checks": null,
40856+
"enable_perfdata": null,
40857+
"event_command": null,
40858+
"fields": [],
40859+
"flapping_threshold_high": null,
40860+
"flapping_threshold_low": null,
40861+
"groups": [],
40862+
"host": null,
40863+
"icon_image": null,
40864+
"icon_image_alt": null,
40865+
"imports": [
40866+
"tpl-service-podman-stats"
40867+
],
40868+
"max_check_attempts": null,
40869+
"notes": null,
40870+
"notes_url": null,
40871+
"object_name": "Podman Stats",
40872+
"object_type": "object",
40873+
"retry_interval": null,
40874+
"service_set": null,
40875+
"template_choice": null,
40876+
"use_agent": null,
40877+
"use_var_overrides": null,
40878+
"uuid": "d3e54d97-d793-4622-9f64-22a6b3d4cef3",
40879+
"vars": {},
40880+
"volatile": null,
40881+
"zone": null
40882+
}
40883+
},
40884+
"uuid": "5701b472-29c0-45d6-83db-921f07f1fc33"
40885+
},
4078540886
"Postfix MTA Service Set": {
4078640887
"assign_filter": "\"postfix-mta\"=host.vars.tags",
4078740888
"description": null,

check-plugins/docker-info/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Overview
44

5-
Displays system-wide docker or podman information.
5+
Displays system-wide Docker information. For Podman, use the [podman-info](https://github.com/Linuxfabrik/monitoring-plugins/tree/main/check-plugins/podman-info) check instead.
66

77

88
## Fact Sheet
@@ -20,7 +20,8 @@ Displays system-wide docker or podman information.
2020
```text
2121
usage: docker-info [-h] [-V] [--always-ok] [--test TEST]
2222
23-
Displays system-wide docker information.
23+
Displays system-wide Docker information. For Podman, use the podman-info check
24+
instead.
2425
2526
options:
2627
-h, --help show this help message and exit

0 commit comments

Comments
 (0)