aesthetic changes to alarms modal and alarms emails

diff --git a/plugins.d/alarm-email.sh b/plugins.d/alarm-email.sh
index 25ed6f77796b1c4c9194f988386a2a060be1bab5..78c79ccdb72359088918f56ba0fa10018bea93ea 100755 (executable)
--- a/plugins.d/alarm-email.sh
+++ b/plugins.d/alarm-email.sh
@@ -34,7 +34,7 @@ non_clear_duration="${10}" # the total duration in seconds this is non-clear
 units="${11}"     # the units of the value
 info="${12}"      # a short description of the alarm
 
-[ ! -z "${info}" ] && info=" <br/>${info}"
+[ ! -z "${info}" ] && info=" <small><br/>${info}</small>"
 
 # get the system hostname
 hostname="${NETDATA_HOSTNAME}"
@@ -204,7 +204,7 @@ Content-Type: text/html
                                     <tr style="margin:0;padding:0">
                                         <td style="font-size:18px;vertical-align:top;margin:0;padding:0 0 20px"
                                             align="left" valign="top">
-                                            <span>${alarm}${info}</span>
+                                            <span><b>${alarm}</b>${info}</span>
                                             <span style="display:block;color:#666666;font-size:12px;font-weight:300;line-height:1;text-transform:uppercase">Alarm</span>
                                         </td>
                                     </tr>

diff --git a/web/index.html b/web/index.html
index 1f60269229064a7cced3488d30b1cdbab7b29229..3e6c22190c2fb2f8ead4d097bc23f16e39c9b34a 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -2449,7 +2449,7 @@ function alarmsUpdateModal() {
                         active_family_added = true;
                         active += '<tr><th class="text-center"><h4>' + x + '</h4></th><th></th></tr>';
                     }
-                    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>';
+                    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>&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>';
                     count_active++;
                 }
 
@@ -2457,7 +2457,7 @@ function alarmsUpdateModal() {
                     all_family_added = true;
                     all += '<tr><th class="text-center"><h4>' + x + '</h4></th><th></th></tr>';
                 }
-                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>';
+                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>&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>';
                 count_all++;
             }
         }