From 5736b4bcb179896280cb579ee1dbe0cfa464064c Mon Sep 17 00:00:00 2001
From: Timotej S <6674623+underhood@users.noreply.github.com>
Date: Tue, 4 Jan 2022 10:11:04 +0100
Subject: Removes ACLK Legacy (#11841)

* remove legacy from makefiles
* remove ACLK Legacy from installer
* remove ACLK Legacy from configure.ac
* remove legacy from cmake
* aclk api cleanup
* remove legacy files from packaging
* changes for CI from Austin
---
 Makefile.am | 66 +++++++++++--------------------------------------------------
 1 file changed, 12 insertions(+), 54 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 5d7743c407..e1d0ec4712 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,8 +64,6 @@ dist_noinst_DATA = \
     packaging/bundle-ebpf.sh \
     packaging/bundle-judy.sh \
     packaging/bundle-libbpf.sh \
-    packaging/bundle-lws.sh \
-    packaging/bundle-mosquitto.sh \
     packaging/check-kernel-config.sh \
     packaging/ebpf.checksums \
     packaging/ebpf.version \
@@ -80,10 +78,6 @@ dist_noinst_DATA = \
     packaging/judy.version \
     packaging/libbpf.checksums \
     packaging/libbpf.version \
-    packaging/libwebsockets.checksums \
-    packaging/libwebsockets.version \
-    packaging/mosquitto.checksums \
-    packaging/mosquitto.version \
     packaging/protobuf.checksums \
     packaging/protobuf.version \
     packaging/version \
@@ -121,12 +115,6 @@ SUBDIRS += \
     ml \
     $(NULL)
 
-if ENABLE_ACLK
-SUBDIRS += \
-    aclk/legacy \
-    $(NULL)
-endif
-
 AM_CFLAGS = \
     $(OPTIONAL_MATH_CFLAGS) \
     $(OPTIONAL_NFACCT_CFLAGS) \
@@ -618,8 +606,8 @@ PARSER_FILES = \
     parser/parser.h \
     $(NULL)
 
-if ACLK_NG
-ACLK_NG_FILES = \
+if ENABLE_ACLK
+ACLK_FILES = \
     aclk/aclk.c \
     aclk/aclk.h \
     aclk/aclk_util.c \
@@ -652,7 +640,7 @@ ACLK_NG_FILES = \
     $(NULL)
 
 if ENABLE_NEW_CLOUD_PROTOCOL
-ACLK_NG_FILES += \
+ACLK_FILES += \
     aclk/aclk_charts_api.c \
     aclk/aclk_charts_api.h \
     aclk/aclk_alarm_api.c \
@@ -678,7 +666,7 @@ ACLK_NG_FILES += \
     aclk/schema-wrappers/schema_wrapper_utils.h \
     $(NULL)
 
-ACLK_NG_PROTO_DEFINITIONS = \
+ACLK_PROTO_DEFINITIONS = \
     aclk/aclk-schemas/proto/aclk/v1/lib.proto \
     aclk/aclk-schemas/proto/agent/v1/disconnect.proto \
     aclk/aclk-schemas/proto/agent/v1/connection.proto \
@@ -693,9 +681,9 @@ ACLK_NG_PROTO_DEFINITIONS = \
     aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto \
     $(NULL)
 
-dist_noinst_DATA += $(ACLK_NG_PROTO_DEFINITIONS)
+dist_noinst_DATA += $(ACLK_PROTO_DEFINITIONS)
 
-ACLK_NG_PROTO_BUILT_FILES = aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \
+ACLK_PROTO_BUILT_FILES = aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \
     aclk/aclk-schemas/proto/agent/v1/connection.pb.h \
     aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.pb.cc \
     aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.pb.h \
@@ -721,9 +709,9 @@ ACLK_NG_PROTO_BUILT_FILES = aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \
     aclk/aclk-schemas/proto/nodeinstance/info/v1/info.pb.h \
     $(NULL)
 
-BUILT_SOURCES += $(ACLK_NG_PROTO_BUILT_FILES)
-nodist_netdata_SOURCES += $(ACLK_NG_PROTO_BUILT_FILES)
-CLEANFILES += $(ACLK_NG_PROTO_BUILT_FILES)
+BUILT_SOURCES += $(ACLK_PROTO_BUILT_FILES)
+nodist_netdata_SOURCES += $(ACLK_PROTO_BUILT_FILES)
+CLEANFILES += $(ACLK_PROTO_BUILT_FILES)
 
 aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \
 aclk/aclk-schemas/proto/agent/v1/connection.pb.h: aclk/aclk-schemas/proto/agent/v1/connection.proto
@@ -775,7 +763,7 @@ aclk/aclk-schemas/proto/nodeinstance/info/v1/info.pb.h: aclk/aclk-schemas/proto/
 
 endif #ENABLE_NEW_CLOUD_PROTOCOL
 
-endif #ACLK_NG
+endif #ENABLE_ACLK
 
 if ENABLE_ACLK
 ACLK_COMMON_FILES = \
@@ -792,27 +780,6 @@ ACLK_ALWAYS_BUILD_FILES = \
     aclk/aclk_proxy.h \
     $(NULL)
 
-if ACLK_LEGACY
-ACLK_LEGACY_FILES = \
-    aclk/legacy/agent_cloud_link.c \
-    aclk/legacy/agent_cloud_link.h \
-    aclk/legacy/aclk_query.c \
-    aclk/legacy/aclk_query.h \
-    aclk/legacy/mqtt.c \
-    aclk/legacy/mqtt.h \
-    aclk/legacy/aclk_rx_msgs.c \
-    aclk/legacy/aclk_rx_msgs.h \
-    aclk/legacy/aclk_lws_wss_client.c \
-    aclk/legacy/aclk_lws_wss_client.h \
-    aclk/legacy/aclk_lws_https_client.c \
-    aclk/legacy/aclk_lws_https_client.h \
-    aclk/legacy/aclk_common.c \
-    aclk/legacy/aclk_common.h \
-    aclk/legacy/aclk_stats.c \
-    aclk/legacy/aclk_stats.h \
-    $(NULL)
-endif #ACLK_LEGACY
-
 SPAWN_PLUGIN_FILES = \
     spawn/spawn.c \
     spawn/spawn_server.c \
@@ -929,8 +896,7 @@ NETDATA_FILES = \
     $(PARSER_FILES) \
     $(ACLK_ALWAYS_BUILD_FILES) \
     $(ACLK_COMMON_FILES) \
-    $(ACLK_LEGACY_FILES) \
-    $(ACLK_NG_FILES) \
+    $(ACLK_FILES) \
     $(SPAWN_PLUGIN_FILES) \
     $(NULL)
 
@@ -994,7 +960,7 @@ netdata_LDADD = \
     $(NETDATA_COMMON_LIBS) \
     $(NULL)
 
-if ACLK_NG
+if ENABLE_ACLK
     netdata_LDADD += $(OPTIONAL_PROTOBUF_LIBS) \
     $(OPTIONAL_ATOMIC_LIBS) \
     $(NULL)
@@ -1005,14 +971,6 @@ if ENABLE_ML_TESTS
         $(NULL)
 endif
 
-if ACLK_LEGACY
-    netdata_LDADD += \
-        $(abs_top_srcdir)/externaldeps/mosquitto/libmosquitto.a \
-        $(OPTIONAL_LWS_LIBS) \
-        $(OPTIONAL_LIBCAP_LIBS) \
-        $(NULL)
-endif #ACLK_LEGACY
-
 if ENABLE_CXX_LINKER
     netdata_LINK = $(CXXLD) $(CXXFLAGS) $(LDFLAGS) -o $@
 else
-- 
cgit v1.2.3