faster linking from registry to server on alarm clicks

diff --git a/web/dashboard.js b/web/dashboard.js
index 1365ab0f828a234baa7068cf865d81aeca1c53ec..eb8011d03a0a971a82939ba79195126fba417023 100644 (file)
--- a/web/dashboard.js
+++ b/web/dashboard.js
@@ -18,6 +18,8 @@
 // var netdataShowHelp = false;         // enable/disable help (default enabled)
 // var netdataShowAlarms = true;        // enable/disable alarms checks and notifications (default disabled)
 //
+// var netdataRegistryAfterMs = 1500    // the time to consult to registry on startup
+//
 // You can also set the default netdata server, using the following.
 // When this variable is not set, we assume the page is hosted on your
 // netdata server already.
@@ -175,6 +177,9 @@
     if(typeof netdataShowAlarms === 'undefined')
         netdataShowAlarms = false;
 
+    if(typeof netdataRegistryAfterMs !== 'number' || netdataRegistryAfterMs < 0)
+        netdataRegistryAfterMs = 1500;
+
     if(typeof netdataRegistry === 'undefined') {
         // backward compatibility
         if(typeof netdataNoRegistry !== 'undefined' && netdataNoRegistry === false)
@@ -3461,7 +3466,7 @@
         setTimeout(NETDATA.alarms.init, 1000);
 
         // Registry initialization
-        setTimeout(NETDATA.registry.init, 1500);
+        setTimeout(NETDATA.registry.init, netdataRegistryAfterMs);
     };
 
     // ----------------------------------------------------------------------------------------------------------------

diff --git a/web/goto-host-from-alarm.html b/web/goto-host-from-alarm.html
index e95d9d189409f051110f344373d515b22eddcadd..e993a226039607e4cd9cdba3dfb5babec9be7f58 100755 (executable)
--- a/web/goto-host-from-alarm.html
+++ b/web/goto-host-from-alarm.html
@@ -13,10 +13,11 @@
 
     <script>
         var netdataRegistry = true;
+        var netdataRegistryAfterMs = 0;
         var netdataTheme = 'slate';
         var netdataShowHelp = true;
     </script>
-    <script type="text/javascript" src="dashboard.js?v46"></script>
+    <script type="text/javascript" src="dashboard.js?v47"></script>
 
     <script>
     var urlOptions = {
@@ -41,15 +42,21 @@
             if(urlOptions.hasProperty(p[0]) && typeof p[1] !== 'undefined')
                 urlOptions[p[0]] = decodeURIComponent(p[1]);
         }
+
+        if(typeof urlOptions.family !== 'string')
+            urlOptions.family = '';
+
+        if(typeof urlOptions.chart !== 'string')
+            urlOptions.chart = '';
     }
 
     function netdataURL(url) {
         return url + '#top'
             + ';nowelcome=1'
-            + ';show_alarms=1'
-            + ';chart=' + encodeURIComponent(urlOptions.chart.toString())
-            + ';family=' + encodeURIComponent(urlOptions.family.toString())
-            + ';alarm=' + encodeURIComponent(urlOptions.alarm.toString())
+            // + ';show_alarms=1'
+            + ';chart=' + encodeURIComponent(urlOptions.chart)
+            + ';family=' + encodeURIComponent(urlOptions.family)
+            + ';alarm=' + encodeURIComponent(urlOptions.alarm)
             + ';alarm_unique_id=' + urlOptions.alarm_unique_id.toString()
             + ';alarm_id=' + urlOptions.alarm_id.toString()
             + ';alarm_event_id=' + urlOptions.alarm_event_id.toString()
@@ -115,6 +122,11 @@
     }
 
     var netdataRegistryCallback = function(machines_array) {
+        if(typeof urlOptions.host !== 'string') {
+            document.getElementById('bodylog').innerHTML = "Sorry... bad request.";
+            return;
+        }
+
         document.getElementById('message').innerHTML = 'These are the URLs this machine is known:';
 
         if(document.location.toString().startsWith('https://'))
@@ -137,15 +149,6 @@
     };
 
     netdataQueryParse();
-
-    if(typeof urlOptions.host !== 'string')
-        document.getElementById('bodylog').innerHTML = "Sorry... bad request.";
-
-    if(typeof urlOptions.family !== 'string')
-        urlOptions.family = '';
-
-    if(typeof urlOptions.chart !== 'string')
-        urlOptions.chart = '';
     </script>
 
 </head>

diff --git a/web/index.html b/web/index.html
index a1f4ce49edb8afb8bb691d863b1cddf569610f0e..8b1b3a8c1af587c5eae09387f3e4e4a22bcfe29c 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -613,7 +613,7 @@
     </script>
 
     <!-- load the dashboard manager - it will do the rest -->
-    <script type="text/javascript" src="dashboard.js?v46"></script>
+    <script type="text/javascript" src="dashboard.js?v47"></script>
 </head>
 <body data-spy="scroll" data-target="#sidebar">
     <div id="loadOverlay" class="loadOverlay" style="background-color: #888; color: #888;">