diff options
Diffstat (limited to 'daemon')
-rw-r--r-- | daemon/analytics.c | 9 | ||||
-rw-r--r-- | daemon/buildinfo.c | 15 | ||||
-rw-r--r-- | daemon/main.c | 2 | ||||
-rw-r--r-- | daemon/static_threads.c | 2 |
4 files changed, 7 insertions, 21 deletions
diff --git a/daemon/analytics.c b/daemon/analytics.c index 5abb1b901d..69f6fe4c2d 100644 --- a/daemon/analytics.c +++ b/daemon/analytics.c @@ -7,7 +7,7 @@ struct analytics_data analytics_data; extern void analytics_exporting_connectors (BUFFER *b); extern void analytics_exporting_connectors_ssl (BUFFER *b); extern void analytics_build_info (BUFFER *b); -extern int aclk_connected, aclk_use_new_cloud_arch; +extern int aclk_connected; struct collector { char *plugin; @@ -499,12 +499,7 @@ void analytics_aclk(void) #ifdef ENABLE_ACLK if (aclk_connected) { analytics_set_data(&analytics_data.netdata_host_aclk_available, "true"); -#ifdef ENABLE_NEW_CLOUD_PROTOCOL - if (aclk_use_new_cloud_arch) - analytics_set_data_str(&analytics_data.netdata_host_aclk_protocol, "New"); - else -#endif - analytics_set_data_str(&analytics_data.netdata_host_aclk_protocol, "Legacy"); + analytics_set_data_str(&analytics_data.netdata_host_aclk_protocol, "New"); } else #endif diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c index 86c586afcb..0a64547af0 100644 --- a/daemon/buildinfo.c +++ b/daemon/buildinfo.c @@ -20,12 +20,6 @@ #endif #endif -#ifdef ENABLE_NEW_CLOUD_PROTOCOL -#define NEW_CLOUD_PROTO 1 -#else -#define NEW_CLOUD_PROTO 0 -#endif - #ifdef ENABLE_DBENGINE #define FEAT_DBENGINE 1 #else @@ -273,7 +267,7 @@ void print_build_info(void) { printf(" Native HTTPS: %s\n", FEAT_YES_NO(FEAT_NATIVE_HTTPS)); printf(" Netdata Cloud: %s %s\n", FEAT_YES_NO(FEAT_CLOUD), FEAT_CLOUD_MSG); printf(" ACLK Next Generation: %s\n", FEAT_YES_NO(FEAT_CLOUD)); - printf(" ACLK-NG New Cloud Protocol: %s\n", FEAT_YES_NO(NEW_CLOUD_PROTO)); + printf(" ACLK-NG New Cloud Protocol: %s\n", FEAT_YES_NO(1)); printf(" ACLK Legacy: %s\n", FEAT_YES_NO(0)); printf(" TLS Host Verification: %s\n", FEAT_YES_NO(FEAT_TLS_HOST_VERIFY)); printf(" Machine Learning: %s\n", FEAT_YES_NO(FEAT_ML)); @@ -325,7 +319,7 @@ void print_build_info_json(void) { printf(" \"cloud-disabled\": false,\n"); #endif printf(" \"aclk-ng\": %s,\n", FEAT_JSON_BOOL(FEAT_CLOUD)); - printf(" \"aclk-ng-new-cloud-proto\": %s,\n", FEAT_JSON_BOOL(NEW_CLOUD_PROTO)); + printf(" \"aclk-ng-new-cloud-proto\": %s,\n", FEAT_JSON_BOOL(1)); printf(" \"aclk-legacy\": %s,\n", FEAT_JSON_BOOL(0)); printf(" \"tls-host-verify\": %s,\n", FEAT_JSON_BOOL(FEAT_TLS_HOST_VERIFY)); @@ -383,10 +377,7 @@ void analytics_build_info(BUFFER *b) { add_to_bi(b, "Native HTTPS"); #endif #ifdef ENABLE_ACLK - add_to_bi(b, "Netdata Cloud|ACLK Next Generation"); -#endif -#ifdef ENABLE_NEW_CLOUD_PROTOCOL - add_to_bi(b, "New Cloud Protocol Support"); + add_to_bi(b, "Netdata Cloud|ACLK Next Generation|New Cloud Protocol Support"); #endif #if (FEAT_TLS_HOST_VERIFY!=0) add_to_bi(b, "TLS Host Verification"); diff --git a/daemon/main.c b/daemon/main.c index 35f2c189e4..d800424193 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -47,7 +47,7 @@ void netdata_cleanup_and_exit(int ret) { // stop everything info("EXIT: stopping static threads..."); -#ifdef ENABLE_NEW_CLOUD_PROTOCOL +#ifdef ENABLE_ACLK aclk_sync_exit_all(); #endif cancel_main_threads(); diff --git a/daemon/static_threads.c b/daemon/static_threads.c index c07473bd67..0ac76b9fdf 100644 --- a/daemon/static_threads.c +++ b/daemon/static_threads.c @@ -123,7 +123,7 @@ const struct netdata_static_thread static_threads_common[] = { .start_routine = socket_listen_main_static_threaded }, -#if defined(ENABLE_ACLK) || defined(ACLK_NG) +#ifdef ENABLE_ACLK { .name = "ACLK_Main", .config_section = NULL, |