fix for double slash in health API URLs
Costa Tsaousis (ktsaou) committed
Aug 28, 2016 at 15:51 UTC
bb222747db3cce023bc9f84536b7658cfe513567
2 files changed
+12
-6
web/dashboard.js
+10
-4
@@ -5576,12 +5576,13 @@
5576
// Registry of netdata hosts
5577
5578
NETDATA.alarms = {
5579
+ server: null,
5580
current: null,
5581
callback: null,
5582
5583
get: function(what, callback) {
5584
$.ajax({
5584
- url: NETDATA.serverDefault + '/api/v1/alarms?' + what.toString(),
5585
+ url: NETDATA.alarms.server + '/api/v1/alarms?' + what.toString(),
5586
async: true,
5587
cache: false,
5588
xhrFields: { withCredentials: true } // required for the cookie
@@ -5591,7 +5592,7 @@
5592
callback(data);
5593
})
5594
.fail(function() {
5594
- NETDATA.error(415, host);
5595
+ NETDATA.error(415, NETDATA.alarms.server);
5596
5597
if(typeof callback === 'function')
5598
callback(null);
@@ -5614,7 +5615,7 @@
5615
5616
get_log: function(callback) {
5617
$.ajax({
5617
- url: NETDATA.serverDefault + '/api/v1/alarm_log',
5618
+ url: NETDATA.alarms.server + '/api/v1/alarm_log',
5619
async: true,
5620
cache: false,
5621
xhrFields: { withCredentials: true } // required for the cookie
@@ -5624,7 +5625,7 @@
5625
callback(data);
5626
})
5627
.fail(function() {
5627
- NETDATA.error(416, host);
5628
+ NETDATA.error(416, NETDATA.alarms.server);
5629
5630
if(typeof callback === 'function')
5631
callback(null);
@@ -5632,6 +5633,11 @@
5633
},
5634
5635
init: function() {
5636
+ var host = NETDATA.serverDefault;
5637
+ while(host.slice(-1) === '/')
5638
+ host = host.substring(0, host.length - 1);
5639
+ NETDATA.alarms.server = host;
5640
+
5641
NETDATA.alarms.update_forever();
5642
}
5643
};
web/index.html
+2
-2
@@ -2450,7 +2450,7 @@ function alarmsUpdateModal() {
2450
active += '<tr><th class="text-center"><h4>' + x + '</h4></th><th></th></tr>';
2451
}
2452
count_active++;
2453
- 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> warning when </td><td><code>' + alarm.warn + '</code></td></tr>'):'') + ((typeof alarm.crit !== 'undefined')?('<tr><td style="text-align:right"> critical when </td><td><code>' + alarm.crit + '</code></td></tr>'):'') + '<tr><td style="text-align:right"><small> source </small></td><td><small>' + alarm.source + '</small></td></tr></table></td></tr>';
2453
+ 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> warning when </td><td><code>' + alarm.warn + '</code></td></tr>'):'') + ((typeof alarm.crit !== 'undefined')?('<tr><td style="text-align:right"> critical when </td><td><code>' + alarm.crit + '</code></td></tr>'):'') + '<tr><td style="text-align:right"><small> source </small></td><td><small>' + alarm.source + '</small></td></tr></table></td></tr>';
2454
}
2455
2456
if(!all_family_added) {
@@ -2458,7 +2458,7 @@ function alarmsUpdateModal() {
2458
all += '<tr><th class="text-center"><h4>' + x + '</h4></th><th></th></tr>';
2459
}
2460
count_all++;
2461
- 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> warning when </td><td><code>' + alarm.warn + '</code></td></tr>'):'') + ((typeof alarm.crit !== 'undefined')?('<tr><td style="text-align:right"> critical when </td><td><code>' + alarm.crit + '</code></td></tr>'):'') + '<tr><td style="text-align:right"><small> source </small></td><td><small>' + alarm.source + '</small></td></tr></table></td></tr>';
2461
+ 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> warning when </td><td><code>' + alarm.warn + '</code></td></tr>'):'') + ((typeof alarm.crit !== 'undefined')?('<tr><td style="text-align:right"> critical when </td><td><code>' + alarm.crit + '</code></td></tr>'):'') + '<tr><td style="text-align:right"><small> source </small></td><td><small>' + alarm.source + '</small></td></tr></table></td></tr>';
2462
}
2463
}
2464
active += "</table>";