uptime: Set check interval to default in Icinga Director

Linuxfabrik · Oct 25, 2023 · 1f9299f · 1f9299f
1 parent c711ccb
commit 1f9299f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/check-plugins/uptime/icingaweb2-module-director/uptime.json b/check-plugins/uptime/icingaweb2-module-director/uptime.json
@@ -16,17 +16,17 @@
             "disabled": false,
             "fields": [
                 {
-                    "datafield_id": 60,
+                    "datafield_id": 1,
                     "is_required": "n",
                     "var_filter": null
                 },
                 {
-                    "datafield_id": 61,
+                    "datafield_id": 2,
                     "is_required": "n",
                     "var_filter": null
                 },
                 {
-                    "datafield_id": 62,
+                    "datafield_id": 3,
                     "is_required": "n",
                     "var_filter": null
                 }
@@ -57,17 +57,17 @@
             "disabled": false,
             "fields": [
                 {
-                    "datafield_id": 63,
+                    "datafield_id": 4,
                     "is_required": "n",
                     "var_filter": null
                 },
                 {
-                    "datafield_id": 64,
+                    "datafield_id": 5,
                     "is_required": "n",
                     "var_filter": null
                 },
                 {
-                    "datafield_id": 65,
+                    "datafield_id": 6,
                     "is_required": "n",
                     "var_filter": null
                 }
@@ -106,7 +106,7 @@
             "apply_for": null,
             "assign_filter": null,
             "check_command": "cmd-check-uptime",
-            "check_interval": 300,
+            "check_interval": 60,
             "check_period": null,
             "check_timeout": null,
             "command_endpoint": null,
@@ -134,7 +134,7 @@
             "notes_url": "https://github.com/Linuxfabrik/monitoring-plugins/tree/main/check-plugins/uptime",
             "object_name": "tpl-service-uptime",
             "object_type": "template",
-            "retry_interval": 30,
+            "retry_interval": 15,
             "service_set": null,
             "template_choice": null,
             "use_agent": null,
@@ -154,7 +154,7 @@
             "apply_for": null,
             "assign_filter": null,
             "check_command": "cmd-check-uptime-windows",
-            "check_interval": 300,
+            "check_interval": 60,
             "check_period": null,
             "check_timeout": null,
             "command_endpoint": null,
@@ -182,7 +182,7 @@
             "notes_url": "https://github.com/Linuxfabrik/monitoring-plugins/tree/main/check-plugins/uptime",
             "object_name": "tpl-service-uptime-windows",
             "object_type": "template",
-            "retry_interval": 30,
+            "retry_interval": 15,
             "service_set": null,
             "template_choice": null,
             "use_agent": null,
@@ -199,7 +199,7 @@
         }
     },
     "Datafield": {
-        "60": {
+        "1": {
             "varname": "uptime_always_ok",
             "caption": "Uptime: Always OK?",
             "description": "Always returns OK.",
@@ -208,7 +208,7 @@
             "settings": {},
             "uuid": "0edbc7d6-14e0-4a10-8678-15829c304d7b"
         },
-        "61": {
+        "2": {
             "varname": "uptime_critical",
             "caption": "Uptime: Critical",
             "description": "Set the critical threshold for uptime in days.",
@@ -219,7 +219,7 @@
             },
             "uuid": "12e5f57e-072c-456e-becf-0df633a0f690"
         },
-        "62": {
+        "3": {
             "varname": "uptime_warning",
             "caption": "Uptime: Warning",
             "description": "Set the warning threshold for uptime in days.",
@@ -230,7 +230,7 @@
             },
             "uuid": "c6a9f9a1-a699-412d-9f40-522f6a951cee"
         },
-        "63": {
+        "4": {
             "varname": "uptime_windows_always_ok",
             "caption": "Uptime: Always OK?",
             "description": "Always returns OK.",
@@ -239,7 +239,7 @@
             "settings": {},
             "uuid": "2919785a-cbc4-49b6-ad5b-90e359dc0139"
         },
-        "64": {
+        "5": {
             "varname": "uptime_windows_critical",
             "caption": "Uptime: Critical",
             "description": "Set the critical threshold for uptime in days.",
@@ -250,7 +250,7 @@
             },
             "uuid": "34841eea-03fa-4b21-b425-043dfa13db21"
         },
-        "65": {
+        "6": {
             "varname": "uptime_windows_warning",
             "caption": "Uptime: Warning",
             "description": "Set the warning threshold for uptime in days.",

diff --git a/check-plugins/uptime/icingaweb2-module-director/uptime.yml b/check-plugins/uptime/icingaweb2-module-director/uptime.yml
@@ -4,10 +4,6 @@ variants:
   - windows
 
 overwrites:
-  '["ServiceTemplate"]["tpl-service-uptime"]["check_interval"]': 300
   '["ServiceTemplate"]["tpl-service-uptime"]["enable_perfdata"]': true
-  '["ServiceTemplate"]["tpl-service-uptime"]["retry_interval"]': 30
 
-  '["ServiceTemplate"]["tpl-service-uptime-windows"]["check_interval"]': 300
   '["ServiceTemplate"]["tpl-service-uptime-windows"]["enable_perfdata"]': true
-  '["ServiceTemplate"]["tpl-service-uptime-windows"]["retry_interval"]': 30