Merge remote-tracking branch 'upstream/master'

diff --git a/conf.d/health.d/softnet.conf b/conf.d/health.d/softnet.conf
index 9dbe8e5c459566d493dd3456deb754262610d749..719880bff8134d21f3884a19007a11dd72c81036 100644 (file)
--- a/conf.d/health.d/softnet.conf
+++ b/conf.d/health.d/softnet.conf
@@ -5,7 +5,7 @@
   lookup: sum -1h unaligned absolute of dropped
    units: packets
    every: 1m
-    warn: $this > 0
+    warn: $this > ( ($status >= $WARNING) ? (0) : (5) )
    delay: down 30m multiplier 1.5 max 1h
     info: number of packets dropped because sysctl net.core.netdev_max_backlog was exceeded (this can be a cause for dropped packets)
       to: sysadmin
@@ -15,7 +15,7 @@
   lookup: sum -1h unaligned absolute of squeezed
    units: events
    every: 1m
-    warn: $this > 0
+    warn: $this > ( ($status >= $WARNING) ? (0) : (5) )
    delay: down 30m multiplier 1.5 max 1h
     info: number of times ksoftirq ran out of sysctl net.core.netdev_budget or time slice, with work remaining (this can be a cause for dropped packets)
       to: sysadmin

diff --git a/configs.signatures b/configs.signatures
index 970ef11db698e82c29b1378ba9c558fa5ab959ea..1bc32e97215151e56f314e060abd8174a7d1f27e 100644 (file)
--- a/configs.signatures
+++ b/configs.signatures
@@ -131,6 +131,7 @@ declare -A configs_signatures=(
   ['1c12b678ab65f271a96da1bbd0a1ab1c']='health.d/softnet.conf'
   ['312b4b8e2805e19cf9be554b319567d6']='health.d/softnet.conf'
   ['565f11c38ae6bd5cc9d3c2adb542bc1b']='health.d/softnet.conf'
+  ['6398ef37a15cb6a0bc921f58948d2b39']='health.d/softnet.conf'
   ['a305b400378d6492efd15f9940c2779b']='health.d/softnet.conf'
   ['23ae815aefa221b1929f96752a1f7556']='health.d/squid.conf'
   ['3cc6255457d4cba881ae0554ae5d9190']='health.d/squid.conf'

diff --git a/web/index.html b/web/index.html
index 83101b45ef76f1f30256dc41e6abf9b2acfe1b65..c270826384727426d354bafe6df3f720fcd1175a 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -562,14 +562,23 @@
             var a1 = '';
             var found = 0;
 
+            if(machines_array === null) {
+                var ret = loadLocalStorage("registryCallback");
+                if(typeof ret !== 'undefined' && ret !== null) {
+                    machines_array = JSON.parse(ret);
+                    console.log("failed to contact the registry - loaded registry data from browser local storage");
+                }
+            }
+
             if(machines_array) {
-                function name_comparator_desc(a, b) {
+                saveLocalStorage("registryCallback", JSON.stringify(machines_array));
+
+                var machines = machines_array.sort(function (a, b) {
                     if (a.name > b.name) return -1;
                     if (a.name < b.name) return 1;
                     return 0;
-                }
+                });
 
-                var machines = machines_array.sort(name_comparator_desc);
                 var len = machines.length;
                 while(len--) {
                     var u = machines[len];