diff options
Diffstat (limited to 'daemon/buildinfo.c')
| -rw-r--r-- | daemon/buildinfo.c | 83 |
1 files changed, 44 insertions, 39 deletions
diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c index ebeaa996db..79036edf2a 100644 --- a/daemon/buildinfo.c +++ b/daemon/buildinfo.c @@ -9,13 +9,7 @@ #ifdef ENABLE_ACLK #define FEAT_CLOUD 1 #define FEAT_CLOUD_MSG "" -#ifdef ACLK_NG -#define ACLK_IMPL "Next Generation" -#else -#define ACLK_IMPL "Legacy" -#endif #else -#define ACLK_IMPL "" #ifdef DISABLE_CLOUD #define FEAT_CLOUD 0 #define FEAT_CLOUD_MSG "(by user request)" @@ -69,29 +63,29 @@ #define FEAT_LIBCAP 0 #endif -#ifndef ACLK_NG -#ifdef ACLK_NO_LIBMOSQ -#define FEAT_MOSQUITTO 0 -#else -#define FEAT_MOSQUITTO 1 -#endif - -#ifdef ACLK_NO_LWS -#define FEAT_LWS 0 -#define FEAT_LWS_MSG "" -#else -#ifdef ENABLE_ACLK -#include <libwebsockets.h> -#endif -#ifdef BUNDLED_LWS -#define FEAT_LWS 1 -#define FEAT_LWS_MSG "static" -#else -#define FEAT_LWS 1 -#define FEAT_LWS_MSG "shared-lib" -#endif -#endif -#endif /* ACLK_NG */ +#ifndef ACLK_LEGACY_DISABLED + #ifdef ACLK_NO_LIBMOSQ + #define FEAT_MOSQUITTO 0 + #else + #define FEAT_MOSQUITTO 1 + #endif + + #ifdef ACLK_NO_LWS + #define FEAT_LWS 0 + #define FEAT_LWS_MSG "" + #else + #ifdef ACLK_LEGACY + #include <libwebsockets.h> + #endif + #ifdef BUNDLED_LWS + #define FEAT_LWS 1 + #define FEAT_LWS_MSG "static" + #else + #define FEAT_LWS 1 + #define FEAT_LWS_MSG "shared-lib" + #endif + #endif +#endif /* ACLK_LEGACY_DISABLED */ #ifdef NETDATA_WITH_ZLIB #define FEAT_ZLIB 1 @@ -199,6 +193,18 @@ #define FEAT_REMOTE_WRITE 0 #endif +#ifdef ACLK_NG +#define FEAT_ACLK_NG 1 +#else +#define FEAT_ACLK_NG 0 +#endif + +#ifdef ACLK_LEGACY +#define FEAT_ACLK_LEGACY 1 +#else +#define FEAT_ACLK_LEGACY 0 +#endif + #define FEAT_YES_NO(x) ((x) ? "YES" : "NO") void print_build_info(void) { @@ -208,9 +214,8 @@ void print_build_info(void) { printf(" dbengine: %s\n", FEAT_YES_NO(FEAT_DBENGINE)); 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); -#if FEAT_CLOUD == 1 - printf(" Cloud Implementation: %s\n", ACLK_IMPL); -#endif + printf(" ACLK Next Generation: %s\n", FEAT_YES_NO(FEAT_ACLK_NG)); + printf(" ACLK Legacy: %s\n", FEAT_YES_NO(FEAT_ACLK_LEGACY)); printf(" TLS Host Verification: %s\n", FEAT_YES_NO(FEAT_TLS_HOST_VERIFY)); printf("Libraries:\n"); @@ -219,8 +224,8 @@ void print_build_info(void) { printf(" libcap: %s\n", FEAT_YES_NO(FEAT_LIBCAP)); printf(" libcrypto: %s\n", FEAT_YES_NO(FEAT_CRYPTO)); printf(" libm: %s\n", FEAT_YES_NO(FEAT_LIBM)); -#ifndef ACLK_NG -#if defined(ENABLE_ACLK) +#ifndef ACLK_LEGACY_DISABLED +#if defined(ACLK_LEGACY) printf(" LWS: %s %s v%d.%d.%d\n", FEAT_YES_NO(FEAT_LWS), FEAT_LWS_MSG, LWS_LIBRARY_VERSION_MAJOR, LWS_LIBRARY_VERSION_MINOR, LWS_LIBRARY_VERSION_PATCH); #else printf(" LWS: %s %s\n", FEAT_YES_NO(FEAT_LWS), FEAT_LWS_MSG); @@ -266,9 +271,9 @@ void print_build_info_json(void) { #else printf(" \"cloud-disabled\": false,\n"); #endif -#if FEAT_CLOUD == 1 - printf(" \"cloud-implementation\": \"%s\",\n", ACLK_IMPL); -#endif + printf(" \"aclk-ng\": \"%s\",\n", FEAT_JSON_BOOL(FEAT_ACLK_NG)); + printf(" \"aclk-legacy\": \"%s\",\n", FEAT_JSON_BOOL(FEAT_ACLK_LEGACY)); + printf(" \"tls-host-verify\": %s\n", FEAT_JSON_BOOL(FEAT_TLS_HOST_VERIFY)); printf(" },\n"); @@ -328,8 +333,8 @@ void analytics_build_info(BUFFER *b) { if(FEAT_CRYPTO) buffer_strcat (b, "|libcrypto"); if(FEAT_LIBM) buffer_strcat (b, "|libm"); -#ifndef ACLK_NG -#if defined(ENABLE_ACLK) +#ifndef ACLK_LEGACY_DISABLED +#if defined(ENABLE_ACLK) && defined(ACLK_LEGACY) { char buf[20]; snprintfz(buf, 19, "|LWS v%d.%d.%d", LWS_LIBRARY_VERSION_MAJOR, LWS_LIBRARY_VERSION_MINOR, LWS_LIBRARY_VERSION_PATCH); |