]> arthur.barton.de Git - netdata.git/commitdiff
projects / netdata.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 528810c)
default registry in HTTPS, delayed registry qeueries 3 seconds at the dashboard;...
authorCosta Tsaousis (ktsaou) <costa@tsaousis.gr>
Sat, 14 May 2016 15:07:37 +0000 (18:07 +0300)
committerCosta Tsaousis (ktsaou) <costa@tsaousis.gr>
Sat, 14 May 2016 15:07:37 +0000 (18:07 +0300)
src/registry.c patch | blob | history
web/dashboard.html patch | blob | history
web/dashboard.js patch | blob | history
web/demo.html patch | blob | history
web/demo2.html patch | blob | history
web/demosites.html patch | blob | history
web/index.html patch | blob | history
web/tv.html patch | blob | history

diff --git a/src/registry.c b/src/registry.c
index 9a8737ed0c48e22f571d06aa04cedd943b92fa68..fccad0a1fcf6d76fce23eaa2e3fdadc6c5da3e18 100644 (file)
--- a/src/registry.c
+++ b/src/registry.c
@@ -1174,10 +1174,14 @@ int registry_person_url_callback_verify_machine_exists(void *entry, void *machin
        PERSON_URL *pu = (PERSON_URL *)entry;
        MACHINE *m = (MACHINE *)machine;
 
-       if(pu->machine == m)
+       if(pu->machine == m) {
+               info("registry_person_url_callback_verify_machine_exists('%s', '%s'): no", pu->machine->guid, m->guid);
                return 1;
-       else
+       }
+       else {
+               info("registry_person_url_callback_verify_machine_exists('%s', '%s'): yes", pu->machine->guid, m->guid);
                return 0;
+       }
 }
 
 // the main method for switching user identity
@@ -1648,7 +1652,7 @@ int registry_init(void) {
        registry.save_registry_every_entries = config_get_number("registry", "registry save db every new entries", 1000000);
        registry.persons_expiration = config_get_number("registry", "registry expire idle persons days", 365) * 86400;
        registry.registry_domain = config_get("registry", "registry domain", "");
-       registry.registry_to_announce = config_get("registry", "registry to announce", "//registry.my-netdata.io");
+       registry.registry_to_announce = config_get("registry", "registry to announce", "https://registry.my-netdata.io");
        registry.hostname = config_get("registry", "registry hostname", config_get("global", "hostname", hostname));
 
        registry.max_url_length = config_get_number("registry", "max URL length", 1024);
diff --git a/web/dashboard.html b/web/dashboard.html
index a3b41d39b18ee596405fe611c913e905d92ddc70..2b6c80684512df1839fa120c95a0e318401dab94 100644 (file)
--- a/web/dashboard.html
+++ b/web/dashboard.html
@@ -646,4 +646,4 @@ So, to avoid flashing the charts, we destroy and re-create the charts on each up
        <!-- <script> netdataServer = "http://box:19999"; </script> -->
 
        <!-- load the dashboard manager - it will do the rest -->
-       <script type="text/javascript" src="dashboard.js?v36"></script>
+       <script type="text/javascript" src="dashboard.js?v37"></script>
diff --git a/web/dashboard.js b/web/dashboard.js
index 55e7b72156d6b58c8b166b6baa6f94b28993051e..27847a243f443a0de84dbcac0f1f2e21579ac4b4 100644 (file)
--- a/web/dashboard.js
+++ b/web/dashboard.js
@@ -3392,7 +3392,7 @@
                NETDATA.parseDom(NETDATA.chartRefresher);
 
                // Registry initialization
-               setTimeout(NETDATA.registry.init, 1000);
+               setTimeout(NETDATA.registry.init, 3000);
        };
 
        // ----------------------------------------------------------------------------------------------------------------
