Move ACLK Legacy into a subfolder (#10265)

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

30 files changed, 50 insertions, 50 deletions

diff --git a/.gitignore b/.gitignore
index 07dd9f0088..2049bf467c 100644
--- a/.gitignore
+++ b/.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
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 261206c7ac..415c673d85 100644
--- a/CMakeLists.txt
+++ b/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
diff --git a/Makefile.am b/Makefile.am
index c24f733004..1846d1e1cf 100644
--- a/Makefile.am
+++ b/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
 
diff --git a/aclk/Makefile.am b/aclk/legacy/Makefile.am
index becc6e3a4f..1cd876b401 100644
--- a/aclk/Makefile.am
+++ b/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
 
diff --git a/aclk/aclk_common.c b/aclk/legacy/aclk_common.c
index 82c5e68eeb..7c8421a935 100644
--- a/aclk/aclk_common.c
+++ b/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>
diff --git a/aclk/aclk_common.h b/aclk/legacy/aclk_common.h
index cc556afa34..2dc0aa553c 100644
--- a/aclk/aclk_common.h
+++ b/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)
diff --git a/aclk/aclk_lws_https_client.c b/aclk/legacy/aclk_lws_https_client.c
index c1856ed2c0..c1856ed2c0 100644
--- a/aclk/aclk_lws_https_client.c
+++ b/aclk/legacy/aclk_lws_https_client.c
diff --git a/aclk/aclk_lws_https_client.h b/aclk/legacy/aclk_lws_https_client.h
index 2666e82083..811809dd1a 100644
--- a/aclk/aclk_lws_https_client.h
+++ b/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
diff --git a/aclk/aclk_lws_wss_client.c b/aclk/legacy/aclk_lws_wss_client.c
index a5e675355c..2e6fd4ec87 100644
--- a/aclk/aclk_lws_wss_client.c
+++ b/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"
 
diff --git a/aclk/aclk_lws_wss_client.h b/aclk/legacy/aclk_lws_wss_client.h
index 584a3cf4f0..584a3cf4f0 100644
--- a/aclk/aclk_lws_wss_client.h
+++ b/aclk/legacy/aclk_lws_wss_client.h
diff --git a/aclk/aclk_query.c b/aclk/legacy/aclk_query.c
index 7ab534f16b..7ab534f16b 100644
--- a/aclk/aclk_query.c
+++ b/aclk/legacy/aclk_query.c
diff --git a/aclk/aclk_query.h b/aclk/legacy/aclk_query.h
index 53eef13922..53eef13922 100644
--- a/aclk/aclk_query.h
+++ b/aclk/legacy/aclk_query.h
diff --git a/aclk/aclk_rrdhost_state.h b/aclk/legacy/aclk_rrdhost_state.h
index 5ef0cc2184..7ab3a502e5 100644
--- a/aclk/aclk_rrdhost_state.h
+++ b/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,
diff --git a/aclk/aclk_rx_msgs.c b/aclk/legacy/aclk_rx_msgs.c
index 99fa9d9870..99fa9d9870 100644
--- a/aclk/aclk_rx_msgs.c
+++ b/aclk/legacy/aclk_rx_msgs.c
diff --git a/aclk/aclk_rx_msgs.h b/aclk/legacy/aclk_rx_msgs.h
index 66a30576c2..3095e41a73 100644
--- a/aclk/aclk_rx_msgs.h
+++ b/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);
diff --git a/aclk/aclk_stats.c b/aclk/legacy/aclk_stats.c
index 2a57cd6f0d..2a57cd6f0d 100644
--- a/aclk/aclk_stats.c
+++ b/aclk/legacy/aclk_stats.c
diff --git a/aclk/aclk_stats.h b/aclk/legacy/aclk_stats.h
index 49ea473485..7e74fdf882 100644
--- a/aclk/aclk_stats.h
+++ b/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"
 
diff --git a/aclk/agent_cloud_link.c b/aclk/legacy/agent_cloud_link.c
index d5925d3953..d5925d3953 100644
--- a/aclk/agent_cloud_link.c
+++ b/aclk/legacy/agent_cloud_link.c
diff --git a/aclk/agent_cloud_link.h b/aclk/legacy/agent_cloud_link.h
index b224a45433..e777e0b196 100644
--- a/aclk/agent_cloud_link.h
+++ b/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"
 
diff --git a/aclk/mqtt.c b/aclk/legacy/mqtt.c
index 58534d5d1b..6f38a20dce 100644
--- a/aclk/mqtt.c
+++ b/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"
diff --git a/aclk/mqtt.h b/aclk/legacy/mqtt.h
index cc4765d62f..cc4765d62f 100644
--- a/aclk/mqtt.h
+++ b/aclk/legacy/mqtt.h
diff --git a/aclk/tests/fake-charts.d.plugin b/aclk/legacy/tests/fake-charts.d.plugin
index a13c6bab87..a13c6bab87 100644
--- a/aclk/tests/fake-charts.d.plugin
+++ b/aclk/legacy/tests/fake-charts.d.plugin
diff --git a/aclk/tests/install-fake-charts.d.sh.in b/aclk/legacy/tests/install-fake-charts.d.sh.in
index ac002a2bd7..ac002a2bd7 100644
--- a/aclk/tests/install-fake-charts.d.sh.in
+++ b/aclk/legacy/tests/install-fake-charts.d.sh.in
diff --git a/aclk/tests/launch-paho.sh b/aclk/legacy/tests/launch-paho.sh
index 1c2cb5f2c3..1c2cb5f2c3 100755
--- a/aclk/tests/launch-paho.sh
+++ b/aclk/legacy/tests/launch-paho.sh
diff --git a/aclk/tests/paho-inspection.py b/aclk/legacy/tests/paho-inspection.py
index 20ab523d4e..20ab523d4e 100644
--- a/aclk/tests/paho-inspection.py
+++ b/aclk/legacy/tests/paho-inspection.py
diff --git a/aclk/tests/paho.Dockerfile b/aclk/legacy/tests/paho.Dockerfile
index d67cc4cb0c..d67cc4cb0c 100644
--- a/aclk/tests/paho.Dockerfile
+++ b/aclk/legacy/tests/paho.Dockerfile
diff --git a/claim/claim.c b/claim/claim.c
index d87f46a7f8..bb9316082f 100644
--- a/claim/claim.c
+++ b/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;
 
diff --git a/configure.ac b/configure.ac
index 30bf4898d6..252cd3dd30 100644
--- a/configure.ac
+++ b/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
 ])
diff --git a/daemon/common.h b/daemon/common.h
index 7a55022bb1..68af95740c 100644
--- a/daemon/common.h
+++ b/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
 
diff --git a/database/rrd.h b/database/rrd.h
index f52d34af8a..c5bb343792 100644
--- a/database/rrd.h
+++ b/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;