From d2219a879be160313c17660c70dad7ed7b333e05 Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" Date: Fri, 26 Apr 2024 11:09:16 +0300 Subject: [PATCH 1/2] Remove pointless ENABLE_ACLK/ENABLE_CLOUD split. This is a holdover from years ago when we had multiple versions of the agent-cloud link in our code. These days, everything in the code cares only about ENABLE_ACLK, and ENABLE_CLOUD is just used in the claiming script. --- CMakeLists.txt | 21 ++++++++------------- packaging/cmake/config.cmake.h.in | 1 - src/claim/netdata-claim.sh.in | 7 +------ 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31ad050a1e9320..2bd0753ee01e3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -192,8 +192,7 @@ option(DEFAULT_FEATURE_STATE "Specify the default state for most optional featur mark_as_advanced(DEFAULT_FEATURE_STATE) # High-level features -option(ENABLE_ACLK "Enable Netdata Cloud support (ACLK)" ${DEFAULT_FEATURE_STATE}) -option(ENABLE_CLOUD "Enable Netdata Cloud by default at runtime" ${DEFAULT_FEATURE_STATE}) +option(ENABLE_CLOUD "Enable Netdata Cloud support (ACLK)" ${DEFAULT_FEATURE_STATE}) option(ENABLE_ML "Enable machine learning features" ${DEFAULT_FEATURE_STATE}) option(ENABLE_DBENGINE "Enable dbengine metrics storage" True) @@ -248,7 +247,7 @@ mark_as_advanced(BUILD_FOR_PACKAGING) cmake_dependent_option(FORCE_LEGACY_LIBBPF "Force usage of libbpf 0.0.9 instead of the latest version." False "ENABLE_PLUGIN_EBPF" False) mark_as_advanced(FORCE_LEGACY_LIBBPF) -if(ENABLE_ACLK OR ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE) +if(ENABLE_CLOUD OR ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE) set(NEED_PROTOBUF True) else() set(NEED_PROTOBUF False) @@ -297,6 +296,8 @@ if(ENABLE_PLUGIN_EBPF) netdata_fetch_ebpf_co_re() endif() +set(ENABLE_ACLK ${ENABLE_CLOUD}) + # # Libm # @@ -1746,7 +1747,7 @@ endif() # # mqtt library # -if (ENABLE_H2O OR ENABLE_ACLK) +if (ENABLE_H2O OR ENABLE_CLOUD) set(ENABLE_MQTTWEBSOCKETS True) endif() @@ -1770,7 +1771,7 @@ if(ENABLE_MQTTWEBSOCKETS) endif() -if(ENABLE_ACLK) +if(ENABLE_CLOUD) # # proto definitions # @@ -2276,7 +2277,7 @@ endif() add_executable(netdata ${NETDATA_FILES} - "$<$:${ACLK_FILES}>" + "$<$:${ACLK_FILES}>" "$<$:${H2O_FILES}>" "$<$:${MONGODB_EXPORTING_FILES}>" "$<$:${PROMETHEUS_REMOTE_WRITE_EXPORTING_FILES}>" @@ -2292,7 +2293,7 @@ target_compile_options(netdata PRIVATE ) target_include_directories(netdata PRIVATE - "$<$:${CMAKE_SOURCE_DIR}/src/aclk/aclk-schemas>" + "$<$:${CMAKE_SOURCE_DIR}/src/aclk/aclk-schemas>" "$<$:${MONGOC_INCLUDE_DIRS}>" "$<$:${SNAPPY_INCLUDE_DIRS}>" ) @@ -2466,12 +2467,6 @@ set(netdata_user_POST "${NETDATA_USER}") # netdata-claim.sh if(ENABLE_CLOUD) - set(enable_cloud_POST "yes") -else() - set(enable_cloud_POST "no") -endif() - -if(ENABLE_ACLK) set(enable_aclk_POST "yes") else() set(enable_aclk_POST "no") diff --git a/packaging/cmake/config.cmake.h.in b/packaging/cmake/config.cmake.h.in index 79c72b7f8c9d0a..21863b973c8add 100644 --- a/packaging/cmake/config.cmake.h.in +++ b/packaging/cmake/config.cmake.h.in @@ -105,7 +105,6 @@ // enabled features #cmakedefine ENABLE_OPENSSL -#cmakedefine ENABLE_CLOUD #cmakedefine ENABLE_ACLK #cmakedefine ENABLE_ML #cmakedefine ENABLE_EXPORTING_MONGODB diff --git a/src/claim/netdata-claim.sh.in b/src/claim/netdata-claim.sh.in index a3db591cdee2ba..6f41c50ece80b3 100755 --- a/src/claim/netdata-claim.sh.in +++ b/src/claim/netdata-claim.sh.in @@ -117,14 +117,9 @@ if ! command -v openssl >/dev/null 2>&1 ; then exit 3 fi -# shellcheck disable=SC2050 -if [ "@enable_cloud_POST@" = "no" ]; then - echo >&2 "This agent was built with --disable-cloud and cannot be claimed" - exit 3 -fi # shellcheck disable=SC2050 if [ "@enable_aclk_POST@" != "yes" ]; then - echo >&2 "This agent was built without the dependencies for Cloud and cannot be claimed" + echo >&2 "This agent was built without Netdata Cloud support and cannot be claimed" exit 3 fi From 8c83f48ee1d592773e64c0e81bb8da233934bce6 Mon Sep 17 00:00:00 2001 From: "Austin S. Hemmelgarn" Date: Wed, 1 May 2024 07:02:33 -0400 Subject: [PATCH 2/2] Clean up reference to old ENABLE_ACLK option. --- netdata.spec.in | 1 - packaging/build-package.sh | 1 - packaging/installer/functions.sh | 1 - 3 files changed, 3 deletions(-) diff --git a/netdata.spec.in b/netdata.spec.in index 5702aa03151bba..cff332e8cef858 100644 --- a/netdata.spec.in +++ b/netdata.spec.in @@ -372,7 +372,6 @@ happened, on your systems and applications. %else -DENABLE_EXPORTER_MONGODB=Off \ %endif - -DENABLE_ACLK=On \ -DENABLE_CLOUD=On \ -DENABLE_DBENGINE=On \ -DENABLE_H2O=On \ diff --git a/packaging/build-package.sh b/packaging/build-package.sh index 349b875f4f8a0c..ee986a8036e845 100755 --- a/packaging/build-package.sh +++ b/packaging/build-package.sh @@ -26,7 +26,6 @@ add_cmake_option() { add_cmake_option CMAKE_BUILD_TYPE RelWithDebInfo add_cmake_option CMAKE_INSTALL_PREFIX / -add_cmake_option ENABLE_ACLK On add_cmake_option ENABLE_CLOUD On add_cmake_option ENABLE_DBENGINE On add_cmake_option ENABLE_H2O On diff --git a/packaging/installer/functions.sh b/packaging/installer/functions.sh index d636ddcff84124..f2e213eb20d96d 100644 --- a/packaging/installer/functions.sh +++ b/packaging/installer/functions.sh @@ -343,7 +343,6 @@ prepare_cmake_options() { enable_feature PLUGIN_LOGS_MANAGEMENT "${ENABLE_LOGS_MANAGEMENT:-0}" enable_feature LOGS_MANAGEMENT_TESTS "${ENABLE_LOGS_MANAGEMENT_TESTS:-0}" - enable_feature ACLK "${ENABLE_CLOUD:-1}" enable_feature CLOUD "${ENABLE_CLOUD:-1}" enable_feature BUNDLED_JSONC "${NETDATA_BUILD_JSON_C:-0}" enable_feature DBENGINE "${ENABLE_DBENGINE:-1}"