diff --git a/web/demo.html b/web/demo.html
index b773bf43d285110a2d940d62cd3b5618642c2ec3..4b91d83940e227762a43f92e5ac669abe59c30bc 100644 (file)
--- a/web/demo.html
+++ b/web/demo.html
@@ -1,42 +1,42 @@
-<!DOCTYPE html>\r
-<html lang="en">\r
-<head>\r
-       <title>NetData Dashboard</title>\r
-\r
-       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\r
-       <meta charset="utf-8">\r
-       <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">\r
-       <meta name="viewport" content="width=device-width, initial-scale=1">\r
-       <meta name="apple-mobile-web-app-capable" content="yes">\r
-       <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">\r
-       <meta name="author" content="costa@tsaousis.gr">\r
-\r
-       <script type="text/javascript" src="dashboard.js?v36"></script>\r
-</head>\r
-<body>\r
-\r
-<div style="width: 100%; text-align: center;">\r
-       <div data-netdata="netdata.server_cpu"\r
-                       data-dimensions="user"\r
-                       data-chart-library="gauge"\r
-                       data-width="150px"\r
-                       data-after="-60"\r
-                       data-points="60"\r
-                       data-title="Yes! Realtime!"\r
-                       data-units="I am alive!"\r
-                       data-colors="#FF5555"\r
-                       ></div>\r
-       <br/>\r
-       <div data-netdata="netdata.server_cpu"\r
-                       data-dimensions="user"\r
-                       data-chart-library="dygraph"\r
-                       data-dygraph-theme="sparkline"\r
-                       data-width="200px"\r
-                       data-height="30px"\r
-                       data-after="-60"\r
-                       data-points="60"\r
-                       data-colors="#FF5555"\r
-                       ></div>\r
-</div>\r
-</body>\r
-</html>\r
+<!DOCTYPE html>
+<html lang="en">
+<head>
+       <title>NetData Dashboard</title>
+
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+       <meta charset="utf-8">
+       <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+       <meta name="viewport" content="width=device-width, initial-scale=1">
+       <meta name="apple-mobile-web-app-capable" content="yes">
+       <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+       <meta name="author" content="costa@tsaousis.gr">
+
+       <script type="text/javascript" src="dashboard.js?v37"></script>
+</head>
+<body>
+
+<div style="width: 100%; text-align: center;">
+       <div data-netdata="netdata.server_cpu"
+                       data-dimensions="user"
+                       data-chart-library="gauge"
+                       data-width="150px"
+                       data-after="-60"
+                       data-points="60"
+                       data-title="Yes! Realtime!"
+                       data-units="I am alive!"
+                       data-colors="#FF5555"
+                       ></div>
+       <br/>
+       <div data-netdata="netdata.server_cpu"
+                       data-dimensions="user"
+                       data-chart-library="dygraph"
+                       data-dygraph-theme="sparkline"
+                       data-width="200px"
+                       data-height="30px"
+                       data-after="-60"
+                       data-points="60"
+                       data-colors="#FF5555"
+                       ></div>
+</div>
+</body>
+</html>
diff --git a/web/demo2.html b/web/demo2.html
index d926b55d5ca6379728794267953b9e7d8f38e7dd..9530d914e44bb432238841d75e16d03c6b5b268f 100644 (file)
--- a/web/demo2.html
+++ b/web/demo2.html
@@ -1,134 +1,134 @@
-<!DOCTYPE html>\r
-<html lang="en">\r
-<head>\r
-       <title>NetData Dashboard</title>\r
-\r
-       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\r
-       <meta charset="utf-8">\r
-       <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">\r
-       <meta name="viewport" content="width=device-width, initial-scale=1">\r
-       <meta name="apple-mobile-web-app-capable" content="yes">\r
-       <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">\r
-       <meta name="author" content="costa@tsaousis.gr">\r
-\r
-       <script>var netdataTheme = 'slate';</script>\r
-       <script type="text/javascript" src="dashboard.js?v36"></script>\r
-</head>\r
-<body>\r
-\r
-<div class="container" style="width: 90%; padding-top: 10px; text-align: center; color: #AAA">\r
-       <div style="font-size: 7vw;">why netdata?</div>\r
-       <br/>\r
-       <div style="font-size: 2vw; color: white;">These charts visualize the same data...</div>\r
-\r
-\r
-       <!-- Nav tabs -->\r
-       <ul class="nav nav-tabs" role="tablist">\r
-               <li role="presentation" class="active"><a href="#gauge" aria-controls="gauge" role="tab" data-toggle="tab">Gauge.js</a></li>\r
-               <li role="presentation"><a href="#easypiechart" aria-controls="easypiechart" role="tab" data-toggle="tab">Easy Pie Chart</a></li>\r
-       </ul>\r
-\r
-       <!-- Tab panes -->\r
-       <div class="tab-content">\r
-               <div role="tabpanel" class="tab-pane active" id="gauge">\r
-\r
-                       <div style="display: inline-block; width: 35.8%">\r
-                               <div style="font-size: 1.2vw; color: #666; padding-top: 10px;"><i class="fa fa-comment"></i> I can trace an issue like this</div>\r
-                               <br/>\r
-                               <div data-netdata="example.random2"\r
-                                               data-dimensions="random"\r
-                                               data-chart-library="gauge"\r
-                                               data-gauge-max-value="32767"\r
-                                               data-width="100%"\r
-                                               data-after="-600"\r
-                                               data-points="600"\r
-                                               data-title="1/second (netdata&nbsp;default)"\r
-                                               data-units="important metric"\r
-                                               data-colors="#5A5"\r
-                                               ></div>\r
-                       </div>\r
-                       <div style="display: inline-block; width: 50%">\r
-                               <div style="font-size: 1.2vw; color: #666;"><i class="fa fa-comment"></i> Can you trace an issue like these?<br/>&nbsp;<br/></div>\r
-                               <div data-netdata="example.random2"\r
-                                               data-dimensions="random"\r
-                                               data-chart-library="gauge"\r
-                                               data-gauge-max-value="32767"\r
-                                               data-width="45%"\r
-                                               data-after="-600"\r
-                                               data-points="40"\r
-                                               data-title="Updates Every 15&nbsp;Sec"\r
-                                               data-units="important metric"\r
-                                               data-colors="#C55"\r
-                                               ></div>\r
-                               <div data-netdata="example.random2"\r
-                                               data-dimensions="random"\r
-                                               data-chart-library="gauge"\r
-                                               data-gauge-max-value="32767"\r
-                                               data-width="45%"\r
-                                               data-after="-600"\r
-                                               data-points="2"\r
-                                               data-title="Updates Every 5&nbsp;Mins"\r
-                                               data-units="important metric"\r
-                                               data-colors="#C55"\r
-                                               ></div>\r
-                       </div>\r
-               </div>\r
-               <div role="tabpanel" class="tab-pane" id="easypiechart">\r
-\r
-                       <div style="display: inline-block; width: 25%">\r
-                               <div style="font-size: 1.2vw; color: #666; padding-top: 10px;"><i class="fa fa-comment"></i> I can trace an issue like this</div>\r
-                               <br/>\r
-                               <div data-netdata="example.random2"\r
-                                               data-dimensions="random"\r
-                                               data-chart-library="easypiechart"\r
-                                               data-easypiechart-max-value="32767"\r
-                                               data-width="100%"\r
-                                               data-after="-600"\r
-                                               data-points="600"\r
-                                               data-title="1/second (netdata&nbsp;default)"\r
-                                               data-units="important metric"\r
-                                               data-colors="#5A5"\r
-                                               ></div>\r
-                       </div>\r
-                       <div style="display: inline-block; width: 40%">\r
-                               <div style="font-size: 1.2vw; color: #666;"><i class="fa fa-comment"></i> Can you trace an issue like these?<br/>&nbsp;<br/></div>\r
-                               <div data-netdata="example.random2"\r
-                                               data-dimensions="random"\r
-                                               data-chart-library="easypiechart"\r
-                                               data-easypiechart-max-value="32767"\r
-                                               data-width="45%"\r
-                                               data-after="-600"\r
-                                               data-points="40"\r
-                                               data-title="Updates Every 15&nbsp;Sec&nbsp;(<a href='https://github.com/OpenTSDB/opentsdb.net/blob/gh-pages/docs/source/user_guide/utilities/tcollector.rst#collecting-lots-of-metrics-with-tcollector' target='_blank'>OpenTSDB</a>)"\r
-                                               data-units="important metric"\r
-                                               data-colors="#C55"\r
-                                               ></div>\r
-                               <div data-netdata="example.random2"\r
-                                               data-dimensions="random"\r
-                                               data-chart-library="easypiechart"\r
-                                               data-easypiechart-max-value="32767"\r
-                                               data-width="45%"\r
-                                               data-after="-600"\r
-                                               data-points="2"\r
-                                               data-title="Updates Every 5&nbsp;Mins&nbsp;(your&nbsp;NMS)"\r
-                                               data-units="important metric"\r
-                                               data-colors="#C55"\r
-                                               ></div>\r
-                       </div>\r
-               </div>\r
-       </div>\r
-       <div style="font-size: 1.5vw;">Hover on the chart below, to see the selected value on the charts above!</div>\r
-       <div data-netdata="example.random2"\r
-                       data-dimensions="random"\r
-                       data-dygraph-theme="sparkline"\r
-                       data-width="100%"\r
-                       data-height="20vh"\r
-                       data-after="-600"\r
-                       data-points="600"\r
-                       data-title="1/second (netdata&nbsp;default)"\r
-                       data-units="something"\r
-                       data-colors="#888"\r
-                       ></div>\r
-</div>\r
-</body>\r
-</html>\r
+<!DOCTYPE html>
+<html lang="en">
+<head>
+       <title>NetData Dashboard</title>
+
+       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+       <meta charset="utf-8">
+       <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+       <meta name="viewport" content="width=device-width, initial-scale=1">
+       <meta name="apple-mobile-web-app-capable" content="yes">
+       <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+       <meta name="author" content="costa@tsaousis.gr">
+
+       <script>var netdataTheme = 'slate';</script>
+       <script type="text/javascript" src="dashboard.js?v37"></script>
+</head>
+<body>
+
+<div class="container" style="width: 90%; padding-top: 10px; text-align: center; color: #AAA">
+       <div style="font-size: 7vw;">why netdata?</div>
+       <br/>
+       <div style="font-size: 2vw; color: white;">These charts visualize the same data...</div>
+
+
+       <!-- Nav tabs -->
+       <ul class="nav nav-tabs" role="tablist">
+               <li role="presentation" class="active"><a href="#gauge" aria-controls="gauge" role="tab" data-toggle="tab">Gauge.js</a></li>
+               <li role="presentation"><a href="#easypiechart" aria-controls="easypiechart" role="tab" data-toggle="tab">Easy Pie Chart</a></li>
+       </ul>
+
+       <!-- Tab panes -->
+       <div class="tab-content">
+               <div role="tabpanel" class="tab-pane active" id="gauge">
+
+                       <div style="display: inline-block; width: 35.8%">
+                               <div style="font-size: 1.2vw; color: #666; padding-top: 10px;"><i class="fa fa-comment"></i> I can trace an issue like this</div>
+                               <br/>
+                               <div data-netdata="example.random2"
+                                               data-dimensions="random"
+                                               data-chart-library="gauge"
+                                               data-gauge-max-value="32767"
+                                               data-width="100%"
+                                               data-after="-600"
+                                               data-points="600"
+                                               data-title="1/second (netdata&nbsp;default)"
+                                               data-units="important metric"
+                                               data-colors="#5A5"
+                                               ></div>
+                       </div>
+                       <div style="display: inline-block; width: 50%">
+                               <div style="font-size: 1.2vw; color: #666;"><i class="fa fa-comment"></i> Can you trace an issue like these?<br/>&nbsp;<br/></div>
+                               <div data-netdata="example.random2"
+                                               data-dimensions="random"
+                                               data-chart-library="gauge"
+                                               data-gauge-max-value="32767"
+                                               data-width="45%"
+                                               data-after="-600"
+                                               data-points="40"
+                                               data-title="Updates Every 15&nbsp;Sec"
+                                               data-units="important metric"
+                                               data-colors="#C55"
+                                               ></div>
+                               <div data-netdata="example.random2"
+                                               data-dimensions="random"
+                                               data-chart-library="gauge"
+                                               data-gauge-max-value="32767"
+                                               data-width="45%"
+                                               data-after="-600"
+                                               data-points="2"
+                                               data-title="Updates Every 5&nbsp;Mins"
+                                               data-units="important metric"
+                                               data-colors="#C55"
+                                               ></div>
+                       </div>
+               </div>
+               <div role="tabpanel" class="tab-pane" id="easypiechart">
+
+                       <div style="display: inline-block; width: 25%">
+                               <div style="font-size: 1.2vw; color: #666; padding-top: 10px;"><i class="fa fa-comment"></i> I can trace an issue like this</div>
+                               <br/>
+                               <div data-netdata="example.random2"
+                                               data-dimensions="random"
+                                               data-chart-library="easypiechart"
+                                               data-easypiechart-max-value="32767"
+                                               data-width="100%"
+                                               data-after="-600"
+                                               data-points="600"
+                                               data-title="1/second (netdata&nbsp;default)"
+                                               data-units="important metric"
+                                               data-colors="#5A5"
+                                               ></div>
+                       </div>
+                       <div style="display: inline-block; width: 40%">
+                               <div style="font-size: 1.2vw; color: #666;"><i class="fa fa-comment"></i> Can you trace an issue like these?<br/>&nbsp;<br/></div>
+                               <div data-netdata="example.random2"
+                                               data-dimensions="random"
+                                               data-chart-library="easypiechart"
+                                               data-easypiechart-max-value="32767"
+                                               data-width="45%"
+                                               data-after="-600"
+                                               data-points="40"
+                                               data-title="Updates Every 15&nbsp;Sec&nbsp;(<a href='https://github.com/OpenTSDB/opentsdb.net/blob/gh-pages/docs/source/user_guide/utilities/tcollector.rst#collecting-lots-of-metrics-with-tcollector' target='_blank'>OpenTSDB</a>)"
+                                               data-units="important metric"
+                                               data-colors="#C55"
+                                               ></div>
+                               <div data-netdata="example.random2"
+                                               data-dimensions="random"
+                                               data-chart-library="easypiechart"
+                                               data-easypiechart-max-value="32767"
+                                               data-width="45%"
+                                               data-after="-600"
+                                               data-points="2"
+                                               data-title="Updates Every 5&nbsp;Mins&nbsp;(your&nbsp;NMS)"
+                                               data-units="important metric"
+                                               data-colors="#C55"
+                                               ></div>
+                       </div>
+               </div>
+       </div>
+       <div style="font-size: 1.5vw;">Hover on the chart below, to see the selected value on the charts above!</div>
+       <div data-netdata="example.random2"
+                       data-dimensions="random"
+                       data-dygraph-theme="sparkline"
+                       data-width="100%"
+                       data-height="20vh"
+                       data-after="-600"
+                       data-points="600"
+                       data-title="1/second (netdata&nbsp;default)"
+                       data-units="something"
+                       data-colors="#888"
+                       ></div>
+</div>
+</body>
+</html>
diff --git a/web/demosites.html b/web/demosites.html
index 13b02e564d9b6ce3b7fe9f89a8c376b192ded583..f5047f4b2492d7b9bb6b11cb2af0c515081b1b83 100644 (file)
--- a/web/demosites.html
+++ b/web/demosites.html
@@ -42,7 +42,7 @@
                and that you have chown it to be owned by netdata:netdata
        -->
        <!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
