badges are now non-cacheable; badges on alarms modal auto-refresh; chart refreshes...

[netdata.git] / web / index.html

diff --git a/web/index.html b/web/index.html
index 3e6c22190c2fb2f8ead4d097bc23f16e39c9b34a..5a05ea0475415e7ce6f35bdf2637111dd426c1a9 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -2449,16 +2449,16 @@ 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><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++;
+                    active += '<tr><td class="text-center" style="vertical-align:middle"><embed src="' + NETDATA.serverDefault + 'api/v1/badge.svg?chart=' + alarm.chart + '&alarm=' + alarm.name + '&refresh=auto" type="image/svg+xml" /></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) {
                     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><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++;
+                all += '<tr><td class="text-center" style="vertical-align:middle"><embed src="' + NETDATA.serverDefault + 'api/v1/badge.svg?chart=' + alarm.chart + '&alarm=' + alarm.name + '&refresh=auto" type="image/svg+xml" /></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>";
@@ -2915,10 +2915,11 @@ function finalizePage() {
     });
 
     $('#alarmsModal').on('shown.bs.modal', function() {
-        alarmsUpdateModal();
+        NETDATA.pause(alarmsUpdateModal);
     });
 
     $('#alarmsModal').on('hidden.bs.modal', function() {
+        NETDATA.unpause();
         document.getElementById('alarms_active').innerHTML =
                 document.getElementById('alarms_all').innerHTML =
                 document.getElementById('alarms_log').innerHTML =