From 7ae3814fb59043e1f3359738fb4392e18adda1b9 Mon Sep 17 00:00:00 2001 From: "Costa Tsaousis (ktsaou)" Date: Sat, 14 May 2016 18:07:37 +0300 Subject: [PATCH] default registry in HTTPS, delayed registry qeueries 3 seconds at the dashboard; added debugging for tracing impersonate --- src/registry.c | 10 +- web/dashboard.html | 2 +- web/dashboard.js | 2 +- web/demo.html | 84 +++++++------- web/demo2.html | 268 ++++++++++++++++++++++----------------------- web/demosites.html | 2 +- web/index.html | 5 +- web/tv.html | 2 +- 8 files changed, 191 insertions(+), 184 deletions(-) diff --git a/src/registry.c b/src/registry.c index 9a8737ed..fccad0a1 100644 --- 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 a3b41d39..2b6c8068 100644 --- 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 - + diff --git a/web/dashboard.js b/web/dashboard.js index 55e7b721..27847a24 100644 --- 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 b773bf43..4b91d839 100644 --- a/web/demo.html +++ b/web/demo.html @@ -1,42 +1,42 @@ - - - - NetData Dashboard - - - - - - - - - - - - - -
-
-
-
-
- - + + + + NetData Dashboard + + + + + + + + + + + + + +
+
+
+
+
+ + diff --git a/web/demo2.html b/web/demo2.html index d926b55d..9530d914 100644 --- a/web/demo2.html +++ b/web/demo2.html @@ -1,134 +1,134 @@ - - - - NetData Dashboard - - - - - - - - - - - - - - -
-
why netdata?
-
-
These charts visualize the same data...
- - - - - - -
-
- -
-
I can trace an issue like this
-
-
-
-
-
Can you trace an issue like these?
 
-
-
-
-
-
- -
-
I can trace an issue like this
-
-
-
-
-
Can you trace an issue like these?
 
-
-
-
-
-
-
Hover on the chart below, to see the selected value on the charts above!
-
-
- - + + + + NetData Dashboard + + + + + + + + + + + + + + +
+
why netdata?
+
+
These charts visualize the same data...
+ + + + + + +
+
+ +
+
I can trace an issue like this
+
+
+
+
+
Can you trace an issue like these?
 
+
+
+
+
+
+ +
+
I can trace an issue like this
+
+
+
+
+
Can you trace an issue like these?
 
+
+
+
+
+
+
Hover on the chart below, to see the selected value on the charts above!
+
+
+ + diff --git a/web/demosites.html b/web/demosites.html index 13b02e56..f5047f4b 100644 --- a/web/demosites.html +++ b/web/demosites.html @@ -42,7 +42,7 @@ and that you have chown it to be owned by netdata:netdata --> - + - + @@ -439,10 +439,12 @@
@@ -476,6 +478,7 @@ diff --git a/web/tv.html b/web/tv.html index 766cb7bc..58f08eb3 100644 --- a/web/tv.html +++ b/web/tv.html @@ -40,7 +40,7 @@ and that you have chown it to be owned by netdata:netdata --> - +