Skip to content

Commit

Permalink
generally lowered the criticality to make the monitoring less noisy
Browse files Browse the repository at this point in the history
  • Loading branch information
@NavidSassan
NavidSassan committed Apr 8, 2024
1 parent ed3cdea commit f07f9ba
Show file tree
Hide file tree
Showing 118 changed files with 189 additions and 134 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project does NOT adhere to [Semantic Versioning](https://semver.org/spe
Icinga Director:

* all-the-rest.json: Remove all predefined "Journald Query" definitions, as they were not as useful in practice as we thought. Single services are more useful.
* Lowered the criticality of many service templates and service set services to make the monitoring less noisy by default. Make sure to double check and increase the criticality for important services.

Monitoring Plugins:

Expand Down
42 changes: 42 additions & 0 deletions assets/icingaweb2-module-director/all-the-rest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3236,6 +3236,7 @@
"use_var_overrides": null,
"uuid": "22450b2f-ed4e-4fd4-b6ff-3f191e72b3e7",
"vars": {
"criticality": "A",
"service_windows_service": "CertSvc"
},
"volatile": null,
Expand Down Expand Up @@ -3290,6 +3291,7 @@
"use_var_overrides": null,
"uuid": "d0da8bc0-95b0-479b-b44f-fb8c0b8536b8",
"vars": {
"criticality": "A",
"network_port_tcp_windows_port": "88"
},
"volatile": null,
Expand Down Expand Up @@ -3335,6 +3337,7 @@
"use_var_overrides": null,
"uuid": "3a297f96-f2c1-4564-a938-e28ab9543644",
"vars": {
"criticality": "A",
"network_port_tcp_windows_port": "464"
},
"volatile": null,
Expand Down Expand Up @@ -3380,6 +3383,7 @@
"use_var_overrides": null,
"uuid": "bfc401de-35fd-41a0-a682-c1a8c7661237",
"vars": {
"criticality": "A",
"network_port_tcp_windows_port": "389"
},
"volatile": null,
Expand Down Expand Up @@ -3425,6 +3429,7 @@
"use_var_overrides": null,
"uuid": "18bd60b9-c2da-4faa-b269-9e00da9d27a3",
"vars": {
"criticality": "A",
"network_port_tcp_windows_port": "636"
},
"volatile": null,
Expand Down Expand Up @@ -3470,6 +3475,7 @@
"use_var_overrides": null,
"uuid": "0b64e004-9d28-4ed1-a4c5-547fae4d8912",
"vars": {
"criticality": "A",
"network_port_tcp_windows_port": "9389"
},
"volatile": null,
Expand Down Expand Up @@ -3515,6 +3521,7 @@
"use_var_overrides": null,
"uuid": "c314ec3d-882b-49ee-990d-6bb017d94cd5",
"vars": {
"criticality": "A",
"network_port_tcp_windows_port": "593"
},
"volatile": null,
Expand Down Expand Up @@ -3560,6 +3567,7 @@
"use_var_overrides": null,
"uuid": "0b6187d5-ec04-4ccb-bb87-1db1f1c4ed12",
"vars": {
"criticality": "A",
"network_port_tcp_windows_port": "3268"
},
"volatile": null,
Expand Down Expand Up @@ -3605,6 +3613,7 @@
"use_var_overrides": null,
"uuid": "dcf2de2a-518f-43a0-b37e-73988e01a9f5",
"vars": {
"criticality": "A",
"network_port_tcp_windows_port": "3269"
},
"volatile": null,
Expand Down Expand Up @@ -3650,6 +3659,7 @@
"use_var_overrides": null,
"uuid": "c25b8ef4-fb57-47e3-aa7c-1c52ccf19a94",
"vars": {
"criticality": "A",
"service_windows_service": "NTDS"
},
"volatile": null,
Expand Down Expand Up @@ -3695,6 +3705,7 @@
"use_var_overrides": null,
"uuid": "b98bb814-fff3-4803-bf58-378d2da1ad6d",
"vars": {
"criticality": "A",
"service_windows_service": "ADWS"
},
"volatile": null,
Expand Down Expand Up @@ -3740,6 +3751,7 @@
"use_var_overrides": null,
"uuid": "33794607-ffa2-46b4-a143-2b49c4eb3c4b",
"vars": {
"criticality": "A",
"service_windows_service": "Dfs"
},
"volatile": null,
Expand Down Expand Up @@ -3785,6 +3797,7 @@
"use_var_overrides": null,
"uuid": "b355777f-eea6-4466-8258-63621cbd003c",
"vars": {
"criticality": "A",
"service_windows_service": "DFSR"
},
"volatile": null,
Expand Down Expand Up @@ -3830,6 +3843,7 @@
"use_var_overrides": null,
"uuid": "5d78bc0f-82bf-42a1-8c43-023b9da3895b",
"vars": {
"criticality": "A",
"service_windows_service": "IsmServ"
},
"volatile": null,
Expand Down Expand Up @@ -3875,6 +3889,7 @@
"use_var_overrides": null,
"uuid": "b05e0e8f-7a77-422b-9cb0-37e6d7a3938f",
"vars": {
"criticality": "A",
"service_windows_service": "Kdc"
},
"volatile": null,
Expand Down Expand Up @@ -3929,6 +3944,7 @@
"use_var_overrides": null,
"uuid": "9dd13265-a6cc-44d2-9d87-abc68949be97",
"vars": {
"criticality": "A",
"service_windows_service": "adfssrv"
},
"volatile": null,
Expand Down Expand Up @@ -3983,6 +3999,7 @@
"use_var_overrides": null,
"uuid": "5fea616d-a265-4df2-a715-bd73dabadea7",
"vars": {
"criticality": "A",
"service_windows_service": "ADWS"
},
"volatile": null,
Expand Down Expand Up @@ -4028,6 +4045,7 @@
"use_var_overrides": null,
"uuid": "8ac93feb-ebe9-4a66-8291-fd7858a72bc1",
"vars": {
"criticality": "A",
"service_windows_service": "DsRoleSvc"
},
"volatile": null,
Expand Down Expand Up @@ -6756,6 +6774,7 @@
"use_var_overrides": null,
"uuid": "267f3416-85ad-4423-9fde-7b1cf19a61e6",
"vars": {
"criticality": "A",
"systemd_unit_unit": "firewalld.service"
},
"volatile": null,
Expand Down Expand Up @@ -7932,6 +7951,7 @@
"use_var_overrides": null,
"uuid": "b1f2dce4-5a18-4b39-b628-09bd55a6c797",
"vars": {
"criticality": "A",
"systemd_unit_substate": "exited",
"systemd_unit_unit": "fwb.service"
},
Expand Down Expand Up @@ -8168,6 +8188,7 @@
"use_var_overrides": null,
"uuid": "30ca7192-e3d8-4308-b5a8-a1f56f97aa79",
"vars": {
"criticality": "A",
"systemd_unit_activestate": "inactive",
"systemd_unit_severity": "crit",
"systemd_unit_substate": "dead",
Expand Down Expand Up @@ -8217,6 +8238,7 @@
"use_var_overrides": null,
"uuid": "8cf36ac3-921f-4b0c-9b1b-d9bb47f0df13",
"vars": {
"criticality": "A",
"systemd_unit_severity": "crit",
"systemd_unit_unit": "glusterd.service"
},
Expand Down Expand Up @@ -9579,6 +9601,7 @@
"use_var_overrides": null,
"uuid": "5b35c791-6913-4137-a149-0da9bd1fcf87",
"vars": {
"criticality": "A",
"systemd_unit_substate": [
"exited"
],
Expand Down Expand Up @@ -9627,6 +9650,7 @@
"use_var_overrides": null,
"uuid": "2e41d085-0768-437a-947f-18fb39ce7ce3",
"vars": {
"criticality": "A",
"systemd_unit_substate": [
"running"
],
Expand Down Expand Up @@ -10506,6 +10530,7 @@
"use_var_overrides": null,
"uuid": "87e0fbcd-f3ed-44e1-bca3-ac8a13a443d8",
"vars": {
"criticality": "A",
"librenms_alerts_device_type": [
"printer"
]
Expand Down Expand Up @@ -10647,6 +10672,7 @@
"use_var_overrides": null,
"uuid": "b05bb352-0998-46fc-8e3b-667f71e9c3e7",
"vars": {
"criticality": "A",
"librenms_alerts_device_type": [
"wireless"
]
Expand Down Expand Up @@ -10694,6 +10720,7 @@
"use_var_overrides": null,
"uuid": "3513bcca-1ae1-4d07-9b6b-de8fe0b2eadb",
"vars": {
"criticality": "A",
"librenms_alerts_device_type": [
"workstation"
]
Expand Down Expand Up @@ -11070,6 +11097,7 @@
"use_var_overrides": null,
"uuid": "b6a2c7fa-0731-4648-a9a2-74aca4bc0d80",
"vars": {
"criticality": "A",
"librenms_health_device_type": [
"printer"
]
Expand Down Expand Up @@ -11211,6 +11239,7 @@
"use_var_overrides": null,
"uuid": "74fca8ea-1d5b-4f69-bf7d-1e4c4d1dff6f",
"vars": {
"criticality": "A",
"librenms_health_device_type": [
"wireless"
]
Expand Down Expand Up @@ -11258,6 +11287,7 @@
"use_var_overrides": null,
"uuid": "e4505975-52ec-4671-a002-0be5d9baef3b",
"vars": {
"criticality": "A",
"librenms_health_device_type": [
"workstation"
]
Expand Down Expand Up @@ -14989,6 +15019,7 @@
"use_var_overrides": null,
"uuid": "5838a425-d2b0-450c-a32c-efbfcc91a30b",
"vars": {
"criticality": "A",
"systemd_unit_activestate": [
"active"
],
Expand Down Expand Up @@ -15042,6 +15073,7 @@
"use_var_overrides": null,
"uuid": "4a471eeb-afec-4fbd-a134-6f4095639809",
"vars": {
"criticality": "A",
"systemd_unit_activestate": [
"active"
],
Expand Down Expand Up @@ -15095,6 +15127,7 @@
"use_var_overrides": null,
"uuid": "8e72d5cd-d617-4965-9c90-8cde806400ba",
"vars": {
"criticality": "A",
"systemd_unit_activestate": [
"active"
],
Expand Down Expand Up @@ -23464,6 +23497,7 @@
"use_var_overrides": null,
"uuid": "b00fb823-6c6a-47aa-9524-ae491e7fddf2",
"vars": {
"criticality": "A",
"systemd_unit_activestate": "inactive",
"systemd_unit_loadstate": "loaded",
"systemd_unit_substate": "dead",
Expand Down Expand Up @@ -24885,6 +24919,7 @@
"use_var_overrides": null,
"uuid": "67e105bb-4eed-4c38-a5f6-433cd40c4587",
"vars": {
"criticality": "A",
"systemd_unit_activestate": "inactive",
"systemd_unit_loadstate": "loaded",
"systemd_unit_substate": "dead",
Expand Down Expand Up @@ -26437,6 +26472,7 @@
"use_var_overrides": null,
"uuid": "7a8fca64-8b76-400c-aea3-c4c63d0bb5ca",
"vars": {
"criticality": "A",
"systemd_unit_activestate": "inactive",
"systemd_unit_loadstate": "loaded",
"systemd_unit_substate": "dead",
Expand Down Expand Up @@ -27895,6 +27931,7 @@
"use_var_overrides": null,
"uuid": "510972a7-ef57-4a8f-9f8c-db9c1d09beff",
"vars": {
"criticality": "A",
"systemd_unit_activestate": "inactive",
"systemd_unit_loadstate": "loaded",
"systemd_unit_substate": "dead",
Expand Down Expand Up @@ -38906,6 +38943,7 @@
"use_var_overrides": null,
"uuid": "668284d2-767e-449d-bcc4-97ec0b33b19e",
"vars": {
"criticality": "A",
"systemd_unit_substate": [
"running"
],
Expand Down Expand Up @@ -38955,6 +38993,7 @@
"use_var_overrides": null,
"uuid": "f5a0fa0e-ec01-4f5f-9f04-10f6a4c20f92",
"vars": {
"criticality": "A",
"systemd_unit_substate": [
"running"
],
Expand Down Expand Up @@ -40000,6 +40039,7 @@
"use_var_overrides": null,
"uuid": "fec7ee15-76ef-400c-a175-a0b829f70285",
"vars": {
"criticality": "A",
"systemd_unit_unit": "nut-driver.service",
"systemd_unit_unitfilestate": "static"
},
Expand Down Expand Up @@ -40046,6 +40086,7 @@
"use_var_overrides": null,
"uuid": "c5059325-9d57-453b-a536-22ef5d1db790",
"vars": {
"criticality": "A",
"systemd_unit_unit": "nut-monitor.service"
},
"volatile": null,
Expand Down Expand Up @@ -40091,6 +40132,7 @@
"use_var_overrides": null,
"uuid": "f23e0276-913b-47cc-8cc2-a19615304edf",
"vars": {
"criticality": "A",
"systemd_unit_unit": "nut-server.service"
},
"volatile": null,
Expand Down
2 changes: 1 addition & 1 deletion check-plugins/apache-httpd-status/icingaweb2-module-director/apache-httpd-status.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
"use_agent": null,
"use_var_overrides": null,
"vars": {
"criticality": "A",
"criticality": "C",
"apache_httpd_status_always_ok": false,
"apache_httpd_status_critical": 95,
"apache_httpd_status_insecure": false,
Expand Down
1 change: 0 additions & 1 deletion check-plugins/apache-httpd-status/icingaweb2-module-director/apache-httpd-status.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ variants:

overwrites:
'["ServiceTemplate"]["tpl-service-apache-httpd-status"]["enable_perfdata"]': true
'["ServiceTemplate"]["tpl-service-apache-httpd-status"]["vars"]["criticality"]': 'A'
2 changes: 1 addition & 1 deletion check-plugins/axenita-stats/icingaweb2-module-director/axenita-stats.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
"use_agent": null,
"use_var_overrides": null,
"vars": {
"criticality": "B",
"criticality": "C",
"axenita_stats_always_ok": false,
"axenita_stats_insecure": false,
"axenita_stats_no_proxy": false,
Expand Down
1 change: 0 additions & 1 deletion check-plugins/axenita-stats/icingaweb2-module-director/axenita-stats.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ variants:

overwrites:
'["ServiceTemplate"]["tpl-service-axenita-stats"]["enable_perfdata"]': true
'["ServiceTemplate"]["tpl-service-axenita-stats"]["vars"]["criticality"]': 'B'
2 changes: 1 addition & 1 deletion check-plugins/by-ssh/icingaweb2-module-director/by-ssh.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
"use_agent": null,
"use_var_overrides": null,
"vars": {
"criticality": "A",
"criticality": "C",
"by_ssh_always_ok": false,
"by_ssh_critical_pattern": [],
"by_ssh_critical_regex": [],
Expand Down
1 change: 0 additions & 1 deletion check-plugins/by-ssh/icingaweb2-module-director/by-ssh.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
overwrites:
'["ServiceTemplate"]["tpl-service-by-ssh"]["enable_perfdata"]': true
'["ServiceTemplate"]["tpl-service-by-ssh"]["vars"]["criticality"]': 'A'
2 changes: 1 addition & 1 deletion check-plugins/cometsystem/icingaweb2-module-director/cometsystem.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
"use_agent": null,
"use_var_overrides": null,
"vars": {
"criticality": "C",
"criticality": "A",
"cometsystem_windows_always_ok": false,
"cometsystem_windows_insecure": false,
"cometsystem_windows_no_proxy": false,
Expand Down
2 changes: 2 additions & 0 deletions check-plugins/cometsystem/icingaweb2-module-director/cometsystem.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ variants:
overwrites:
'["ServiceTemplate"]["tpl-service-cometsystem"]["enable_perfdata"]': true
'["ServiceTemplate"]["tpl-service-cometsystem"]["vars"]["criticality"]': 'A'

'["ServiceTemplate"]["tpl-service-cometsystem-windows"]["vars"]["criticality"]': 'A'
Loading

0 comments on commit f07f9ba

Please sign in to comment.