From f07f9ba6a99c34e9b628e121843e1957368cda26 Mon Sep 17 00:00:00 2001 From: Navid Sassan Date: Mon, 8 Apr 2024 11:14:21 +0200 Subject: [PATCH] generally lowered the criticality to make the monitoring less noisy --- CHANGELOG.md | 1 + .../all-the-rest.json | 42 +++++++++++++++++++ .../apache-httpd-status.json | 2 +- .../apache-httpd-status.yml | 1 - .../axenita-stats.json | 2 +- .../axenita-stats.yml | 1 - .../icingaweb2-module-director/by-ssh.json | 2 +- .../icingaweb2-module-director/by-ssh.yml | 1 - .../cometsystem.json | 2 +- .../cometsystem.yml | 2 + .../csv-values.json | 2 +- .../icingaweb2-module-director/csv-values.yml | 1 - .../dhcp-relayed.json | 4 +- .../dhcp-relayed.yml | 2 - .../disk-usage.json | 4 +- .../icingaweb2-module-director/disk-usage.yml | 2 - .../dns/icingaweb2-module-director/dns.json | 2 +- .../dns/icingaweb2-module-director/dns.yml | 1 - .../fortios-ha-stats.json | 4 +- .../fortios-ha-stats.yml | 3 ++ .../fortios-sensor.json | 4 +- .../fortios-sensor.yml | 3 ++ .../icingaweb2-module-director/fs-inodes.json | 2 +- .../icingaweb2-module-director/fs-inodes.yml | 1 - .../haproxy-status.json | 2 +- .../haproxy-status.yml | 1 - .../huawei-dorado-backup-power.json | 4 +- .../huawei-dorado-backup-power.yml | 3 ++ .../huawei-dorado-controller.yml | 1 + .../huawei-dorado-disk.yml | 1 + .../huawei-dorado-enclosure.json | 4 +- .../huawei-dorado-enclosure.yml | 3 ++ .../huawei-dorado-fan.json | 4 +- .../huawei-dorado-fan.yml | 3 ++ .../huawei-dorado-host.json | 4 +- .../huawei-dorado-host.yml | 3 ++ .../huawei-dorado-hypermetrodomain.json | 4 +- .../huawei-dorado-hypermetrodomain.yml | 3 ++ .../huawei-dorado-hypermetropair.json | 4 +- .../huawei-dorado-hypermetropair.yml | 3 ++ .../huawei-dorado-interface.json | 4 +- .../huawei-dorado-interface.yml | 3 ++ .../huawei-dorado-power.yml | 1 + .../huawei-dorado-system.json | 4 +- .../huawei-dorado-system.yml | 3 ++ .../infomaniak-events.json | 2 +- .../infomaniak-events.yml | 1 - .../journald-query.json | 2 +- .../journald-query.yml | 1 - .../json-values.json | 4 +- .../json-values.yml | 2 - .../kemp-services.json | 8 ++-- .../kemp-services.yml | 5 +++ .../librenms-alerts.json | 2 +- .../librenms-alerts.yml | 2 + .../librenms-health.json | 6 +-- .../librenms-health.yml | 4 ++ .../load/icingaweb2-module-director/load.json | 2 +- .../load/icingaweb2-module-director/load.yml | 1 - .../icingaweb2-module-director/logfile.json | 4 +- .../icingaweb2-module-director/logfile.yml | 2 - .../icingaweb2-module-director/mailq.json | 2 +- .../icingaweb2-module-director/mailq.yml | 1 - .../memory-usage.json | 4 +- .../memory-usage.yml | 2 - .../mysql-connections.json | 2 +- .../mysql-connections.yml | 1 - .../mysql-memory.json | 2 +- .../mysql-memory.yml | 1 - .../mysql-replica-status.json | 2 +- .../mysql-replica-status.yml | 1 - .../mysql-system.json | 2 +- .../mysql-system.yml | 1 - .../network-bonding.json | 2 +- .../network-bonding.yml | 1 + .../network-port-tcp.json | 2 +- .../network-port-tcp.yml | 3 -- .../nginx-status.json | 2 +- .../nginx-status.yml | 1 - .../nodebb-database.json | 2 +- .../nodebb-database.yml | 1 - .../nodebb-errors.json | 2 +- .../nodebb-errors.yml | 1 - .../ntp-chronyd.json | 2 +- .../ntp-chronyd.yml | 1 - .../icingaweb2-module-director/ntp-ntpd.json | 2 +- .../icingaweb2-module-director/ntp-ntpd.yml | 1 - .../ntp-systemd-timesyncd.yml | 1 - .../icingaweb2-module-director/ntp-w32tm.json | 2 +- .../icingaweb2-module-director/ntp-w32tm.yml | 1 - .../openstack-swift-stat.json | 2 +- .../openstack-swift-stat.yml | 1 - .../path-rw-test.json | 2 +- .../path-rw-test.yml | 3 -- .../php-fpm-ping.json | 2 +- .../php-fpm-ping.yml | 1 - .../qts-disk-smart.json | 12 +++--- .../qts-disk-smart.yml | 7 ++++ .../qts-temperatures.json | 8 ++-- .../qts-temperatures.yml | 5 +++ .../redfish-drives.yml | 2 +- .../redfish-sel.yml | 1 + .../redfish-sensor.yml | 1 + .../safenet-hsm-state.json | 2 +- .../scheduled-task.yml | 3 -- .../sensors-battery.json | 2 +- .../sensors-battery.yml | 1 + .../icingaweb2-module-director/service.yml | 1 - .../icingaweb2-module-director/statuspal.json | 2 +- .../icingaweb2-module-director/statuspal.yml | 1 - .../strongswan-connections.json | 2 +- .../strongswan-connections.yml | 1 - .../systemd-unit.json | 2 +- .../systemd-unit.yml | 1 - .../icingaweb2-module-director/users.json | 4 +- .../icingaweb2-module-director/users.yml | 2 - .../xml/icingaweb2-module-director/xml.json | 2 +- .../xml/icingaweb2-module-director/xml.yml | 1 - 118 files changed, 189 insertions(+), 134 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 282202f8a..fc12b4fa3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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: diff --git a/assets/icingaweb2-module-director/all-the-rest.json b/assets/icingaweb2-module-director/all-the-rest.json index ec0f9878c..6e34d878c 100644 --- a/assets/icingaweb2-module-director/all-the-rest.json +++ b/assets/icingaweb2-module-director/all-the-rest.json @@ -3236,6 +3236,7 @@ "use_var_overrides": null, "uuid": "22450b2f-ed4e-4fd4-b6ff-3f191e72b3e7", "vars": { + "criticality": "A", "service_windows_service": "CertSvc" }, "volatile": null, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -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, @@ -3650,6 +3659,7 @@ "use_var_overrides": null, "uuid": "c25b8ef4-fb57-47e3-aa7c-1c52ccf19a94", "vars": { + "criticality": "A", "service_windows_service": "NTDS" }, "volatile": null, @@ -3695,6 +3705,7 @@ "use_var_overrides": null, "uuid": "b98bb814-fff3-4803-bf58-378d2da1ad6d", "vars": { + "criticality": "A", "service_windows_service": "ADWS" }, "volatile": null, @@ -3740,6 +3751,7 @@ "use_var_overrides": null, "uuid": "33794607-ffa2-46b4-a143-2b49c4eb3c4b", "vars": { + "criticality": "A", "service_windows_service": "Dfs" }, "volatile": null, @@ -3785,6 +3797,7 @@ "use_var_overrides": null, "uuid": "b355777f-eea6-4466-8258-63621cbd003c", "vars": { + "criticality": "A", "service_windows_service": "DFSR" }, "volatile": null, @@ -3830,6 +3843,7 @@ "use_var_overrides": null, "uuid": "5d78bc0f-82bf-42a1-8c43-023b9da3895b", "vars": { + "criticality": "A", "service_windows_service": "IsmServ" }, "volatile": null, @@ -3875,6 +3889,7 @@ "use_var_overrides": null, "uuid": "b05e0e8f-7a77-422b-9cb0-37e6d7a3938f", "vars": { + "criticality": "A", "service_windows_service": "Kdc" }, "volatile": null, @@ -3929,6 +3944,7 @@ "use_var_overrides": null, "uuid": "9dd13265-a6cc-44d2-9d87-abc68949be97", "vars": { + "criticality": "A", "service_windows_service": "adfssrv" }, "volatile": null, @@ -3983,6 +3999,7 @@ "use_var_overrides": null, "uuid": "5fea616d-a265-4df2-a715-bd73dabadea7", "vars": { + "criticality": "A", "service_windows_service": "ADWS" }, "volatile": null, @@ -4028,6 +4045,7 @@ "use_var_overrides": null, "uuid": "8ac93feb-ebe9-4a66-8291-fd7858a72bc1", "vars": { + "criticality": "A", "service_windows_service": "DsRoleSvc" }, "volatile": null, @@ -6756,6 +6774,7 @@ "use_var_overrides": null, "uuid": "267f3416-85ad-4423-9fde-7b1cf19a61e6", "vars": { + "criticality": "A", "systemd_unit_unit": "firewalld.service" }, "volatile": null, @@ -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" }, @@ -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", @@ -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" }, @@ -9579,6 +9601,7 @@ "use_var_overrides": null, "uuid": "5b35c791-6913-4137-a149-0da9bd1fcf87", "vars": { + "criticality": "A", "systemd_unit_substate": [ "exited" ], @@ -9627,6 +9650,7 @@ "use_var_overrides": null, "uuid": "2e41d085-0768-437a-947f-18fb39ce7ce3", "vars": { + "criticality": "A", "systemd_unit_substate": [ "running" ], @@ -10506,6 +10530,7 @@ "use_var_overrides": null, "uuid": "87e0fbcd-f3ed-44e1-bca3-ac8a13a443d8", "vars": { + "criticality": "A", "librenms_alerts_device_type": [ "printer" ] @@ -10647,6 +10672,7 @@ "use_var_overrides": null, "uuid": "b05bb352-0998-46fc-8e3b-667f71e9c3e7", "vars": { + "criticality": "A", "librenms_alerts_device_type": [ "wireless" ] @@ -10694,6 +10720,7 @@ "use_var_overrides": null, "uuid": "3513bcca-1ae1-4d07-9b6b-de8fe0b2eadb", "vars": { + "criticality": "A", "librenms_alerts_device_type": [ "workstation" ] @@ -11070,6 +11097,7 @@ "use_var_overrides": null, "uuid": "b6a2c7fa-0731-4648-a9a2-74aca4bc0d80", "vars": { + "criticality": "A", "librenms_health_device_type": [ "printer" ] @@ -11211,6 +11239,7 @@ "use_var_overrides": null, "uuid": "74fca8ea-1d5b-4f69-bf7d-1e4c4d1dff6f", "vars": { + "criticality": "A", "librenms_health_device_type": [ "wireless" ] @@ -11258,6 +11287,7 @@ "use_var_overrides": null, "uuid": "e4505975-52ec-4671-a002-0be5d9baef3b", "vars": { + "criticality": "A", "librenms_health_device_type": [ "workstation" ] @@ -14989,6 +15019,7 @@ "use_var_overrides": null, "uuid": "5838a425-d2b0-450c-a32c-efbfcc91a30b", "vars": { + "criticality": "A", "systemd_unit_activestate": [ "active" ], @@ -15042,6 +15073,7 @@ "use_var_overrides": null, "uuid": "4a471eeb-afec-4fbd-a134-6f4095639809", "vars": { + "criticality": "A", "systemd_unit_activestate": [ "active" ], @@ -15095,6 +15127,7 @@ "use_var_overrides": null, "uuid": "8e72d5cd-d617-4965-9c90-8cde806400ba", "vars": { + "criticality": "A", "systemd_unit_activestate": [ "active" ], @@ -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", @@ -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", @@ -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", @@ -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", @@ -38906,6 +38943,7 @@ "use_var_overrides": null, "uuid": "668284d2-767e-449d-bcc4-97ec0b33b19e", "vars": { + "criticality": "A", "systemd_unit_substate": [ "running" ], @@ -38955,6 +38993,7 @@ "use_var_overrides": null, "uuid": "f5a0fa0e-ec01-4f5f-9f04-10f6a4c20f92", "vars": { + "criticality": "A", "systemd_unit_substate": [ "running" ], @@ -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" }, @@ -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, @@ -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, diff --git a/check-plugins/apache-httpd-status/icingaweb2-module-director/apache-httpd-status.json b/check-plugins/apache-httpd-status/icingaweb2-module-director/apache-httpd-status.json index c95c71acc..10175ad2d 100644 --- a/check-plugins/apache-httpd-status/icingaweb2-module-director/apache-httpd-status.json +++ b/check-plugins/apache-httpd-status/icingaweb2-module-director/apache-httpd-status.json @@ -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, diff --git a/check-plugins/apache-httpd-status/icingaweb2-module-director/apache-httpd-status.yml b/check-plugins/apache-httpd-status/icingaweb2-module-director/apache-httpd-status.yml index 735c7a5f4..ac7a695ee 100644 --- a/check-plugins/apache-httpd-status/icingaweb2-module-director/apache-httpd-status.yml +++ b/check-plugins/apache-httpd-status/icingaweb2-module-director/apache-httpd-status.yml @@ -5,4 +5,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-apache-httpd-status"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-apache-httpd-status"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/axenita-stats/icingaweb2-module-director/axenita-stats.json b/check-plugins/axenita-stats/icingaweb2-module-director/axenita-stats.json index 3b7e7832c..947389b22 100644 --- a/check-plugins/axenita-stats/icingaweb2-module-director/axenita-stats.json +++ b/check-plugins/axenita-stats/icingaweb2-module-director/axenita-stats.json @@ -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, diff --git a/check-plugins/axenita-stats/icingaweb2-module-director/axenita-stats.yml b/check-plugins/axenita-stats/icingaweb2-module-director/axenita-stats.yml index d9d8ad782..2d2589687 100644 --- a/check-plugins/axenita-stats/icingaweb2-module-director/axenita-stats.yml +++ b/check-plugins/axenita-stats/icingaweb2-module-director/axenita-stats.yml @@ -5,4 +5,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-axenita-stats"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-axenita-stats"]["vars"]["criticality"]': 'B' diff --git a/check-plugins/by-ssh/icingaweb2-module-director/by-ssh.json b/check-plugins/by-ssh/icingaweb2-module-director/by-ssh.json index b0bc27050..78f28f26e 100644 --- a/check-plugins/by-ssh/icingaweb2-module-director/by-ssh.json +++ b/check-plugins/by-ssh/icingaweb2-module-director/by-ssh.json @@ -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": [], diff --git a/check-plugins/by-ssh/icingaweb2-module-director/by-ssh.yml b/check-plugins/by-ssh/icingaweb2-module-director/by-ssh.yml index ef1ffc1ac..5960f31c1 100644 --- a/check-plugins/by-ssh/icingaweb2-module-director/by-ssh.yml +++ b/check-plugins/by-ssh/icingaweb2-module-director/by-ssh.yml @@ -1,3 +1,2 @@ overwrites: '["ServiceTemplate"]["tpl-service-by-ssh"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-by-ssh"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/cometsystem/icingaweb2-module-director/cometsystem.json b/check-plugins/cometsystem/icingaweb2-module-director/cometsystem.json index 1405df0c7..14678f48d 100644 --- a/check-plugins/cometsystem/icingaweb2-module-director/cometsystem.json +++ b/check-plugins/cometsystem/icingaweb2-module-director/cometsystem.json @@ -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, diff --git a/check-plugins/cometsystem/icingaweb2-module-director/cometsystem.yml b/check-plugins/cometsystem/icingaweb2-module-director/cometsystem.yml index 88146e0d7..9f83fd810 100644 --- a/check-plugins/cometsystem/icingaweb2-module-director/cometsystem.yml +++ b/check-plugins/cometsystem/icingaweb2-module-director/cometsystem.yml @@ -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' diff --git a/check-plugins/csv-values/icingaweb2-module-director/csv-values.json b/check-plugins/csv-values/icingaweb2-module-director/csv-values.json index a82df8051..8f826b346 100644 --- a/check-plugins/csv-values/icingaweb2-module-director/csv-values.json +++ b/check-plugins/csv-values/icingaweb2-module-director/csv-values.json @@ -380,7 +380,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "csv_values_always_ok": false, "csv_values_chunksize": 1000, "csv_values_delimiter": ",", diff --git a/check-plugins/csv-values/icingaweb2-module-director/csv-values.yml b/check-plugins/csv-values/icingaweb2-module-director/csv-values.yml index 6ece32d77..3ee153ed6 100644 --- a/check-plugins/csv-values/icingaweb2-module-director/csv-values.yml +++ b/check-plugins/csv-values/icingaweb2-module-director/csv-values.yml @@ -8,4 +8,3 @@ overwrites: '["Command"]["cmd-check-csv-values"]["timeout"]': 30 '["ServiceTemplate"]["tpl-service-csv-values"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-csv-values"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-csv-values"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/dhcp-relayed/icingaweb2-module-director/dhcp-relayed.json b/check-plugins/dhcp-relayed/icingaweb2-module-director/dhcp-relayed.json index 5ed644e41..a93054e9e 100644 --- a/check-plugins/dhcp-relayed/icingaweb2-module-director/dhcp-relayed.json +++ b/check-plugins/dhcp-relayed/icingaweb2-module-director/dhcp-relayed.json @@ -188,7 +188,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "dhcp_relayed_always_ok": false, "dhcp_relayed_timeout": 7 }, @@ -235,7 +235,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "dhcp_relayed_windows_always_ok": false, "dhcp_relayed_windows_timeout": 7 }, diff --git a/check-plugins/dhcp-relayed/icingaweb2-module-director/dhcp-relayed.yml b/check-plugins/dhcp-relayed/icingaweb2-module-director/dhcp-relayed.yml index 4b154f70f..e4a43c0d9 100644 --- a/check-plugins/dhcp-relayed/icingaweb2-module-director/dhcp-relayed.yml +++ b/check-plugins/dhcp-relayed/icingaweb2-module-director/dhcp-relayed.yml @@ -9,9 +9,7 @@ overwrites: '["ServiceTemplate"]["tpl-service-dhcp-relayed"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-dhcp-relayed"]["enable_perfdata"]': false '["ServiceTemplate"]["tpl-service-dhcp-relayed"]["retry_interval"]': 30 - '["ServiceTemplate"]["tpl-service-dhcp-relayed"]["vars"]["criticality"]': 'A' '["ServiceTemplate"]["tpl-service-dhcp-relayed-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-dhcp-relayed-windows"]["enable_perfdata"]': false '["ServiceTemplate"]["tpl-service-dhcp-relayed-windows"]["retry_interval"]': 30 - '["ServiceTemplate"]["tpl-service-dhcp-relayed-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/disk-usage/icingaweb2-module-director/disk-usage.json b/check-plugins/disk-usage/icingaweb2-module-director/disk-usage.json index db57ea8b3..5da4ca8c1 100644 --- a/check-plugins/disk-usage/icingaweb2-module-director/disk-usage.json +++ b/check-plugins/disk-usage/icingaweb2-module-director/disk-usage.json @@ -230,7 +230,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "disk_usage_always_ok": false, "disk_usage_critical": "95%USED", "disk_usage_exclude_pattern": [], @@ -283,7 +283,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "disk_usage_windows_always_ok": false, "disk_usage_windows_critical": "95%USED", "disk_usage_windows_exclude_pattern": [], diff --git a/check-plugins/disk-usage/icingaweb2-module-director/disk-usage.yml b/check-plugins/disk-usage/icingaweb2-module-director/disk-usage.yml index 829f1b8e3..5644a09b9 100644 --- a/check-plugins/disk-usage/icingaweb2-module-director/disk-usage.yml +++ b/check-plugins/disk-usage/icingaweb2-module-director/disk-usage.yml @@ -8,9 +8,7 @@ overwrites: '["ServiceTemplate"]["tpl-service-disk-usage"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-disk-usage"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-disk-usage"]["retry_interval"]': 30 - '["ServiceTemplate"]["tpl-service-disk-usage"]["vars"]["criticality"]': 'A' '["ServiceTemplate"]["tpl-service-disk-usage-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-disk-usage-windows"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-disk-usage-windows"]["retry_interval"]': 30 - '["ServiceTemplate"]["tpl-service-disk-usage-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/dns/icingaweb2-module-director/dns.json b/check-plugins/dns/icingaweb2-module-director/dns.json index 36ef760aa..779ee362a 100644 --- a/check-plugins/dns/icingaweb2-module-director/dns.json +++ b/check-plugins/dns/icingaweb2-module-director/dns.json @@ -188,7 +188,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "dns_always_ok": false, "dns_hostname": "localhost", "dns_port": 53 diff --git a/check-plugins/dns/icingaweb2-module-director/dns.yml b/check-plugins/dns/icingaweb2-module-director/dns.yml index edc209a73..91303fec4 100644 --- a/check-plugins/dns/icingaweb2-module-director/dns.yml +++ b/check-plugins/dns/icingaweb2-module-director/dns.yml @@ -7,4 +7,3 @@ overwrites: '["ServiceTemplate"]["tpl-service-dns"]["check_interval"]': 900 '["ServiceTemplate"]["tpl-service-dns"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-dns"]["retry_interval"]': 180 - '["ServiceTemplate"]["tpl-service-dns"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/fortios-ha-stats/icingaweb2-module-director/fortios-ha-stats.json b/check-plugins/fortios-ha-stats/icingaweb2-module-director/fortios-ha-stats.json index c283968af..6aca14cf9 100644 --- a/check-plugins/fortios-ha-stats/icingaweb2-module-director/fortios-ha-stats.json +++ b/check-plugins/fortios-ha-stats/icingaweb2-module-director/fortios-ha-stats.json @@ -204,7 +204,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "fortios_ha_stats_always_ok": false, "fortios_ha_stats_count": 2, "fortios_ha_stats_insecure": false, @@ -254,7 +254,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "fortios_ha_stats_windows_always_ok": false, "fortios_ha_stats_windows_count": 2, "fortios_ha_stats_windows_insecure": false, diff --git a/check-plugins/fortios-ha-stats/icingaweb2-module-director/fortios-ha-stats.yml b/check-plugins/fortios-ha-stats/icingaweb2-module-director/fortios-ha-stats.yml index e585aa24d..f259cce08 100644 --- a/check-plugins/fortios-ha-stats/icingaweb2-module-director/fortios-ha-stats.yml +++ b/check-plugins/fortios-ha-stats/icingaweb2-module-director/fortios-ha-stats.yml @@ -6,3 +6,6 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-fortios-ha-stats"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-fortios-ha-stats"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-fortios-ha-stats"]["vars"]["criticality"]': 'A' + + '["ServiceTemplate"]["tpl-service-fortios-ha-stats-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/fortios-sensor/icingaweb2-module-director/fortios-sensor.json b/check-plugins/fortios-sensor/icingaweb2-module-director/fortios-sensor.json index c1eb2134e..181fe99f0 100644 --- a/check-plugins/fortios-sensor/icingaweb2-module-director/fortios-sensor.json +++ b/check-plugins/fortios-sensor/icingaweb2-module-director/fortios-sensor.json @@ -188,7 +188,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "fortios_sensor_always_ok": false, "fortios_sensor_insecure": false, "fortios_sensor_no_proxy": false, @@ -237,7 +237,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "fortios_sensor_windows_always_ok": false, "fortios_sensor_windows_insecure": false, "fortios_sensor_windows_no_proxy": false, diff --git a/check-plugins/fortios-sensor/icingaweb2-module-director/fortios-sensor.yml b/check-plugins/fortios-sensor/icingaweb2-module-director/fortios-sensor.yml index 1531dc784..8a00f260c 100644 --- a/check-plugins/fortios-sensor/icingaweb2-module-director/fortios-sensor.yml +++ b/check-plugins/fortios-sensor/icingaweb2-module-director/fortios-sensor.yml @@ -8,3 +8,6 @@ overwrites: '["ServiceTemplate"]["tpl-service-fortios-sensor"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-fortios-sensor"]["retry_interval"]': 180 '["ServiceTemplate"]["tpl-service-fortios-sensor"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-fortios-sensor"]["vars"]["criticality"]': 'A' + + '["ServiceTemplate"]["tpl-service-fortios-sensor-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/fs-inodes/icingaweb2-module-director/fs-inodes.json b/check-plugins/fs-inodes/icingaweb2-module-director/fs-inodes.json index b3056bae6..69550cdb7 100644 --- a/check-plugins/fs-inodes/icingaweb2-module-director/fs-inodes.json +++ b/check-plugins/fs-inodes/icingaweb2-module-director/fs-inodes.json @@ -90,7 +90,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "fs_inodes_always_ok": false, "fs_inodes_critical": 95, "fs_inodes_mount": "/, /tmp, /boot", diff --git a/check-plugins/fs-inodes/icingaweb2-module-director/fs-inodes.yml b/check-plugins/fs-inodes/icingaweb2-module-director/fs-inodes.yml index 4bfad1a49..9152f93da 100644 --- a/check-plugins/fs-inodes/icingaweb2-module-director/fs-inodes.yml +++ b/check-plugins/fs-inodes/icingaweb2-module-director/fs-inodes.yml @@ -1,4 +1,3 @@ --- overwrites: '["ServiceTemplate"]["tpl-service-fs-inodes"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-fs-inodes"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/haproxy-status/icingaweb2-module-director/haproxy-status.json b/check-plugins/haproxy-status/icingaweb2-module-director/haproxy-status.json index 33a350148..29b2a12a1 100644 --- a/check-plugins/haproxy-status/icingaweb2-module-director/haproxy-status.json +++ b/check-plugins/haproxy-status/icingaweb2-module-director/haproxy-status.json @@ -252,7 +252,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "haproxy_status_always_ok": false, "haproxy_status_critical": 95, "haproxy_status_insecure": false, diff --git a/check-plugins/haproxy-status/icingaweb2-module-director/haproxy-status.yml b/check-plugins/haproxy-status/icingaweb2-module-director/haproxy-status.yml index 36295fca6..815fbef93 100644 --- a/check-plugins/haproxy-status/icingaweb2-module-director/haproxy-status.yml +++ b/check-plugins/haproxy-status/icingaweb2-module-director/haproxy-status.yml @@ -5,4 +5,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-haproxy-status"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-haproxy-status"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/huawei-dorado-backup-power/icingaweb2-module-director/huawei-dorado-backup-power.json b/check-plugins/huawei-dorado-backup-power/icingaweb2-module-director/huawei-dorado-backup-power.json index 884c413e4..117286080 100644 --- a/check-plugins/huawei-dorado-backup-power/icingaweb2-module-director/huawei-dorado-backup-power.json +++ b/check-plugins/huawei-dorado-backup-power/icingaweb2-module-director/huawei-dorado-backup-power.json @@ -252,7 +252,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_backup_power_always_ok": false, "huawei_dorado_backup_power_cache_expire": 15, "huawei_dorado_backup_power_insecure": true, @@ -303,7 +303,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_backup_power_windows_always_ok": false, "huawei_dorado_backup_power_windows_cache_expire": 15, "huawei_dorado_backup_power_windows_insecure": true, diff --git a/check-plugins/huawei-dorado-backup-power/icingaweb2-module-director/huawei-dorado-backup-power.yml b/check-plugins/huawei-dorado-backup-power/icingaweb2-module-director/huawei-dorado-backup-power.yml index 83903a70c..54772a55f 100644 --- a/check-plugins/huawei-dorado-backup-power/icingaweb2-module-director/huawei-dorado-backup-power.yml +++ b/check-plugins/huawei-dorado-backup-power/icingaweb2-module-director/huawei-dorado-backup-power.yml @@ -6,6 +6,9 @@ overwrites: '["ServiceTemplate"]["tpl-service-huawei-dorado-backup-power"]["check_interval"]': 900 '["ServiceTemplate"]["tpl-service-huawei-dorado-backup-power"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-backup-power"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-backup-power"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-huawei-dorado-backup-power-windows"]["check_interval"]': 900 '["ServiceTemplate"]["tpl-service-huawei-dorado-backup-power-windows"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-backup-power-windows"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-backup-power-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/huawei-dorado-controller/icingaweb2-module-director/huawei-dorado-controller.yml b/check-plugins/huawei-dorado-controller/icingaweb2-module-director/huawei-dorado-controller.yml index f274aaed2..360c60e19 100644 --- a/check-plugins/huawei-dorado-controller/icingaweb2-module-director/huawei-dorado-controller.yml +++ b/check-plugins/huawei-dorado-controller/icingaweb2-module-director/huawei-dorado-controller.yml @@ -7,6 +7,7 @@ overwrites: '["ServiceTemplate"]["tpl-service-huawei-dorado-controller"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-controller"]["use_agent"]': false '["ServiceTemplate"]["tpl-service-huawei-dorado-controller"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-huawei-dorado-controller-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-controller-windows"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-controller-windows"]["use_agent"]': false diff --git a/check-plugins/huawei-dorado-disk/icingaweb2-module-director/huawei-dorado-disk.yml b/check-plugins/huawei-dorado-disk/icingaweb2-module-director/huawei-dorado-disk.yml index 41dd6d1d7..5b387e7c2 100644 --- a/check-plugins/huawei-dorado-disk/icingaweb2-module-director/huawei-dorado-disk.yml +++ b/check-plugins/huawei-dorado-disk/icingaweb2-module-director/huawei-dorado-disk.yml @@ -7,6 +7,7 @@ overwrites: '["ServiceTemplate"]["tpl-service-huawei-dorado-disk"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-disk"]["use_agent"]': false '["ServiceTemplate"]["tpl-service-huawei-dorado-disk"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-huawei-dorado-disk-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-disk-windows"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-disk-windows"]["use_agent"]': false diff --git a/check-plugins/huawei-dorado-enclosure/icingaweb2-module-director/huawei-dorado-enclosure.json b/check-plugins/huawei-dorado-enclosure/icingaweb2-module-director/huawei-dorado-enclosure.json index 8c4835502..f12e8f101 100644 --- a/check-plugins/huawei-dorado-enclosure/icingaweb2-module-director/huawei-dorado-enclosure.json +++ b/check-plugins/huawei-dorado-enclosure/icingaweb2-module-director/huawei-dorado-enclosure.json @@ -252,7 +252,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_enclosure_always_ok": false, "huawei_dorado_enclosure_cache_expire": 15, "huawei_dorado_enclosure_insecure": true, @@ -303,7 +303,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_enclosure_windows_always_ok": false, "huawei_dorado_enclosure_windows_cache_expire": 15, "huawei_dorado_enclosure_windows_insecure": true, diff --git a/check-plugins/huawei-dorado-enclosure/icingaweb2-module-director/huawei-dorado-enclosure.yml b/check-plugins/huawei-dorado-enclosure/icingaweb2-module-director/huawei-dorado-enclosure.yml index 10d92b125..541ddbeed 100644 --- a/check-plugins/huawei-dorado-enclosure/icingaweb2-module-director/huawei-dorado-enclosure.yml +++ b/check-plugins/huawei-dorado-enclosure/icingaweb2-module-director/huawei-dorado-enclosure.yml @@ -6,6 +6,9 @@ overwrites: '["ServiceTemplate"]["tpl-service-huawei-dorado-enclosure"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-enclosure"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-enclosure"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-enclosure"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-huawei-dorado-enclosure-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-enclosure-windows"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-enclosure-windows"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-enclosure-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/huawei-dorado-fan/icingaweb2-module-director/huawei-dorado-fan.json b/check-plugins/huawei-dorado-fan/icingaweb2-module-director/huawei-dorado-fan.json index 8ed238a94..479bb51ee 100644 --- a/check-plugins/huawei-dorado-fan/icingaweb2-module-director/huawei-dorado-fan.json +++ b/check-plugins/huawei-dorado-fan/icingaweb2-module-director/huawei-dorado-fan.json @@ -252,7 +252,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_fan_always_ok": false, "huawei_dorado_fan_cache_expire": 15, "huawei_dorado_fan_insecure": true, @@ -303,7 +303,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_fan_windows_always_ok": false, "huawei_dorado_fan_windows_cache_expire": 15, "huawei_dorado_fan_windows_insecure": true, diff --git a/check-plugins/huawei-dorado-fan/icingaweb2-module-director/huawei-dorado-fan.yml b/check-plugins/huawei-dorado-fan/icingaweb2-module-director/huawei-dorado-fan.yml index fefbdd4cb..0d69de095 100644 --- a/check-plugins/huawei-dorado-fan/icingaweb2-module-director/huawei-dorado-fan.yml +++ b/check-plugins/huawei-dorado-fan/icingaweb2-module-director/huawei-dorado-fan.yml @@ -6,6 +6,9 @@ overwrites: '["ServiceTemplate"]["tpl-service-huawei-dorado-fan"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-fan"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-fan"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-fan"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-huawei-dorado-fan-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-fan-windows"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-fan-windows"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-fan-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/huawei-dorado-host/icingaweb2-module-director/huawei-dorado-host.json b/check-plugins/huawei-dorado-host/icingaweb2-module-director/huawei-dorado-host.json index c0a631045..4ebd21be3 100644 --- a/check-plugins/huawei-dorado-host/icingaweb2-module-director/huawei-dorado-host.json +++ b/check-plugins/huawei-dorado-host/icingaweb2-module-director/huawei-dorado-host.json @@ -252,7 +252,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_host_always_ok": false, "huawei_dorado_host_cache_expire": 15, "huawei_dorado_host_insecure": true, @@ -303,7 +303,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_host_windows_always_ok": false, "huawei_dorado_host_windows_cache_expire": 15, "huawei_dorado_host_windows_insecure": true, diff --git a/check-plugins/huawei-dorado-host/icingaweb2-module-director/huawei-dorado-host.yml b/check-plugins/huawei-dorado-host/icingaweb2-module-director/huawei-dorado-host.yml index 54dae2cf3..c38671233 100644 --- a/check-plugins/huawei-dorado-host/icingaweb2-module-director/huawei-dorado-host.yml +++ b/check-plugins/huawei-dorado-host/icingaweb2-module-director/huawei-dorado-host.yml @@ -6,6 +6,9 @@ overwrites: '["ServiceTemplate"]["tpl-service-huawei-dorado-host"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-host"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-host"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-host"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-huawei-dorado-host-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-host-windows"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-host-windows"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-host-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/huawei-dorado-hypermetrodomain/icingaweb2-module-director/huawei-dorado-hypermetrodomain.json b/check-plugins/huawei-dorado-hypermetrodomain/icingaweb2-module-director/huawei-dorado-hypermetrodomain.json index df244643f..0e4812d50 100644 --- a/check-plugins/huawei-dorado-hypermetrodomain/icingaweb2-module-director/huawei-dorado-hypermetrodomain.json +++ b/check-plugins/huawei-dorado-hypermetrodomain/icingaweb2-module-director/huawei-dorado-hypermetrodomain.json @@ -252,7 +252,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_hypermetrodomain_always_ok": false, "huawei_dorado_hypermetrodomain_cache_expire": 15, "huawei_dorado_hypermetrodomain_insecure": true, @@ -303,7 +303,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_hypermetrodomain_windows_always_ok": false, "huawei_dorado_hypermetrodomain_windows_cache_expire": 15, "huawei_dorado_hypermetrodomain_windows_insecure": true, diff --git a/check-plugins/huawei-dorado-hypermetrodomain/icingaweb2-module-director/huawei-dorado-hypermetrodomain.yml b/check-plugins/huawei-dorado-hypermetrodomain/icingaweb2-module-director/huawei-dorado-hypermetrodomain.yml index 3ddcbc9da..d06a3e7b9 100644 --- a/check-plugins/huawei-dorado-hypermetrodomain/icingaweb2-module-director/huawei-dorado-hypermetrodomain.yml +++ b/check-plugins/huawei-dorado-hypermetrodomain/icingaweb2-module-director/huawei-dorado-hypermetrodomain.yml @@ -6,6 +6,9 @@ overwrites: '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetrodomain"]["check_interval"]': 900 '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetrodomain"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetrodomain"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetrodomain"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetrodomain-windows"]["check_interval"]': 900 '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetrodomain-windows"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetrodomain-windows"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetrodomain-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/huawei-dorado-hypermetropair/icingaweb2-module-director/huawei-dorado-hypermetropair.json b/check-plugins/huawei-dorado-hypermetropair/icingaweb2-module-director/huawei-dorado-hypermetropair.json index 79f0ac6b6..8a60edd8f 100644 --- a/check-plugins/huawei-dorado-hypermetropair/icingaweb2-module-director/huawei-dorado-hypermetropair.json +++ b/check-plugins/huawei-dorado-hypermetropair/icingaweb2-module-director/huawei-dorado-hypermetropair.json @@ -252,7 +252,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_hypermetropair_always_ok": false, "huawei_dorado_hypermetropair_cache_expire": 15, "huawei_dorado_hypermetropair_insecure": true, @@ -303,7 +303,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_hypermetropair_windows_always_ok": false, "huawei_dorado_hypermetropair_windows_cache_expire": 15, "huawei_dorado_hypermetropair_windows_insecure": true, diff --git a/check-plugins/huawei-dorado-hypermetropair/icingaweb2-module-director/huawei-dorado-hypermetropair.yml b/check-plugins/huawei-dorado-hypermetropair/icingaweb2-module-director/huawei-dorado-hypermetropair.yml index 90b78e6be..3413232c2 100644 --- a/check-plugins/huawei-dorado-hypermetropair/icingaweb2-module-director/huawei-dorado-hypermetropair.yml +++ b/check-plugins/huawei-dorado-hypermetropair/icingaweb2-module-director/huawei-dorado-hypermetropair.yml @@ -6,6 +6,9 @@ overwrites: '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetropair"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetropair"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetropair"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetropair"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetropair-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetropair-windows"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetropair-windows"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-hypermetropair-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/huawei-dorado-interface/icingaweb2-module-director/huawei-dorado-interface.json b/check-plugins/huawei-dorado-interface/icingaweb2-module-director/huawei-dorado-interface.json index 09fa3d116..edb1bb8a4 100644 --- a/check-plugins/huawei-dorado-interface/icingaweb2-module-director/huawei-dorado-interface.json +++ b/check-plugins/huawei-dorado-interface/icingaweb2-module-director/huawei-dorado-interface.json @@ -252,7 +252,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_interface_always_ok": false, "huawei_dorado_interface_cache_expire": 15, "huawei_dorado_interface_insecure": true, @@ -303,7 +303,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_interface_windows_always_ok": false, "huawei_dorado_interface_windows_cache_expire": 15, "huawei_dorado_interface_windows_insecure": true, diff --git a/check-plugins/huawei-dorado-interface/icingaweb2-module-director/huawei-dorado-interface.yml b/check-plugins/huawei-dorado-interface/icingaweb2-module-director/huawei-dorado-interface.yml index 8118b86de..8f3cf24cd 100644 --- a/check-plugins/huawei-dorado-interface/icingaweb2-module-director/huawei-dorado-interface.yml +++ b/check-plugins/huawei-dorado-interface/icingaweb2-module-director/huawei-dorado-interface.yml @@ -6,6 +6,9 @@ overwrites: '["ServiceTemplate"]["tpl-service-huawei-dorado-interface"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-interface"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-interface"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-interface"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-huawei-dorado-interface-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-interface-windows"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-interface-windows"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-interface-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/huawei-dorado-power/icingaweb2-module-director/huawei-dorado-power.yml b/check-plugins/huawei-dorado-power/icingaweb2-module-director/huawei-dorado-power.yml index 602676d36..ca8153750 100644 --- a/check-plugins/huawei-dorado-power/icingaweb2-module-director/huawei-dorado-power.yml +++ b/check-plugins/huawei-dorado-power/icingaweb2-module-director/huawei-dorado-power.yml @@ -7,6 +7,7 @@ overwrites: '["ServiceTemplate"]["tpl-service-huawei-dorado-power"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-power"]["use_agent"]': false '["ServiceTemplate"]["tpl-service-huawei-dorado-power"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-huawei-dorado-power-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-power-windows"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-power-windows"]["use_agent"]': false diff --git a/check-plugins/huawei-dorado-system/icingaweb2-module-director/huawei-dorado-system.json b/check-plugins/huawei-dorado-system/icingaweb2-module-director/huawei-dorado-system.json index 94de2d26b..30a850aff 100644 --- a/check-plugins/huawei-dorado-system/icingaweb2-module-director/huawei-dorado-system.json +++ b/check-plugins/huawei-dorado-system/icingaweb2-module-director/huawei-dorado-system.json @@ -284,7 +284,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_system_always_ok": false, "huawei_dorado_system_cache_expire": 15, "huawei_dorado_system_critical": 95, @@ -337,7 +337,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "huawei_dorado_system_windows_always_ok": false, "huawei_dorado_system_windows_cache_expire": 15, "huawei_dorado_system_windows_critical": 95, diff --git a/check-plugins/huawei-dorado-system/icingaweb2-module-director/huawei-dorado-system.yml b/check-plugins/huawei-dorado-system/icingaweb2-module-director/huawei-dorado-system.yml index deb3e8eaa..601601f0a 100644 --- a/check-plugins/huawei-dorado-system/icingaweb2-module-director/huawei-dorado-system.yml +++ b/check-plugins/huawei-dorado-system/icingaweb2-module-director/huawei-dorado-system.yml @@ -6,6 +6,9 @@ overwrites: '["ServiceTemplate"]["tpl-service-huawei-dorado-system"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-system"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-system"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-system"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-huawei-dorado-system-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-huawei-dorado-system-windows"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-huawei-dorado-system-windows"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-huawei-dorado-system-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/infomaniak-events/icingaweb2-module-director/infomaniak-events.json b/check-plugins/infomaniak-events/icingaweb2-module-director/infomaniak-events.json index 1d6262a49..e049a9ed0 100644 --- a/check-plugins/infomaniak-events/icingaweb2-module-director/infomaniak-events.json +++ b/check-plugins/infomaniak-events/icingaweb2-module-director/infomaniak-events.json @@ -208,7 +208,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "infomaniak_events_always_ok": false, "infomaniak_events_ignore_regex": [], "infomaniak_events_insecure": false, diff --git a/check-plugins/infomaniak-events/icingaweb2-module-director/infomaniak-events.yml b/check-plugins/infomaniak-events/icingaweb2-module-director/infomaniak-events.yml index 7609e6690..24a7643ee 100644 --- a/check-plugins/infomaniak-events/icingaweb2-module-director/infomaniak-events.yml +++ b/check-plugins/infomaniak-events/icingaweb2-module-director/infomaniak-events.yml @@ -5,4 +5,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-infomaniak-events"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-infomaniak-events"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/journald-query/icingaweb2-module-director/journald-query.json b/check-plugins/journald-query/icingaweb2-module-director/journald-query.json index a0135756d..c1208e60c 100644 --- a/check-plugins/journald-query/icingaweb2-module-director/journald-query.json +++ b/check-plugins/journald-query/icingaweb2-module-director/journald-query.json @@ -142,7 +142,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "journald_query_always_ok": false, "journald_query_ignore_pattern": [], "journald_query_ignore_regex": [], diff --git a/check-plugins/journald-query/icingaweb2-module-director/journald-query.yml b/check-plugins/journald-query/icingaweb2-module-director/journald-query.yml index bd9886b1e..11696308d 100644 --- a/check-plugins/journald-query/icingaweb2-module-director/journald-query.yml +++ b/check-plugins/journald-query/icingaweb2-module-director/journald-query.yml @@ -2,4 +2,3 @@ overwrites: '["Command"]["cmd-check-journald-query"]["command"]': '/usr/bin/sudo /usr/lib64/nagios/plugins/journald-query' '["ServiceTemplate"]["tpl-service-journald-query"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-journald-query"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/json-values/icingaweb2-module-director/json-values.json b/check-plugins/json-values/icingaweb2-module-director/json-values.json index 29019d5bf..9613f7ff3 100644 --- a/check-plugins/json-values/icingaweb2-module-director/json-values.json +++ b/check-plugins/json-values/icingaweb2-module-director/json-values.json @@ -268,7 +268,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "json_values_always_ok": false, "json_values_insecure": false, "json_values_message_key": "message", @@ -320,7 +320,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "json_values_windows_always_ok": false, "json_values_windows_insecure": false, "json_values_windows_message_key": "message", diff --git a/check-plugins/json-values/icingaweb2-module-director/json-values.yml b/check-plugins/json-values/icingaweb2-module-director/json-values.yml index a2909842d..789273301 100644 --- a/check-plugins/json-values/icingaweb2-module-director/json-values.yml +++ b/check-plugins/json-values/icingaweb2-module-director/json-values.yml @@ -5,7 +5,5 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-json-values"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-json-values"]["vars"]["criticality"]': 'A' '["ServiceTemplate"]["tpl-service-json-values-windows"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-json-values-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/kemp-services/icingaweb2-module-director/kemp-services.json b/check-plugins/kemp-services/icingaweb2-module-director/kemp-services.json index ace5ffde3..a18f1cff1 100644 --- a/check-plugins/kemp-services/icingaweb2-module-director/kemp-services.json +++ b/check-plugins/kemp-services/icingaweb2-module-director/kemp-services.json @@ -252,7 +252,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "kemp_services_always_ok": false, "kemp_services_insecure": false, "kemp_services_no_proxy": false, @@ -280,7 +280,7 @@ "enable_flapping": null, "enable_notifications": true, "enable_passive_checks": null, - "enable_perfdata": null, + "enable_perfdata": true, "event_command": null, "fields": [], "flapping_threshold_high": null, @@ -300,10 +300,10 @@ "retry_interval": 15, "service_set": null, "template_choice": null, - "use_agent": null, + "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "kemp_services_windows_always_ok": false, "kemp_services_windows_insecure": false, "kemp_services_windows_no_proxy": false, diff --git a/check-plugins/kemp-services/icingaweb2-module-director/kemp-services.yml b/check-plugins/kemp-services/icingaweb2-module-director/kemp-services.yml index 69ab9e2d7..492d625e4 100644 --- a/check-plugins/kemp-services/icingaweb2-module-director/kemp-services.yml +++ b/check-plugins/kemp-services/icingaweb2-module-director/kemp-services.yml @@ -6,3 +6,8 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-kemp-services"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-kemp-services"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-kemp-services"]["vars"]["criticality"]': 'A' + + '["ServiceTemplate"]["tpl-service-kemp-services-windows"]["enable_perfdata"]': true + '["ServiceTemplate"]["tpl-service-kemp-services-windows"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-kemp-services-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/librenms-alerts/icingaweb2-module-director/librenms-alerts.json b/check-plugins/librenms-alerts/icingaweb2-module-director/librenms-alerts.json index 6f6a2afb0..437897fb8 100644 --- a/check-plugins/librenms-alerts/icingaweb2-module-director/librenms-alerts.json +++ b/check-plugins/librenms-alerts/icingaweb2-module-director/librenms-alerts.json @@ -291,7 +291,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "librenms_alerts_windows_always_ok": false, "librenms_alerts_windows_defaults_file": "/var/spool/icinga2/.my.cnf", "librenms_alerts_windows_defaults_group": "client", diff --git a/check-plugins/librenms-alerts/icingaweb2-module-director/librenms-alerts.yml b/check-plugins/librenms-alerts/icingaweb2-module-director/librenms-alerts.yml index 2a12035e8..062a1fff6 100644 --- a/check-plugins/librenms-alerts/icingaweb2-module-director/librenms-alerts.yml +++ b/check-plugins/librenms-alerts/icingaweb2-module-director/librenms-alerts.yml @@ -6,3 +6,5 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-librenms-alerts"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-librenms-alerts"]["vars"]["criticality"]': 'A' + + '["ServiceTemplate"]["tpl-service-librenms-alerts-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/librenms-health/icingaweb2-module-director/librenms-health.json b/check-plugins/librenms-health/icingaweb2-module-director/librenms-health.json index 813d0e0a5..e6bdceb57 100644 --- a/check-plugins/librenms-health/icingaweb2-module-director/librenms-health.json +++ b/check-plugins/librenms-health/icingaweb2-module-director/librenms-health.json @@ -224,7 +224,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "librenms_health_always_ok": false, "librenms_health_defaults_file": "/var/spool/icinga2/.my.cnf", "librenms_health_defaults_group": "client", @@ -251,7 +251,7 @@ "enable_flapping": null, "enable_notifications": true, "enable_passive_checks": null, - "enable_perfdata": null, + "enable_perfdata": true, "event_command": null, "fields": [], "flapping_threshold_high": null, @@ -274,7 +274,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "librenms_health_windows_always_ok": false, "librenms_health_windows_defaults_file": "/var/spool/icinga2/.my.cnf", "librenms_health_windows_defaults_group": "client", diff --git a/check-plugins/librenms-health/icingaweb2-module-director/librenms-health.yml b/check-plugins/librenms-health/icingaweb2-module-director/librenms-health.yml index 7f245facb..28af7e0f9 100644 --- a/check-plugins/librenms-health/icingaweb2-module-director/librenms-health.yml +++ b/check-plugins/librenms-health/icingaweb2-module-director/librenms-health.yml @@ -5,3 +5,7 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-librenms-health"]["enable_perfdata"]': true + '["ServiceTemplate"]["tpl-service-librenms-health"]["vars"]["criticality"]': 'A' + + '["ServiceTemplate"]["tpl-service-librenms-health-windows"]["enable_perfdata"]': true + '["ServiceTemplate"]["tpl-service-librenms-health-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/load/icingaweb2-module-director/load.json b/check-plugins/load/icingaweb2-module-director/load.json index 4ee986fed..7bb63571b 100644 --- a/check-plugins/load/icingaweb2-module-director/load.json +++ b/check-plugins/load/icingaweb2-module-director/load.json @@ -82,7 +82,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "B", + "criticality": "C", "load_always_ok": false, "load_critical": 5.0, "load_warning": 1.15 diff --git a/check-plugins/load/icingaweb2-module-director/load.yml b/check-plugins/load/icingaweb2-module-director/load.yml index 9003a591e..42622b01d 100644 --- a/check-plugins/load/icingaweb2-module-director/load.yml +++ b/check-plugins/load/icingaweb2-module-director/load.yml @@ -1,4 +1,3 @@ --- overwrites: '["ServiceTemplate"]["tpl-service-load"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-load"]["vars"]["criticality"]': 'B' diff --git a/check-plugins/logfile/icingaweb2-module-director/logfile.json b/check-plugins/logfile/icingaweb2-module-director/logfile.json index 8ceff48c0..e467f9e57 100644 --- a/check-plugins/logfile/icingaweb2-module-director/logfile.json +++ b/check-plugins/logfile/icingaweb2-module-director/logfile.json @@ -441,7 +441,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "logfile_alarm_duration": 60, "logfile_always_ok": false, "logfile_critical": 1, @@ -547,7 +547,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "logfile_windows_alarm_duration": 60, "logfile_windows_always_ok": false, "logfile_windows_critical": 1, diff --git a/check-plugins/logfile/icingaweb2-module-director/logfile.yml b/check-plugins/logfile/icingaweb2-module-director/logfile.yml index 3063c398e..c2aebc9b3 100644 --- a/check-plugins/logfile/icingaweb2-module-director/logfile.yml +++ b/check-plugins/logfile/icingaweb2-module-director/logfile.yml @@ -6,9 +6,7 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-logfile"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-logfile"]["vars"]["criticality"]': 'A' '["ServiceTemplate"]["tpl-service-logfile"]["vars"]["logfile_icinga_service_name"]': '$__name$' '["ServiceTemplate"]["tpl-service-logfile-windows"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-logfile-windows"]["vars"]["criticality"]': 'A' '["ServiceTemplate"]["tpl-service-logfile-windows"]["vars"]["logfile_icinga_service_name"]': '$__name$' diff --git a/check-plugins/mailq/icingaweb2-module-director/mailq.json b/check-plugins/mailq/icingaweb2-module-director/mailq.json index 81cf06ff8..3b6ee0d96 100644 --- a/check-plugins/mailq/icingaweb2-module-director/mailq.json +++ b/check-plugins/mailq/icingaweb2-module-director/mailq.json @@ -82,7 +82,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "B", + "criticality": "C", "mailq_always_ok": false, "mailq_critical": 250, "mailq_warning": 2 diff --git a/check-plugins/mailq/icingaweb2-module-director/mailq.yml b/check-plugins/mailq/icingaweb2-module-director/mailq.yml index 8cbd998a5..21f559046 100644 --- a/check-plugins/mailq/icingaweb2-module-director/mailq.yml +++ b/check-plugins/mailq/icingaweb2-module-director/mailq.yml @@ -3,4 +3,3 @@ overwrites: '["ServiceTemplate"]["tpl-service-mailq"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-mailq"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-mailq"]["retry_interval"]': 30 - '["ServiceTemplate"]["tpl-service-mailq"]["vars"]["criticality"]': 'B' diff --git a/check-plugins/memory-usage/icingaweb2-module-director/memory-usage.json b/check-plugins/memory-usage/icingaweb2-module-director/memory-usage.json index 84bd2043c..f36328831 100644 --- a/check-plugins/memory-usage/icingaweb2-module-director/memory-usage.json +++ b/check-plugins/memory-usage/icingaweb2-module-director/memory-usage.json @@ -156,7 +156,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "memory_usage_always_ok": false, "memory_usage_critical": 95, "memory_usage_top": 5, @@ -205,7 +205,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "memory_usage_windows_always_ok": false, "memory_usage_windows_critical": 95, "memory_usage_windows_top": 5, diff --git a/check-plugins/memory-usage/icingaweb2-module-director/memory-usage.yml b/check-plugins/memory-usage/icingaweb2-module-director/memory-usage.yml index 304ffda79..bb94d8d1d 100644 --- a/check-plugins/memory-usage/icingaweb2-module-director/memory-usage.yml +++ b/check-plugins/memory-usage/icingaweb2-module-director/memory-usage.yml @@ -5,7 +5,5 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-memory-usage"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-memory-usage"]["vars"]["criticality"]': 'A' '["ServiceTemplate"]["tpl-service-memory-usage-windows"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-memory-usage-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/mysql-connections/icingaweb2-module-director/mysql-connections.json b/check-plugins/mysql-connections/icingaweb2-module-director/mysql-connections.json index 85e95bcdb..9955272e3 100644 --- a/check-plugins/mysql-connections/icingaweb2-module-director/mysql-connections.json +++ b/check-plugins/mysql-connections/icingaweb2-module-director/mysql-connections.json @@ -172,7 +172,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "mysql_connections_always_ok": false, "mysql_connections_defaults_file": "/var/spool/icinga2/.my.cnf", "mysql_connections_defaults_group": "client", diff --git a/check-plugins/mysql-connections/icingaweb2-module-director/mysql-connections.yml b/check-plugins/mysql-connections/icingaweb2-module-director/mysql-connections.yml index 004ae73d7..439767624 100644 --- a/check-plugins/mysql-connections/icingaweb2-module-director/mysql-connections.yml +++ b/check-plugins/mysql-connections/icingaweb2-module-director/mysql-connections.yml @@ -6,4 +6,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-mysql-connections"]["check_interval"]': 60 '["ServiceTemplate"]["tpl-service-mysql-connections"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-mysql-connections"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/mysql-memory/icingaweb2-module-director/mysql-memory.json b/check-plugins/mysql-memory/icingaweb2-module-director/mysql-memory.json index 4e06de4c9..90bd4a9f2 100644 --- a/check-plugins/mysql-memory/icingaweb2-module-director/mysql-memory.json +++ b/check-plugins/mysql-memory/icingaweb2-module-director/mysql-memory.json @@ -156,7 +156,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "mysql_memory_always_ok": false, "mysql_memory_defaults_file": "/var/spool/icinga2/.my.cnf", "mysql_memory_defaults_group": "client", diff --git a/check-plugins/mysql-memory/icingaweb2-module-director/mysql-memory.yml b/check-plugins/mysql-memory/icingaweb2-module-director/mysql-memory.yml index 4fb0231a0..f202bc695 100644 --- a/check-plugins/mysql-memory/icingaweb2-module-director/mysql-memory.yml +++ b/check-plugins/mysql-memory/icingaweb2-module-director/mysql-memory.yml @@ -6,4 +6,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-mysql-memory"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-mysql-memory"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-mysql-memory"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/mysql-replica-status/icingaweb2-module-director/mysql-replica-status.json b/check-plugins/mysql-replica-status/icingaweb2-module-director/mysql-replica-status.json index be73d91cc..75591419e 100644 --- a/check-plugins/mysql-replica-status/icingaweb2-module-director/mysql-replica-status.json +++ b/check-plugins/mysql-replica-status/icingaweb2-module-director/mysql-replica-status.json @@ -172,7 +172,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "mysql_replica_status_always_ok": false, "mysql_replica_status_defaults_file": "/var/spool/icinga2/.my.cnf", "mysql_replica_status_defaults_group": "client", diff --git a/check-plugins/mysql-replica-status/icingaweb2-module-director/mysql-replica-status.yml b/check-plugins/mysql-replica-status/icingaweb2-module-director/mysql-replica-status.yml index bd7b8e4a6..c59b4bfd9 100644 --- a/check-plugins/mysql-replica-status/icingaweb2-module-director/mysql-replica-status.yml +++ b/check-plugins/mysql-replica-status/icingaweb2-module-director/mysql-replica-status.yml @@ -6,4 +6,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-mysql-replica-status"]["check_interval"]': 60 '["ServiceTemplate"]["tpl-service-mysql-replica-status"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-mysql-replica-status"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/mysql-system/icingaweb2-module-director/mysql-system.json b/check-plugins/mysql-system/icingaweb2-module-director/mysql-system.json index 8c7e57906..65a6514f3 100644 --- a/check-plugins/mysql-system/icingaweb2-module-director/mysql-system.json +++ b/check-plugins/mysql-system/icingaweb2-module-director/mysql-system.json @@ -124,7 +124,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "mysql_system_always_ok": false, "mysql_system_maxportsallowed": 0 }, diff --git a/check-plugins/mysql-system/icingaweb2-module-director/mysql-system.yml b/check-plugins/mysql-system/icingaweb2-module-director/mysql-system.yml index e97f260a3..b2056a9f0 100644 --- a/check-plugins/mysql-system/icingaweb2-module-director/mysql-system.yml +++ b/check-plugins/mysql-system/icingaweb2-module-director/mysql-system.yml @@ -6,4 +6,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-mysql-system"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-mysql-system"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-mysql-system"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/network-bonding/icingaweb2-module-director/network-bonding.json b/check-plugins/network-bonding/icingaweb2-module-director/network-bonding.json index cbc6c9208..cbc9a258e 100644 --- a/check-plugins/network-bonding/icingaweb2-module-director/network-bonding.json +++ b/check-plugins/network-bonding/icingaweb2-module-director/network-bonding.json @@ -66,7 +66,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "network_bonding_always_ok": false }, "volatile": null, diff --git a/check-plugins/network-bonding/icingaweb2-module-director/network-bonding.yml b/check-plugins/network-bonding/icingaweb2-module-director/network-bonding.yml index 02e62c9ec..b85f14d4d 100644 --- a/check-plugins/network-bonding/icingaweb2-module-director/network-bonding.yml +++ b/check-plugins/network-bonding/icingaweb2-module-director/network-bonding.yml @@ -2,3 +2,4 @@ overwrites: '["Command"]["cmd-check-network-bonding"]["command"]': '/usr/bin/sudo /usr/lib64/nagios/plugins/network-bonding' '["ServiceTemplate"]["tpl-service-network-bonding"]["enable_perfdata"]': true + '["ServiceTemplate"]["tpl-service-network-bonding"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/network-port-tcp/icingaweb2-module-director/network-port-tcp.json b/check-plugins/network-port-tcp/icingaweb2-module-director/network-port-tcp.json index 51ee5b34c..57e72333b 100644 --- a/check-plugins/network-port-tcp/icingaweb2-module-director/network-port-tcp.json +++ b/check-plugins/network-port-tcp/icingaweb2-module-director/network-port-tcp.json @@ -188,7 +188,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "network_port_tcp_hostname": "localhost", "network_port_tcp_port": 22, "network_port_tcp_severity": "warn", diff --git a/check-plugins/network-port-tcp/icingaweb2-module-director/network-port-tcp.yml b/check-plugins/network-port-tcp/icingaweb2-module-director/network-port-tcp.yml index 53acf6fd4..c0e0b8e8a 100644 --- a/check-plugins/network-port-tcp/icingaweb2-module-director/network-port-tcp.yml +++ b/check-plugins/network-port-tcp/icingaweb2-module-director/network-port-tcp.yml @@ -3,6 +3,3 @@ variants: - linux - no-agent - windows - -overwrites: - '["ServiceTemplate"]["tpl-service-network-port-tcp"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/nginx-status/icingaweb2-module-director/nginx-status.json b/check-plugins/nginx-status/icingaweb2-module-director/nginx-status.json index 16918c08f..e7d3fa7ee 100644 --- a/check-plugins/nginx-status/icingaweb2-module-director/nginx-status.json +++ b/check-plugins/nginx-status/icingaweb2-module-director/nginx-status.json @@ -204,7 +204,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "nginx_status_always_ok": false, "nginx_status_critical": 486, "nginx_status_insecure": false, diff --git a/check-plugins/nginx-status/icingaweb2-module-director/nginx-status.yml b/check-plugins/nginx-status/icingaweb2-module-director/nginx-status.yml index 56d495837..fb5f4a550 100644 --- a/check-plugins/nginx-status/icingaweb2-module-director/nginx-status.yml +++ b/check-plugins/nginx-status/icingaweb2-module-director/nginx-status.yml @@ -5,4 +5,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-nginx-status"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-nginx-status"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/nodebb-database/icingaweb2-module-director/nodebb-database.json b/check-plugins/nodebb-database/icingaweb2-module-director/nodebb-database.json index 138603408..d5f514ad9 100644 --- a/check-plugins/nodebb-database/icingaweb2-module-director/nodebb-database.json +++ b/check-plugins/nodebb-database/icingaweb2-module-director/nodebb-database.json @@ -236,7 +236,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "nodebb_database_always_ok": false, "nodebb_database_critical": 95, "nodebb_database_insecure": false, diff --git a/check-plugins/nodebb-database/icingaweb2-module-director/nodebb-database.yml b/check-plugins/nodebb-database/icingaweb2-module-director/nodebb-database.yml index 9a446a344..febce06a1 100644 --- a/check-plugins/nodebb-database/icingaweb2-module-director/nodebb-database.yml +++ b/check-plugins/nodebb-database/icingaweb2-module-director/nodebb-database.yml @@ -5,4 +5,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-nodebb-database"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-nodebb-database"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/nodebb-errors/icingaweb2-module-director/nodebb-errors.json b/check-plugins/nodebb-errors/icingaweb2-module-director/nodebb-errors.json index 0c8da3a8f..e53240daf 100644 --- a/check-plugins/nodebb-errors/icingaweb2-module-director/nodebb-errors.json +++ b/check-plugins/nodebb-errors/icingaweb2-module-director/nodebb-errors.json @@ -204,7 +204,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "nodebb_errors_always_ok": false, "nodebb_errors_insecure": false, "nodebb_errors_no_proxy": false, diff --git a/check-plugins/nodebb-errors/icingaweb2-module-director/nodebb-errors.yml b/check-plugins/nodebb-errors/icingaweb2-module-director/nodebb-errors.yml index b6e3b5d68..a20b34df7 100644 --- a/check-plugins/nodebb-errors/icingaweb2-module-director/nodebb-errors.yml +++ b/check-plugins/nodebb-errors/icingaweb2-module-director/nodebb-errors.yml @@ -5,4 +5,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-nodebb-errors"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-nodebb-errors"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/ntp-chronyd/icingaweb2-module-director/ntp-chronyd.json b/check-plugins/ntp-chronyd/icingaweb2-module-director/ntp-chronyd.json index 213c86101..e3baf8952 100644 --- a/check-plugins/ntp-chronyd/icingaweb2-module-director/ntp-chronyd.json +++ b/check-plugins/ntp-chronyd/icingaweb2-module-director/ntp-chronyd.json @@ -74,7 +74,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "B", + "criticality": "C", "ntp_chronyd_critical": 86400000, "ntp_chronyd_warning": 800 }, diff --git a/check-plugins/ntp-chronyd/icingaweb2-module-director/ntp-chronyd.yml b/check-plugins/ntp-chronyd/icingaweb2-module-director/ntp-chronyd.yml index bc2c7d5d5..389362663 100644 --- a/check-plugins/ntp-chronyd/icingaweb2-module-director/ntp-chronyd.yml +++ b/check-plugins/ntp-chronyd/icingaweb2-module-director/ntp-chronyd.yml @@ -1,4 +1,3 @@ --- overwrites: '["ServiceTemplate"]["tpl-service-ntp-chronyd"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-ntp-chronyd"]["vars"]["criticality"]': 'B' diff --git a/check-plugins/ntp-ntpd/icingaweb2-module-director/ntp-ntpd.json b/check-plugins/ntp-ntpd/icingaweb2-module-director/ntp-ntpd.json index ee25f5fe6..674796dd6 100644 --- a/check-plugins/ntp-ntpd/icingaweb2-module-director/ntp-ntpd.json +++ b/check-plugins/ntp-ntpd/icingaweb2-module-director/ntp-ntpd.json @@ -74,7 +74,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "B", + "criticality": "C", "ntp_ntpd_critical": 86400000, "ntp_ntpd_warning": 800 }, diff --git a/check-plugins/ntp-ntpd/icingaweb2-module-director/ntp-ntpd.yml b/check-plugins/ntp-ntpd/icingaweb2-module-director/ntp-ntpd.yml index c3a9e9c99..7ba9df191 100644 --- a/check-plugins/ntp-ntpd/icingaweb2-module-director/ntp-ntpd.yml +++ b/check-plugins/ntp-ntpd/icingaweb2-module-director/ntp-ntpd.yml @@ -1,4 +1,3 @@ --- overwrites: '["ServiceTemplate"]["tpl-service-ntp-ntpd"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-ntp-ntpd"]["vars"]["criticality"]': 'B' diff --git a/check-plugins/ntp-systemd-timesyncd/icingaweb2-module-director/ntp-systemd-timesyncd.yml b/check-plugins/ntp-systemd-timesyncd/icingaweb2-module-director/ntp-systemd-timesyncd.yml index 5875676e8..361883ef1 100644 --- a/check-plugins/ntp-systemd-timesyncd/icingaweb2-module-director/ntp-systemd-timesyncd.yml +++ b/check-plugins/ntp-systemd-timesyncd/icingaweb2-module-director/ntp-systemd-timesyncd.yml @@ -1,4 +1,3 @@ --- overwrites: '["ServiceTemplate"]["tpl-service-systemd-timesyncd"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-systemd-timesyncd"]["vars"]["criticality"]': 'B' diff --git a/check-plugins/ntp-w32tm/icingaweb2-module-director/ntp-w32tm.json b/check-plugins/ntp-w32tm/icingaweb2-module-director/ntp-w32tm.json index 6ee22aee9..0b14b68a8 100644 --- a/check-plugins/ntp-w32tm/icingaweb2-module-director/ntp-w32tm.json +++ b/check-plugins/ntp-w32tm/icingaweb2-module-director/ntp-w32tm.json @@ -91,7 +91,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "B", + "criticality": "C", "ntp_w32tm_windows_critical": 129600, "ntp_w32tm_windows_warning": 28800 }, diff --git a/check-plugins/ntp-w32tm/icingaweb2-module-director/ntp-w32tm.yml b/check-plugins/ntp-w32tm/icingaweb2-module-director/ntp-w32tm.yml index e97e9e67b..4d493150f 100644 --- a/check-plugins/ntp-w32tm/icingaweb2-module-director/ntp-w32tm.yml +++ b/check-plugins/ntp-w32tm/icingaweb2-module-director/ntp-w32tm.yml @@ -4,4 +4,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-ntp-w32tm-windows"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-ntp-w32tm-windows"]["vars"]["criticality"]': 'B' diff --git a/check-plugins/openstack-swift-stat/icingaweb2-module-director/openstack-swift-stat.json b/check-plugins/openstack-swift-stat/icingaweb2-module-director/openstack-swift-stat.json index e06aee595..91b0e8c60 100644 --- a/check-plugins/openstack-swift-stat/icingaweb2-module-director/openstack-swift-stat.json +++ b/check-plugins/openstack-swift-stat/icingaweb2-module-director/openstack-swift-stat.json @@ -90,7 +90,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "openstack_swift_stat_always_ok": false, "openstack_swift_stat_critical": 10, "openstack_swift_stat_rc_file": "/var/spool/icinga2/.openstack.cnf", diff --git a/check-plugins/openstack-swift-stat/icingaweb2-module-director/openstack-swift-stat.yml b/check-plugins/openstack-swift-stat/icingaweb2-module-director/openstack-swift-stat.yml index 71a98b91b..7e91c94e4 100644 --- a/check-plugins/openstack-swift-stat/icingaweb2-module-director/openstack-swift-stat.yml +++ b/check-plugins/openstack-swift-stat/icingaweb2-module-director/openstack-swift-stat.yml @@ -7,4 +7,3 @@ overwrites: '["ServiceTemplate"]["tpl-service-openstack-swift-stat"]["check_interval"]': 900 '["ServiceTemplate"]["tpl-service-openstack-swift-stat"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-openstack-swift-stat"]["retry_interval"]': 30 - '["ServiceTemplate"]["tpl-service-openstack-swift-stat"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/path-rw-test/icingaweb2-module-director/path-rw-test.json b/check-plugins/path-rw-test/icingaweb2-module-director/path-rw-test.json index f7546adcc..c386c0112 100644 --- a/check-plugins/path-rw-test/icingaweb2-module-director/path-rw-test.json +++ b/check-plugins/path-rw-test/icingaweb2-module-director/path-rw-test.json @@ -159,7 +159,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "path_rw_test_always_ok": false, "path_rw_test_path": [ "/tmp" diff --git a/check-plugins/path-rw-test/icingaweb2-module-director/path-rw-test.yml b/check-plugins/path-rw-test/icingaweb2-module-director/path-rw-test.yml index 15bb581e2..f048a86fc 100644 --- a/check-plugins/path-rw-test/icingaweb2-module-director/path-rw-test.yml +++ b/check-plugins/path-rw-test/icingaweb2-module-director/path-rw-test.yml @@ -3,6 +3,3 @@ variants: - linux - sudo - windows - -overwrites: - '["ServiceTemplate"]["tpl-service-path-rw-test"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/php-fpm-ping/icingaweb2-module-director/php-fpm-ping.json b/check-plugins/php-fpm-ping/icingaweb2-module-director/php-fpm-ping.json index 9bc0c843d..d63fa665e 100644 --- a/check-plugins/php-fpm-ping/icingaweb2-module-director/php-fpm-ping.json +++ b/check-plugins/php-fpm-ping/icingaweb2-module-director/php-fpm-ping.json @@ -204,7 +204,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "php_fpm_ping_always_ok": false, "php_fpm_ping_insecure": false, "php_fpm_ping_no_proxy": false, diff --git a/check-plugins/php-fpm-ping/icingaweb2-module-director/php-fpm-ping.yml b/check-plugins/php-fpm-ping/icingaweb2-module-director/php-fpm-ping.yml index 78b6bc608..299229fb9 100644 --- a/check-plugins/php-fpm-ping/icingaweb2-module-director/php-fpm-ping.yml +++ b/check-plugins/php-fpm-ping/icingaweb2-module-director/php-fpm-ping.yml @@ -5,4 +5,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-php-fpm-ping"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-php-fpm-ping"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/qts-disk-smart/icingaweb2-module-director/qts-disk-smart.json b/check-plugins/qts-disk-smart/icingaweb2-module-director/qts-disk-smart.json index 5b7201f79..6fc17f1f5 100644 --- a/check-plugins/qts-disk-smart/icingaweb2-module-director/qts-disk-smart.json +++ b/check-plugins/qts-disk-smart/icingaweb2-module-director/qts-disk-smart.json @@ -204,7 +204,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "qts_disk_smart_always_ok": false, "qts_disk_smart_insecure": false, "qts_disk_smart_no_proxy": false, @@ -220,7 +220,7 @@ "apply_for": null, "assign_filter": null, "check_command": "cmd-check-qts-disk-smart-windows", - "check_interval": 60, + "check_interval": 28800, "check_period": null, "check_timeout": null, "command_endpoint": null, @@ -231,7 +231,7 @@ "enable_flapping": null, "enable_notifications": true, "enable_passive_checks": null, - "enable_perfdata": null, + "enable_perfdata": true, "event_command": null, "fields": [], "flapping_threshold_high": null, @@ -248,13 +248,13 @@ "notes_url": "https://github.com/Linuxfabrik/monitoring-plugins/tree/main/check-plugins/qts-disk-smart", "object_name": "tpl-service-qts-disk-smart-windows", "object_type": "template", - "retry_interval": 15, + "retry_interval": 60, "service_set": null, "template_choice": null, - "use_agent": null, + "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "qts_disk_smart_windows_always_ok": false, "qts_disk_smart_windows_insecure": false, "qts_disk_smart_windows_no_proxy": false, diff --git a/check-plugins/qts-disk-smart/icingaweb2-module-director/qts-disk-smart.yml b/check-plugins/qts-disk-smart/icingaweb2-module-director/qts-disk-smart.yml index bc4083816..e4b804a81 100644 --- a/check-plugins/qts-disk-smart/icingaweb2-module-director/qts-disk-smart.yml +++ b/check-plugins/qts-disk-smart/icingaweb2-module-director/qts-disk-smart.yml @@ -8,3 +8,10 @@ overwrites: '["ServiceTemplate"]["tpl-service-qts-disk-smart"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-qts-disk-smart"]["retry_interval"]': 60 '["ServiceTemplate"]["tpl-service-qts-disk-smart"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-qts-disk-smart"]["vars"]["criticality"]': 'A' + + '["ServiceTemplate"]["tpl-service-qts-disk-smart-windows"]["check_interval"]': 28800 + '["ServiceTemplate"]["tpl-service-qts-disk-smart-windows"]["enable_perfdata"]': true + '["ServiceTemplate"]["tpl-service-qts-disk-smart-windows"]["retry_interval"]': 60 + '["ServiceTemplate"]["tpl-service-qts-disk-smart-windows"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-qts-disk-smart-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/qts-temperatures/icingaweb2-module-director/qts-temperatures.json b/check-plugins/qts-temperatures/icingaweb2-module-director/qts-temperatures.json index d14ac603b..b7a7ecf4c 100644 --- a/check-plugins/qts-temperatures/icingaweb2-module-director/qts-temperatures.json +++ b/check-plugins/qts-temperatures/icingaweb2-module-director/qts-temperatures.json @@ -204,7 +204,7 @@ "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "qts_temperatures_always_ok": false, "qts_temperatures_insecure": false, "qts_temperatures_no_proxy": false, @@ -231,7 +231,7 @@ "enable_flapping": null, "enable_notifications": true, "enable_passive_checks": null, - "enable_perfdata": null, + "enable_perfdata": true, "event_command": null, "fields": [], "flapping_threshold_high": null, @@ -251,10 +251,10 @@ "retry_interval": 15, "service_set": null, "template_choice": null, - "use_agent": null, + "use_agent": false, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "qts_temperatures_windows_always_ok": false, "qts_temperatures_windows_insecure": false, "qts_temperatures_windows_no_proxy": false, diff --git a/check-plugins/qts-temperatures/icingaweb2-module-director/qts-temperatures.yml b/check-plugins/qts-temperatures/icingaweb2-module-director/qts-temperatures.yml index 2a232c8ea..258783e97 100644 --- a/check-plugins/qts-temperatures/icingaweb2-module-director/qts-temperatures.yml +++ b/check-plugins/qts-temperatures/icingaweb2-module-director/qts-temperatures.yml @@ -6,3 +6,8 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-qts-temperatures"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-qts-temperatures"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-qts-temperatures"]["vars"]["criticality"]': 'A' + + '["ServiceTemplate"]["tpl-service-qts-temperatures-windows"]["enable_perfdata"]': true + '["ServiceTemplate"]["tpl-service-qts-temperatures-windows"]["use_agent"]': false + '["ServiceTemplate"]["tpl-service-qts-temperatures-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/redfish-drives/icingaweb2-module-director/redfish-drives.yml b/check-plugins/redfish-drives/icingaweb2-module-director/redfish-drives.yml index 96ad3fa1b..516ca4443 100644 --- a/check-plugins/redfish-drives/icingaweb2-module-director/redfish-drives.yml +++ b/check-plugins/redfish-drives/icingaweb2-module-director/redfish-drives.yml @@ -8,7 +8,7 @@ overwrites: '["ServiceTemplate"]["tpl-service-redfish-drives"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-redfish-drives"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-redfish-drives"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-redfish-drives-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-redfish-drives-windows"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-redfish-drives-windows"]["vars"]["criticality"]': 'A' - diff --git a/check-plugins/redfish-sel/icingaweb2-module-director/redfish-sel.yml b/check-plugins/redfish-sel/icingaweb2-module-director/redfish-sel.yml index 4c1737dd6..5da7b7733 100644 --- a/check-plugins/redfish-sel/icingaweb2-module-director/redfish-sel.yml +++ b/check-plugins/redfish-sel/icingaweb2-module-director/redfish-sel.yml @@ -7,6 +7,7 @@ overwrites: '["ServiceTemplate"]["tpl-service-redfish-sel"]["check_interval"]': 900 '["ServiceTemplate"]["tpl-service-redfish-sel"]["retry_interval"]': 180 '["ServiceTemplate"]["tpl-service-redfish-sel"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-redfish-sel-windows"]["check_interval"]': 900 '["ServiceTemplate"]["tpl-service-redfish-sel-windows"]["retry_interval"]': 180 '["ServiceTemplate"]["tpl-service-redfish-sel-windows"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/redfish-sensor/icingaweb2-module-director/redfish-sensor.yml b/check-plugins/redfish-sensor/icingaweb2-module-director/redfish-sensor.yml index cf6e89a54..d3863ea58 100644 --- a/check-plugins/redfish-sensor/icingaweb2-module-director/redfish-sensor.yml +++ b/check-plugins/redfish-sensor/icingaweb2-module-director/redfish-sensor.yml @@ -9,6 +9,7 @@ overwrites: '["ServiceTemplate"]["tpl-service-redfish-sensor"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-redfish-sensor"]["retry_interval"]': 30 '["ServiceTemplate"]["tpl-service-redfish-sensor"]["vars"]["criticality"]': 'A' + '["ServiceTemplate"]["tpl-service-redfish-sensor-windows"]["check_interval"]': 300 '["ServiceTemplate"]["tpl-service-redfish-sensor-windows"]["enable_perfdata"]': true '["ServiceTemplate"]["tpl-service-redfish-sensor-windows"]["retry_interval"]': 30 diff --git a/check-plugins/safenet-hsm-state/icingaweb2-module-director/safenet-hsm-state.json b/check-plugins/safenet-hsm-state/icingaweb2-module-director/safenet-hsm-state.json index a3b46a927..3a385b4ba 100644 --- a/check-plugins/safenet-hsm-state/icingaweb2-module-director/safenet-hsm-state.json +++ b/check-plugins/safenet-hsm-state/icingaweb2-module-director/safenet-hsm-state.json @@ -122,7 +122,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "safenet_hsm_state_always_ok": false, "safenet_hsm_state_critical": 90, "safenet_hsm_state_severity": "crit", diff --git a/check-plugins/scheduled-task/icingaweb2-module-director/scheduled-task.yml b/check-plugins/scheduled-task/icingaweb2-module-director/scheduled-task.yml index c5f891431..858b7aab8 100644 --- a/check-plugins/scheduled-task/icingaweb2-module-director/scheduled-task.yml +++ b/check-plugins/scheduled-task/icingaweb2-module-director/scheduled-task.yml @@ -1,6 +1,3 @@ --- variants: - windows - -overwrites: - '["ServiceTemplate"]["tpl-service-scheduled-task"]["vars"]["criticality"]': 'A' \ No newline at end of file diff --git a/check-plugins/sensors-battery/icingaweb2-module-director/sensors-battery.json b/check-plugins/sensors-battery/icingaweb2-module-director/sensors-battery.json index 139b50bbd..c32907e6f 100644 --- a/check-plugins/sensors-battery/icingaweb2-module-director/sensors-battery.json +++ b/check-plugins/sensors-battery/icingaweb2-module-director/sensors-battery.json @@ -82,7 +82,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "C", + "criticality": "A", "sensors_battery_always_ok": false, "sensors_battery_critical": 5, "sensors_battery_warning": 20 diff --git a/check-plugins/sensors-battery/icingaweb2-module-director/sensors-battery.yml b/check-plugins/sensors-battery/icingaweb2-module-director/sensors-battery.yml index 8d51a3abb..458a1375c 100644 --- a/check-plugins/sensors-battery/icingaweb2-module-director/sensors-battery.yml +++ b/check-plugins/sensors-battery/icingaweb2-module-director/sensors-battery.yml @@ -1,3 +1,4 @@ --- overwrites: '["ServiceTemplate"]["tpl-service-sensors-battery"]["enable_perfdata"]': true + '["ServiceTemplate"]["tpl-service-sensors-battery"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/service/icingaweb2-module-director/service.yml b/check-plugins/service/icingaweb2-module-director/service.yml index eb1df6111..6c0f69311 100644 --- a/check-plugins/service/icingaweb2-module-director/service.yml +++ b/check-plugins/service/icingaweb2-module-director/service.yml @@ -4,4 +4,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-service-windows"]["vars"]["service_windows_status"]': ['running'] - '["ServiceTemplate"]["tpl-service-service-windows"]["vars"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/statuspal/icingaweb2-module-director/statuspal.json b/check-plugins/statuspal/icingaweb2-module-director/statuspal.json index 1a3128e55..80ce600d2 100644 --- a/check-plugins/statuspal/icingaweb2-module-director/statuspal.json +++ b/check-plugins/statuspal/icingaweb2-module-director/statuspal.json @@ -172,7 +172,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "statuspal_always_ok": false, "statuspal_insecure": false, "statuspal_no_proxy": false, diff --git a/check-plugins/statuspal/icingaweb2-module-director/statuspal.yml b/check-plugins/statuspal/icingaweb2-module-director/statuspal.yml index 9bfd14512..02d5081eb 100644 --- a/check-plugins/statuspal/icingaweb2-module-director/statuspal.yml +++ b/check-plugins/statuspal/icingaweb2-module-director/statuspal.yml @@ -5,4 +5,3 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-statuspal"]["enable_perfdata"]': false - '["ServiceTemplate"]["tpl-service-statuspal"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/strongswan-connections/icingaweb2-module-director/strongswan-connections.json b/check-plugins/strongswan-connections/icingaweb2-module-director/strongswan-connections.json index 34c607fec..91d464941 100644 --- a/check-plugins/strongswan-connections/icingaweb2-module-director/strongswan-connections.json +++ b/check-plugins/strongswan-connections/icingaweb2-module-director/strongswan-connections.json @@ -82,7 +82,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "strongswan_connections_always_ok": false, "strongswan_connections_lengthy": false, "strongswan_connections_socket": "/run/strongswan/charon.vici" diff --git a/check-plugins/strongswan-connections/icingaweb2-module-director/strongswan-connections.yml b/check-plugins/strongswan-connections/icingaweb2-module-director/strongswan-connections.yml index a6e560a98..3d5264242 100644 --- a/check-plugins/strongswan-connections/icingaweb2-module-director/strongswan-connections.yml +++ b/check-plugins/strongswan-connections/icingaweb2-module-director/strongswan-connections.yml @@ -1,4 +1,3 @@ --- overwrites: '["Command"]["cmd-check-strongswan-connections"]["command"]': '/usr/bin/sudo /usr/lib64/nagios/plugins/strongswan-connections' - '["ServiceTemplate"]["tpl-service-strongswan-connections"]["vars"]["criticality"]': 'A' diff --git a/check-plugins/systemd-unit/icingaweb2-module-director/systemd-unit.json b/check-plugins/systemd-unit/icingaweb2-module-director/systemd-unit.json index d7b4c1a4c..b136a2a4c 100644 --- a/check-plugins/systemd-unit/icingaweb2-module-director/systemd-unit.json +++ b/check-plugins/systemd-unit/icingaweb2-module-director/systemd-unit.json @@ -108,7 +108,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "systemd_unit_activestate": [ "active" ], diff --git a/check-plugins/systemd-unit/icingaweb2-module-director/systemd-unit.yml b/check-plugins/systemd-unit/icingaweb2-module-director/systemd-unit.yml index 5b3203dc4..355186140 100644 --- a/check-plugins/systemd-unit/icingaweb2-module-director/systemd-unit.yml +++ b/check-plugins/systemd-unit/icingaweb2-module-director/systemd-unit.yml @@ -1,6 +1,5 @@ --- overwrites: - '["ServiceTemplate"]["tpl-service-systemd-unit"]["vars"]["criticality"]': 'A' '["ServiceTemplate"]["tpl-service-systemd-unit"]["vars"]["systemd_unit_activestate"]': ['active'] '["ServiceTemplate"]["tpl-service-systemd-unit"]["vars"]["systemd_unit_substate"]': ['running'] '["ServiceTemplate"]["tpl-service-systemd-unit"]["vars"]["systemd_unit_unitfilestate"]': 'enabled' diff --git a/check-plugins/users/icingaweb2-module-director/users.json b/check-plugins/users/icingaweb2-module-director/users.json index f673db6cb..ffad66237 100644 --- a/check-plugins/users/icingaweb2-module-director/users.json +++ b/check-plugins/users/icingaweb2-module-director/users.json @@ -124,7 +124,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "users_critical": "None, None, None", "users_warning": "1, 20, 1" }, @@ -171,7 +171,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "users_windows_critical": "None, None, None", "users_windows_warning": "1, 20, 1" }, diff --git a/check-plugins/users/icingaweb2-module-director/users.yml b/check-plugins/users/icingaweb2-module-director/users.yml index f86e157a7..3ba70e8c0 100644 --- a/check-plugins/users/icingaweb2-module-director/users.yml +++ b/check-plugins/users/icingaweb2-module-director/users.yml @@ -5,11 +5,9 @@ variants: overwrites: '["ServiceTemplate"]["tpl-service-users"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-users"]["vars"]["criticality"]': 'A' '["ServiceTemplate"]["tpl-service-users"]["vars"]["users_critical"]': 'None, None, None' '["ServiceTemplate"]["tpl-service-users"]["vars"]["users_warning"]': '1, 20, 1' '["ServiceTemplate"]["tpl-service-users-windows"]["enable_perfdata"]': true - '["ServiceTemplate"]["tpl-service-users-windows"]["vars"]["criticality"]': 'A' '["ServiceTemplate"]["tpl-service-users-windows"]["vars"]["users_windows_critical"]': 'None, None, None' '["ServiceTemplate"]["tpl-service-users-windows"]["vars"]["users_windows_warning"]': '1, 20, 1' diff --git a/check-plugins/xml/icingaweb2-module-director/xml.json b/check-plugins/xml/icingaweb2-module-director/xml.json index 89ff63117..b6efc5c77 100644 --- a/check-plugins/xml/icingaweb2-module-director/xml.json +++ b/check-plugins/xml/icingaweb2-module-director/xml.json @@ -254,7 +254,7 @@ "use_agent": null, "use_var_overrides": null, "vars": { - "criticality": "A", + "criticality": "C", "xml_always_ok": false, "xml_insecure": false, "xml_no_proxy": false, diff --git a/check-plugins/xml/icingaweb2-module-director/xml.yml b/check-plugins/xml/icingaweb2-module-director/xml.yml index 3456167b7..9e6034e8a 100644 --- a/check-plugins/xml/icingaweb2-module-director/xml.yml +++ b/check-plugins/xml/icingaweb2-module-director/xml.yml @@ -6,4 +6,3 @@ variants: overwrites: '["Command"]["cmd-check-xml"]["timeout"]': 30 '["ServiceTemplate"]["tpl-service-xml"]["retry_interval"]': 30 - '["ServiceTemplate"]["tpl-service-xml"]["vars"]["criticality"]': 'A'