aesthetic changes to alarms modal and alarms emails
Costa Tsaousis (ktsaou) committed
Aug 27, 2016 at 21:38 UTC
0712458086a2de146fe86944945e736a5a4af3be
2 files changed
+4
-4
plugins.d/alarm-email.sh
+2
-2
@@ -34,7 +34,7 @@ non_clear_duration="${10}" # the total duration in seconds this is non-clear
34
units="${11}" # the units of the value
35
info="${12}" # a short description of the alarm
36
37
-[ ! -z "${info}" ] && info=" <br/>${info}"
37
+[ ! -z "${info}" ] && info=" <small><br/>${info}</small>"
38
39
# get the system hostname
40
hostname="${NETDATA_HOSTNAME}"
@@ -204,7 +204,7 @@ Content-Type: text/html
204
<tr style="margin:0;padding:0">
205
<td style="font-size:18px;vertical-align:top;margin:0;padding:0 0 20px"
206
align="left" valign="top">
207
- <span>${alarm}${info}</span>
207
+ <span><b>${alarm}</b>${info}</span>
208
<span style="display:block;color:#666666;font-size:12px;font-weight:300;line-height:1;text-transform:uppercase">Alarm</span>
209
</td>
210
</tr>
web/index.html
+2
-2
@@ -2449,7 +2449,7 @@ function alarmsUpdateModal() {
2449
active_family_added = true;
2450
active += '<tr><th class="text-center"><h4>' + x + '</h4></th><th></th></tr>';
2451
}
2452
- active += '<tr><td class="text-center" style="vertical-align:middle"><embed><img src="' + NETDATA.serverDefault + '/api/v1/badge.svg?chart=' + alarm.chart + '&alarm=' + alarm.name + '&refresh=auto&_=' + now.toString()+ '"></img></embed></td><td>' + alarm.info + '</td></tr>';
2452
+ active += '<tr><td class="text-center" style="vertical-align:middle"><embed><img src="' + NETDATA.serverDefault + '/api/v1/badge.svg?chart=' + alarm.chart + '&alarm=' + alarm.name + '&refresh=auto&_=' + now.toString()+ '"></img></embed></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
count_active++;
2454
}
2455
@@ -2457,7 +2457,7 @@ function alarmsUpdateModal() {
2457
all_family_added = true;
2458
all += '<tr><th class="text-center"><h4>' + x + '</h4></th><th></th></tr>';
2459
}
2460
- all += '<tr><td class="text-center" style="vertical-align:middle"><embed><img src="' + NETDATA.serverDefault + '/api/v1/badge.svg?chart=' + alarm.chart + '&alarm=' + alarm.name + '&refresh=auto&_=' + now.toString()+ '"></img></embed></td><td>' + alarm.info + '</td></tr>';
2460
+ all += '<tr><td class="text-center" style="vertical-align:middle"><embed><img src="' + NETDATA.serverDefault + '/api/v1/badge.svg?chart=' + alarm.chart + '&alarm=' + alarm.name + '&refresh=auto&_=' + now.toString()+ '"></img></embed></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
count_all++;
2462
}
2463
}