' + alarm.chart + '
' + alarm.info + '' + role_href + ' | '
+ ''
+ ((typeof alarm.warn !== 'undefined')?('| warning when | ' + alarm.warn + ' | '):'')
+ ((typeof alarm.crit !== 'undefined')?('| critical when | ' + alarm.crit + ' | '):'');
if(full === true) {
- html += ((typeof alarm.lookup_after !== 'undefined')?('| db lookup | ' + alarm_lookup_explain(alarm, chart) + ' | '):'')
+ var units = chart.units;
+ if(units === '%') units = '%';
+
+ html += ((typeof alarm.lookup_after !== 'undefined')?('| db lookup | ' + alarm_lookup_explain(alarm, chart) + ' | '):'')
+ ((typeof alarm.calc !== 'undefined')?('| calculation | ' + alarm.calc + ' | '):'')
- + ((chart.green !== null)?('| green threshold | ' + chart.green + ' ' + chart.units + ' | '):'')
- + ((chart.red !== null)?('| red threshold | ' + chart.red + ' ' + chart.units + ' | '):'');
+ + ((chart.green !== null)?('| green threshold | ' + chart.green + ' ' + units + ' | '):'')
+ + ((chart.red !== null)?('| red threshold | ' + chart.red + ' ' + units + ' | '):'');
}
var delay = '';
@@ -1850,6 +1862,23 @@
switchable: false,
sortable: true
},
+ {
+ field: 'value_string',
+ title: 'Friendly Value',
+ titleTooltip: 'The value of the alarm, that triggered this event',
+ align: 'right',
+ valign: 'middle',
+ sortable: true
+ },
+ {
+ field: 'old_value_string',
+ title: 'Friendly Old Value',
+ titleTooltip: 'The value of the alarm, just before this event',
+ align: 'right',
+ valign: 'middle',
+ visible: false,
+ sortable: true
+ },
{
field: 'old_value',
title: 'Old Value',
@@ -1871,6 +1900,7 @@
},
align: 'right',
valign: 'middle',
+ visible: false,
sortable: true
},
{
@@ -1879,6 +1909,7 @@
titleTooltip: 'The units of the value of the alarm',
align: 'left',
valign: 'middle',
+ visible: false,
sortable: true
},
{
@@ -2502,6 +2533,10 @@
netdataReload();
});
+ $('#updateModal').on('show.bs.modal', function() {
+ versionLog('checking, please wait...');
+ });
+
$('#updateModal').on('shown.bs.modal', function() {
notifyForUpdate(true);
});
@@ -2596,6 +2631,9 @@
.on('hidden.bs.dropdown', function () {
NETDATA.unpause();
});
+
+ // var netdataEnded = performance.now();
+ // console.log('start up time: ' + (netdataEnded - netdataStarted).toString() + ' ms');
}
function resetDashboardOptions() {
@@ -2623,7 +2661,7 @@
});
NETDATA.requiredJs.push({
- url: NETDATA.serverDefault + 'dashboard_info.js?v20161226-1',
+ url: NETDATA.serverDefault + 'dashboard_info.js?v20170115-1',
async: false,
isAlreadyLoaded: function() { return false; }
});
@@ -2638,6 +2676,7 @@
};
// our entry point
+ // var netdataStarted = performance.now();
var netdataCallback = initializeDynamicDashboard;
@@ -2686,8 +2725,10 @@
|