Move ACLK Legacy into a subfolder (#10265)

* move all legacy ACLK into a subfolder to make space for ACLK-NG

.gitignore

@@ -186,7 +186,7 @@ tests/acls/acl.sh
 tests/urls/request.sh
 tests/alarm_repetition/alarm.sh
 tests/template_dimension/template_dim.sh
-aclk/tests/install-fake-charts.d.sh
+aclk/legacy/tests/install-fake-charts.d.sh
 
 # tests and temp files
 test-driver

CMakeLists.txt

@@ -713,26 +713,26 @@ set(BACKENDS_PLUGIN_FILES
 set(CLAIM_PLUGIN_FILES
         claim/claim.c
         claim/claim.h
-        aclk/aclk_rrdhost_state.h
-        aclk/aclk_common.c
-        aclk/aclk_common.h
+        aclk/legacy/aclk_rrdhost_state.h
+        aclk/legacy/aclk_common.c
+        aclk/legacy/aclk_common.h
         )
 
 set(ACLK_PLUGIN_FILES
-        aclk/agent_cloud_link.c
-        aclk/agent_cloud_link.h
-        aclk/aclk_query.c
-        aclk/aclk_query.h
-        aclk/aclk_lws_wss_client.c
-        aclk/aclk_lws_wss_client.h
-        aclk/aclk_lws_https_client.c
-        aclk/aclk_lws_https_client.h
-        aclk/mqtt.c
-        aclk/mqtt.h
-        aclk/aclk_stats.c
-        aclk/aclk_stats.h
-        aclk/aclk_rx_msgs.c
-        aclk/aclk_rx_msgs.h
+        aclk/legacy/agent_cloud_link.c
+        aclk/legacy/agent_cloud_link.h
+        aclk/legacy/aclk_query.c
+        aclk/legacy/aclk_query.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/mqtt.c
+        aclk/legacy/mqtt.h
+        aclk/legacy/aclk_stats.c
+        aclk/legacy/aclk_stats.h
+        aclk/legacy/aclk_rx_msgs.c
+        aclk/legacy/aclk_rx_msgs.h
         )
 
 set(SPAWN_PLUGIN_FILES

Makefile.am

@@ -116,7 +116,7 @@ SUBDIRS += \
     web \
     claim \
     parser \
-    aclk \
+    aclk/legacy \
     spawn \
     $(NULL)
 
@@ -524,27 +524,27 @@ PARSER_FILES = \
     $(NULL)
 
 ACLK_FILES = \
-    aclk/aclk_rrdhost_state.h \
-    aclk/aclk_common.c \
-    aclk/aclk_common.h \
-    aclk/aclk_stats.c \
-    aclk/aclk_stats.h
+    aclk/legacy/aclk_rrdhost_state.h \
+    aclk/legacy/aclk_common.c \
+    aclk/legacy/aclk_common.h \
+    aclk/legacy/aclk_stats.c \
+    aclk/legacy/aclk_stats.h \
     $(NULL)
 
 if ENABLE_ACLK
 ACLK_FILES += \
-    aclk/agent_cloud_link.c \
-    aclk/agent_cloud_link.h \
-    aclk/aclk_query.c \
-    aclk/aclk_query.h \
-    aclk/mqtt.c \
-    aclk/mqtt.h \
-    aclk/aclk_rx_msgs.c \
-    aclk/aclk_rx_msgs.h \
-    aclk/aclk_lws_wss_client.c \
-    aclk/aclk_lws_wss_client.h \
-    aclk/aclk_lws_https_client.c \
-    aclk/aclk_lws_https_client.h \
+    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 \
     $(NULL)
 endif
 

aclk/legacy/Makefile.am

@@ -15,5 +15,5 @@ SUFFIXES = .in
 #    $(NULL)
 
 dist_noinst_SCRIPTS = tests/install-fake-charts.d.sh
-dist_noinst_DATA = README.md tests/install-fake-charts.d.sh.in
+dist_noinst_DATA = tests/install-fake-charts.d.sh.in
 

aclk/legacy/aclk_common.c

@@ -1,6 +1,6 @@
 #include "aclk_common.h"
 
-#include "../daemon/common.h"
+#include "../../daemon/common.h"
 
 #ifdef ENABLE_ACLK
 #include <libwebsockets.h>

aclk/legacy/aclk_common.h

@@ -2,7 +2,7 @@
 #define ACLK_COMMON_H
 
 #include "aclk_rrdhost_state.h"
-#include "../daemon/common.h"
+#include "../../daemon/common.h"
 
 extern netdata_mutex_t aclk_shared_state_mutex;
 #define ACLK_SHARED_STATE_LOCK netdata_mutex_lock(&aclk_shared_state_mutex)

aclk/legacy/aclk_lws_https_client.h

@@ -3,7 +3,7 @@
 #ifndef NETDATA_LWS_HTTPS_CLIENT_H
 #define NETDATA_LWS_HTTPS_CLIENT_H
 
-#include "../daemon/common.h"
+#include "../../daemon/common.h"
 #include "libnetdata/libnetdata.h"
 
 #define DATAMAXLEN 1024*16

aclk/legacy/aclk_lws_wss_client.c

@@ -3,7 +3,7 @@
 #include "aclk_lws_wss_client.h"
 
 #include "libnetdata/libnetdata.h"
-#include "../daemon/common.h"
+#include "../../daemon/common.h"
 #include "aclk_common.h"
 #include "aclk_stats.h"
 

aclk/legacy/aclk_rrdhost_state.h

@@ -1,7 +1,7 @@
 #ifndef ACLK_RRDHOST_STATE_H
 #define ACLK_RRDHOST_STATE_H
 
-#include "../libnetdata/libnetdata.h"
+#include "../../libnetdata/libnetdata.h"
 
 typedef enum aclk_cmd {
     ACLK_CMD_CLOUD,

aclk/legacy/aclk_rx_msgs.h

@@ -3,7 +3,7 @@
 #ifndef NETDATA_ACLK_RX_MSGS_H
 #define NETDATA_ACLK_RX_MSGS_H
 
-#include "../daemon/common.h"
+#include "../../daemon/common.h"
 #include "libnetdata/libnetdata.h"
 
 int aclk_handle_cloud_message(char *payload);

aclk/legacy/aclk_stats.h

@@ -3,7 +3,7 @@
 #ifndef NETDATA_ACLK_STATS_H
 #define NETDATA_ACLK_STATS_H
 
-#include "../daemon/common.h"
+#include "../../daemon/common.h"
 #include "libnetdata/libnetdata.h"
 #include "aclk_common.h"
 

aclk/legacy/agent_cloud_link.h

@@ -3,7 +3,7 @@
 #ifndef NETDATA_AGENT_CLOUD_LINK_H
 #define NETDATA_AGENT_CLOUD_LINK_H
 
-#include "../daemon/common.h"
+#include "../../daemon/common.h"
 #include "mqtt.h"
 #include "aclk_common.h"
 

aclk/legacy/mqtt.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include <libnetdata/json/json.h>
-#include "../daemon/common.h"
+#include "../../daemon/common.h"
 #include "mqtt.h"
 #include "aclk_lws_wss_client.h"
 #include "aclk_stats.h"

claim/claim.c

@@ -2,7 +2,7 @@
 
 #include "claim.h"
 #include "../registry/registry_internals.h"
-#include "../aclk/aclk_common.h"
+#include "../aclk/legacy/aclk_common.h"
 
 char *claiming_pending_arguments = NULL;
 

configure.ac

@@ -1615,7 +1615,7 @@ AC_CONFIG_FILES([
     web/server/Makefile
     web/server/static/Makefile
     claim/Makefile
-    aclk/Makefile
+    aclk/legacy/Makefile
     spawn/Makefile
     parser/Makefile
 ])

daemon/common.h

@@ -66,7 +66,7 @@
 #include "claim/claim.h"
 
 // netdata agent cloud link
-#include "aclk/agent_cloud_link.h"
+#include "aclk/legacy/agent_cloud_link.h"
 
 // global GUID map functions
 

database/rrd.h

@@ -34,7 +34,7 @@ struct pg_cache_page_index;
 #include "rrdcalc.h"
 #include "rrdcalctemplate.h"
 #include "../streaming/rrdpush.h"
-#include "../aclk/aclk_rrdhost_state.h"
+#include "../aclk/legacy/aclk_rrdhost_state.h"
 
 struct context_param {
     RRDDIM *rd;