Merge pull request #104 from opsgenie/nagios-multiserver-conf-changes

set nagios server if it is configured in config file
opsgenie · Mar 8, 2024 · 722f1a9 · 722f1a9
2 parents 9144511 + f79c9c6
commit 722f1a9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Nagios/scripts/actionExecutor.py b/Nagios/scripts/actionExecutor.py
@@ -64,7 +64,16 @@ def parse_from_details(key):
 
 def get_url(conf_property, backward_compatibility_url):
     url = parse_field(conf_property, True)
-    if url:
+    nagios_server = parse_field("nagios_server", False)
+
+    if nagios_server and "default" != nagios_server:
+        scheme = parse_field("scheme", False)
+        if scheme is None and "http" not in nagios_server:
+            scheme = "http"
+        url = urllib.parse.urlunparse(
+            (scheme, nagios_server, urllib.parse.quote(backward_compatibility_url), None, None, None))
+        return url
+    elif url:
         return url
     else:
         # backward compatibility

diff --git a/release/oec-builder/oecScriptsVersion.json b/release/oec-builder/oecScriptsVersion.json
@@ -11,7 +11,7 @@
   "JiraServiceDesk": "1.1.4",
   "LibreNMS": "1.1.3",
   "Marid": "1.1.3",
-  "Nagios": "1.1.5",
+  "Nagios": "1.1.6",
   "NagiosXI": "1.1.5",
   "OEC": "1.1.3",
   "OP5": "1.1.3",