From 07a62e52808e09608636c77d42bf34fd223941b3 Mon Sep 17 00:00:00 2001 From: Benjamin Drieu Date: Fri, 9 Sep 2022 11:40:55 +0200 Subject: [PATCH] Horrible fix to prevent variable from being modified later --- servers/icinga.js | 2 +- servers/icinga2.js | 3 +-- servers/icinga2api.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/servers/icinga.js b/servers/icinga.js index 18b7fc3..e6c163d 100644 --- a/servers/icinga.js +++ b/servers/icinga.js @@ -110,7 +110,7 @@ class Icinga extends GenericServer { getUrlForService ( service ) { - return '%s/?type=2&host=%s&service=%s'.format ( this._settings.get_string ( 'urlcgi' ).replace ( /status.cgi/, 'extinfo.cgi' ), + return '%s?type=2&host=%s&service=%s'.format ( this._settings.get_string ( 'urlcgi' ).replace ( /status.cgi/, 'extinfo.cgi' ), encodeURI ( service.real_host_name ), encodeURI ( service.service_display_name ) ); } diff --git a/servers/icinga2.js b/servers/icinga2.js index 1e924ba..c47f7fb 100644 --- a/servers/icinga2.js +++ b/servers/icinga2.js @@ -82,9 +82,8 @@ class Icinga2 extends GenericServer { getUrlForService ( service ) { - log ( service ); return '%s/monitoring/service/show?host=%s&service=%s'.format ( this._settings.get_string ( 'url' ), - service.host_name, + service.real_host_name, service.service_display_name ); } diff --git a/servers/icinga2api.js b/servers/icinga2api.js index ce9bb79..4be811b 100644 --- a/servers/icinga2api.js +++ b/servers/icinga2api.js @@ -102,7 +102,7 @@ class Icinga2API extends GenericServer { // log ( JSON.stringify(entry) ); this.status.service_status.push ( { status: _statuses[entry.attrs.state], - real_host_name: entry.attrs.host_name, + real_host_name: entry.attrs.host_name + '', host_name: entry.attrs.host_name, service_display_name: entry.attrs.display_name, has_been_acknowledged: parseInt(entry.attrs.acknowledgement),