Merge remote-tracking branch 'lucadev/master'

[netdata.git] / web / dashboard.js

diff --git a/web/dashboard.js b/web/dashboard.js
index a3d9edec8ebbda8451df6db7e48b66da08cc1f32..1dc57a1ac58a66dbe7efd63bd52a56011a4f429d 100644 (file)
--- a/web/dashboard.js
+++ b/web/dashboard.js
@@ -3375,9 +3375,9 @@
                 this.autoRefresh();
             })
         }
-        else {
-            console.log('auto-refresher nothing to do');
-        }
+        //else {
+        //    console.log('auto-refresher nothing to do');
+        //}
 
         // run the next refresh iteration
         setTimeout(NETDATA.chartRefresher,
@@ -5576,12 +5576,13 @@
     // Registry of netdata hosts
 
     NETDATA.alarms = {
+        server: null,
         current: null,
         callback: null,
 
         get: function(what, callback) {
             $.ajax({
-                url: NETDATA.serverDefault + '/api/v1/alarms?' + what.toString(),
+                url: NETDATA.alarms.server + '/api/v1/alarms?' + what.toString(),
                 async: true,
                 cache: false,
                 xhrFields: { withCredentials: true } // required for the cookie
@@ -5591,7 +5592,7 @@
                         callback(data);
                 })
                 .fail(function() {
-                    NETDATA.error(415, host);
+                    NETDATA.error(415, NETDATA.alarms.server);
 
                     if(typeof callback === 'function')
                         callback(null);
@@ -5601,6 +5602,15 @@
         update_forever: function() {
             NETDATA.alarms.get('active', function(data) {
                 if(data !== null) {
+                    if('Notification' in window && NETDATA.alarms.current != null) {
+                        if(Object.keys(NETDATA.alarms.current.alarms).length < Object.keys(data.alarms).length) {
+                            if (Notification.permission === 'granted') {
+                                new Notification('Netdata Alarm!', {body: 'Your Server needs attention!',
+                                    icon: 'images/seo-performance-128.png'});
+                            }
+                        }
+                    }
+
                     NETDATA.alarms.current = data;
 
                     if (typeof NETDATA.alarms.callback === 'function') {
@@ -5614,7 +5624,7 @@
 
         get_log: function(callback) {
             $.ajax({
-                url: NETDATA.serverDefault + '/api/v1/alarm_log',
+                url: NETDATA.alarms.server + '/api/v1/alarm_log',
                 async: true,
                 cache: false,
                 xhrFields: { withCredentials: true } // required for the cookie
@@ -5624,7 +5634,7 @@
                         callback(data);
                 })
                 .fail(function() {
-                    NETDATA.error(416, host);
+                    NETDATA.error(416, NETDATA.alarms.server);
 
                     if(typeof callback === 'function')
                         callback(null);
@@ -5632,7 +5642,15 @@
         },
 
         init: function() {
+            var host = NETDATA.serverDefault;
+            while(host.slice(-1) === '/')
+                host = host.substring(0, host.length - 1);
+            NETDATA.alarms.server = host;
+            
             NETDATA.alarms.update_forever();
+            if ('Notification' in window && Notification.permission === 'default') {
+                Notification.requestPermission();
+            }
         }
     };