@cryptotaxi247 / netdata-1 / commits / efc5932b1

Fix local dashboard cloud links (#13953)

* fix kickstart message * workaround for agent UI

Timotej S committed Nov 7, 2022 at 19:40 UTC efc5932b13d4d28aa610c9a18af70e338b1f9665
3 files changed +6 -3
libnetdata/libnetdata.h
+1
@@ -458,6 +458,7 @@ extern char *netdata_configured_host_prefix;
458
459 // BEWARE: Outside of the C code this also exists in alarm-notify.sh
460 #define DEFAULT_CLOUD_BASE_URL "https://api.netdata.cloud"
461 +#define DEFAULT_CLOUD_UI_URL "https://app.netdata.cloud"
462
463 #define RRD_STORAGE_TIERS 5
464
packaging/installer/kickstart.sh
+2 -2
@@ -27,7 +27,7 @@ KICKSTART_SOURCE="$(
27 )"
28 PACKAGES_SCRIPT="https://raw.githubusercontent.com/netdata/netdata/master/packaging/installer/install-required-packages.sh"
29 PATH="${PATH}:/usr/local/bin:/usr/local/sbin"
30 -PUBLIC_CLOUD_URL="https://api.netdata.cloud"
30 +PUBLIC_CLOUD_URL="https://app.netdata.cloud"
31 REPOCONFIG_URL_PREFIX="https://packagecloud.io/netdata/netdata-repoconfig/packages"
32 REPOCONFIG_VERSION="1-2"
33 START_TIME="$(date +%s)"
@@ -43,7 +43,7 @@ INSTALL_TYPE="unknown"
43 INSTALL_PREFIX=""
44 NETDATA_AUTO_UPDATES="default"
45 NETDATA_CLAIM_ONLY=0
46 -NETDATA_CLAIM_URL="${PUBLIC_CLOUD_URL}"
46 +NETDATA_CLAIM_URL="api.netdata.cloud"
47 NETDATA_COMMAND="default"
48 NETDATA_DISABLE_CLOUD=0
49 NETDATA_ONLY_BUILD=0
registry/registry.c
+3 -1
@@ -164,10 +164,12 @@ void registry_update_cloud_base_url()
164 int registry_request_hello_json(RRDHOST *host, struct web_client *w) {
165 registry_json_header(host, w, "hello", REGISTRY_STATUS_OK);
166
167 + const char *cloud_ui_url = appconfig_get(&cloud_config, CONFIG_SECTION_GLOBAL, "cloud ui url", DEFAULT_CLOUD_UI_URL);
168 +
169 buffer_sprintf(w->response.data,
170 ",\n\t\"registry\": \"%s\",\n\t\"cloud_base_url\": \"%s\",\n\t\"anonymous_statistics\": %s",
171 registry.registry_to_announce,
170 - registry.cloud_base_url, netdata_anonymous_statistics_enabled?"true":"false");
172 + cloud_ui_url, netdata_anonymous_statistics_enabled?"true":"false");
173
174 registry_json_footer(w);
175 return 200;