-       <script type="text/javascript" src="dashboard.js?v36"></script>
+       <script type="text/javascript" src="dashboard.js?v37"></script>
 
        <script>
        // --- OPTIONS FOR THE CHARTS --
diff --git a/web/index.html b/web/index.html
index 7e92196f733ea1aa87be5c35349c121847f078c6..9cc2b4bbed89f366d14e682ecb914666ab19f02f 100644 (file)
--- a/web/index.html
+++ b/web/index.html
@@ -425,7 +425,7 @@
        </script>
 
        <!-- load the dashboard manager - it will do the rest -->
-       <script type="text/javascript" src="dashboard.js?v36"></script>
+       <script type="text/javascript" src="dashboard.js?v37"></script>
 </head>
 
 <body data-spy="scroll" data-target="#sidebar">
@@ -439,10 +439,12 @@
                                                        <div class="row">
                                                                <div class="col-sm-6" style="width: 85%; padding-right: 0;">
                                                                        <ul id="mynetdata_servers" class="multi-column-dropdown">
+                                                                               <li><a href="#" onclck="return false;" style="color: #999;">loading...</a></li>
                                                                        </ul>
                                                                </div>
                                                                <div class="col-sm-3 hidden-xs" style="width: 15%; padding-left: 0;">
                                                                        <ul id="mynetdata_actions1" class="multi-column-dropdown">
+                                                                       <li style="color: #999;">&nbsp;</li>
                                                                        </ul>
                                                                </div>
                                                        </div>
@@ -476,6 +478,7 @@
                                        <li class="dropdown hidden-sm hidden-md hidden-lg">
                                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="current_view">my-netdata <strong class="caret"></strong></a>
                                                <ul id="mynetdata_servers2" class="dropdown-menu scrollable-menu inpagemenu" role="menu">
+                                                       <li><a href="#" onclck="return false;" style="color: #999;">loading...</a></li>
                                                </ul>
                                        </li>
                                </ul>
diff --git a/web/tv.html b/web/tv.html
index 766cb7bc7c84b6fc93c0fc7d1f97e3b4543e3643..58f08eb396b64f779567305840e1ca467e13b19f 100644 (file)
--- a/web/tv.html
+++ b/web/tv.html
@@ -40,7 +40,7 @@
                and that you have chown it to be owned by netdata:netdata
        -->
        <!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
-       <script type="text/javascript" src="dashboard.js?v36"></script>
+       <script type="text/javascript" src="dashboard.js?v37"></script>
 
        <script>
        // Set options for TV operation
NetData