fix for double slash in health API URLs

diff --git a/web/dashboard.js b/web/dashboard.js
index 67fb00b8bb6f56a6c5f2311c61abcc254e68d9a3..6159d8ccefd683ce2544baf0d5b926734bef8ab8 100644 (file)
--- a/web/dashboard.js
+++ b/web/dashboard.js
@@ -5576,12 +5576,13 @@
     // Registry of netdata hosts
 
     NETDATA.alarms = {
+        server: null,
         current: null,
         callback: null,
 
         get: function(what, callback) {
             $.ajax({
-                url: NETDATA.serverDefault + '/api/v1/alarms?' + what.toString(),
+                url: NETDATA.alarms.server + '/api/v1/alarms?' + what.toString(),
                 async: true,
                 cache: false,
                 xhrFields: { withCredentials: true } // required for the cookie
@@ -5591,7 +5592,7 @@
                         callback(data);
                 })
                 .fail(function() {
-                    NETDATA.error(415, host);
+                    NETDATA.error(415, NETDATA.alarms.server);
 
                     if(typeof callback === 'function')
                         callback(null);
@@ -5614,7 +5615,7 @@
 
         get_log: function(callback) {
             $.ajax({
-                url: NETDATA.serverDefault + '/api/v1/alarm_log',
+                url: NETDATA.alarms.server + '/api/v1/alarm_log',
                 async: true,
                 cache: false,
                 xhrFields: { withCredentials: true } // required for the cookie
@@ -5624,7 +5625,7 @@
                         callback(data);
                 })
                 .fail(function() {
-                    NETDATA.error(416, host);
+                    NETDATA.error(416, NETDATA.alarms.server);
 
                     if(typeof callback === 'function')
                         callback(null);
@@ -5632,6 +5633,11 @@
         },
 
         init: function() {
+            var host = NETDATA.serverDefault;
+            while(host.slice(-1) === '/')
+                host = host.substring(0, host.length - 1);
+            NETDATA.alarms.server = host;
+            
             NETDATA.alarms.update_forever();
         }
     };

diff --git a/web/index.html b/web/index.html
index 6b281770fec39e37087fdde0268042ba737a74db..2f61e452b54e2ef752e6866506fd33738e958d7b 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -2450,7 +2450,7 @@ function alarmsUpdateModal() {
                         active += '<tr><th class="text-center"><h4>' + x + '</h4></th><th></th></tr>';
                     }
                     count_active++;
-                    active += '<tr><td class="text-center" style="vertical-align:middle" width="40%"><embed src="' + NETDATA.serverDefault + 'api/v1/badge.svg?chart=' + alarm.chart + '&alarm=' + alarm.name + '&refresh=auto" type="image/svg+xml" height="20" /></td><td><b>' + alarm.info + '</b><table>' + ((typeof alarm.warn !== 'undefined')?('<tr><td>&nbsp;warning&nbsp;when&nbsp;</td><td><code>' + alarm.warn + '</code></td></tr>'):'') + ((typeof alarm.crit !== 'undefined')?('<tr><td style="text-align:right">&nbsp;critical&nbsp;when&nbsp;</td><td><code>' + alarm.crit + '</code></td></tr>'):'') + '<tr><td style="text-align:right"><small>&nbsp;source&nbsp;</small></td><td><small>' + alarm.source + '</small></td></tr></table></td></tr>';
+                    active += '<tr><td class="text-center" style="vertical-align:middle" width="40%"><embed src="' + NETDATA.alarms.server + '/api/v1/badge.svg?chart=' + alarm.chart + '&alarm=' + alarm.name + '&refresh=auto" type="image/svg+xml" height="20" /></td><td><b>' + alarm.info + '</b><table>' + ((typeof alarm.warn !== 'undefined')?('<tr><td>&nbsp;warning&nbsp;when&nbsp;</td><td><code>' + alarm.warn + '</code></td></tr>'):'') + ((typeof alarm.crit !== 'undefined')?('<tr><td style="text-align:right">&nbsp;critical&nbsp;when&nbsp;</td><td><code>' + alarm.crit + '</code></td></tr>'):'') + '<tr><td style="text-align:right"><small>&nbsp;source&nbsp;</small></td><td><small>' + alarm.source + '</small></td></tr></table></td></tr>';
                 }
 
                 if(!all_family_added) {
@@ -2458,7 +2458,7 @@ function alarmsUpdateModal() {
                     all += '<tr><th class="text-center"><h4>' + x + '</h4></th><th></th></tr>';
                 }
                 count_all++;
-                all += '<tr><td class="text-center" style="vertical-align:middle" width="40%"><embed src="' + NETDATA.serverDefault + 'api/v1/badge.svg?chart=' + alarm.chart + '&alarm=' + alarm.name + '&refresh=auto" type="image/svg+xml" height="20" /></td><td><b>' + alarm.info + '</b><table>' + ((typeof alarm.warn !== 'undefined')?('<tr><td>&nbsp;warning&nbsp;when&nbsp;</td><td><code>' + alarm.warn + '</code></td></tr>'):'') + ((typeof alarm.crit !== 'undefined')?('<tr><td style="text-align:right">&nbsp;critical&nbsp;when&nbsp;</td><td><code>' + alarm.crit + '</code></td></tr>'):'') + '<tr><td style="text-align:right"><small>&nbsp;source&nbsp;</small></td><td><small>' + alarm.source + '</small></td></tr></table></td></tr>';
+                all += '<tr><td class="text-center" style="vertical-align:middle" width="40%"><embed src="' + NETDATA.alarms.server + '/api/v1/badge.svg?chart=' + alarm.chart + '&alarm=' + alarm.name + '&refresh=auto" type="image/svg+xml" height="20" /></td><td><b>' + alarm.info + '</b><table>' + ((typeof alarm.warn !== 'undefined')?('<tr><td>&nbsp;warning&nbsp;when&nbsp;</td><td><code>' + alarm.warn + '</code></td></tr>'):'') + ((typeof alarm.crit !== 'undefined')?('<tr><td style="text-align:right">&nbsp;critical&nbsp;when&nbsp;</td><td><code>' + alarm.crit + '</code></td></tr>'):'') + '<tr><td style="text-align:right"><small>&nbsp;source&nbsp;</small></td><td><small>' + alarm.source + '</small></td></tr></table></td></tr>';
             }
         }
         active += "</table>";