@cryptotaxi247 / netdata-1 / commits / a65193925

Move ACLK Legacy into a subfolder (#10265)

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

Timotej S committed Jan 19, 2021 at 09:41 UTC a65193925e6ba5fe67aa57024353d403d5abb144
30 files changed +50 -50
.gitignore
+1 -1
@@ -186,7 +186,7 @@ tests/acls/acl.sh
186 tests/urls/request.sh
187 tests/alarm_repetition/alarm.sh
188 tests/template_dimension/template_dim.sh
189 -aclk/tests/install-fake-charts.d.sh
189 +aclk/legacy/tests/install-fake-charts.d.sh
190
191 # tests and temp files
192 test-driver
CMakeLists.txt
+17 -17
@@ -713,26 +713,26 @@ set(BACKENDS_PLUGIN_FILES
713 set(CLAIM_PLUGIN_FILES
714 claim/claim.c
715 claim/claim.h
716 - aclk/aclk_rrdhost_state.h
717 - aclk/aclk_common.c
718 - aclk/aclk_common.h
716 + aclk/legacy/aclk_rrdhost_state.h
717 + aclk/legacy/aclk_common.c
718 + aclk/legacy/aclk_common.h
719 )
720
721 set(ACLK_PLUGIN_FILES
722 - aclk/agent_cloud_link.c
723 - aclk/agent_cloud_link.h
724 - aclk/aclk_query.c
725 - aclk/aclk_query.h
726 - aclk/aclk_lws_wss_client.c
727 - aclk/aclk_lws_wss_client.h
728 - aclk/aclk_lws_https_client.c
729 - aclk/aclk_lws_https_client.h
730 - aclk/mqtt.c
731 - aclk/mqtt.h
732 - aclk/aclk_stats.c
733 - aclk/aclk_stats.h
734 - aclk/aclk_rx_msgs.c
735 - aclk/aclk_rx_msgs.h
722 + aclk/legacy/agent_cloud_link.c
723 + aclk/legacy/agent_cloud_link.h
724 + aclk/legacy/aclk_query.c
725 + aclk/legacy/aclk_query.h
726 + aclk/legacy/aclk_lws_wss_client.c
727 + aclk/legacy/aclk_lws_wss_client.h
728 + aclk/legacy/aclk_lws_https_client.c
729 + aclk/legacy/aclk_lws_https_client.h
730 + aclk/legacy/mqtt.c
731 + aclk/legacy/mqtt.h
732 + aclk/legacy/aclk_stats.c
733 + aclk/legacy/aclk_stats.h
734 + aclk/legacy/aclk_rx_msgs.c
735 + aclk/legacy/aclk_rx_msgs.h
736 )
737
738 set(SPAWN_PLUGIN_FILES
Makefile.am
+18 -18
@@ -116,7 +116,7 @@ SUBDIRS += \
116 web \
117 claim \
118 parser \
119 - aclk \
119 + aclk/legacy \
120 spawn \
121 $(NULL)
122
@@ -524,27 +524,27 @@ PARSER_FILES = \
524 $(NULL)
525
526 ACLK_FILES = \
527 - aclk/aclk_rrdhost_state.h \
528 - aclk/aclk_common.c \
529 - aclk/aclk_common.h \
530 - aclk/aclk_stats.c \
531 - aclk/aclk_stats.h
527 + aclk/legacy/aclk_rrdhost_state.h \
528 + aclk/legacy/aclk_common.c \
529 + aclk/legacy/aclk_common.h \
530 + aclk/legacy/aclk_stats.c \
531 + aclk/legacy/aclk_stats.h \
532 $(NULL)
533
534 if ENABLE_ACLK
535 ACLK_FILES += \
536 - aclk/agent_cloud_link.c \
537 - aclk/agent_cloud_link.h \
538 - aclk/aclk_query.c \
539 - aclk/aclk_query.h \
540 - aclk/mqtt.c \
541 - aclk/mqtt.h \
542 - aclk/aclk_rx_msgs.c \
543 - aclk/aclk_rx_msgs.h \
544 - aclk/aclk_lws_wss_client.c \
545 - aclk/aclk_lws_wss_client.h \
546 - aclk/aclk_lws_https_client.c \
547 - aclk/aclk_lws_https_client.h \
536 + aclk/legacy/agent_cloud_link.c \
537 + aclk/legacy/agent_cloud_link.h \
538 + aclk/legacy/aclk_query.c \
539 + aclk/legacy/aclk_query.h \
540 + aclk/legacy/mqtt.c \
541 + aclk/legacy/mqtt.h \
542 + aclk/legacy/aclk_rx_msgs.c \
543 + aclk/legacy/aclk_rx_msgs.h \
544 + aclk/legacy/aclk_lws_wss_client.c \
545 + aclk/legacy/aclk_lws_wss_client.h \
546 + aclk/legacy/aclk_lws_https_client.c \
547 + aclk/legacy/aclk_lws_https_client.h \
548 $(NULL)
549 endif
550
aclk/legacy/Makefile.am renamed
+1 -1
@@ -15,5 +15,5 @@ SUFFIXES = .in
15 # $(NULL)
16
17 dist_noinst_SCRIPTS = tests/install-fake-charts.d.sh
18 -dist_noinst_DATA = README.md tests/install-fake-charts.d.sh.in
18 +dist_noinst_DATA = tests/install-fake-charts.d.sh.in
19
aclk/legacy/aclk_common.c renamed
+1 -1
@@ -1,6 +1,6 @@
1 #include "aclk_common.h"
2
3 -#include "../daemon/common.h"
3 +#include "../../daemon/common.h"
4
5 #ifdef ENABLE_ACLK
6 #include <libwebsockets.h>
aclk/legacy/aclk_common.h renamed
+1 -1
@@ -2,7 +2,7 @@
2 #define ACLK_COMMON_H
3
4 #include "aclk_rrdhost_state.h"
5 -#include "../daemon/common.h"
5 +#include "../../daemon/common.h"
6
7 extern netdata_mutex_t aclk_shared_state_mutex;
8 #define ACLK_SHARED_STATE_LOCK netdata_mutex_lock(&aclk_shared_state_mutex)
aclk/legacy/aclk_lws_https_client.c renamed
aclk/legacy/aclk_lws_https_client.h renamed
+1 -1
@@ -3,7 +3,7 @@
3 #ifndef NETDATA_LWS_HTTPS_CLIENT_H
4 #define NETDATA_LWS_HTTPS_CLIENT_H
5
6 -#include "../daemon/common.h"
6 +#include "../../daemon/common.h"
7 #include "libnetdata/libnetdata.h"
8
9 #define DATAMAXLEN 1024*16
aclk/legacy/aclk_lws_wss_client.c renamed
+1 -1
@@ -3,7 +3,7 @@
3 #include "aclk_lws_wss_client.h"
4
5 #include "libnetdata/libnetdata.h"
6 -#include "../daemon/common.h"
6 +#include "../../daemon/common.h"
7 #include "aclk_common.h"
8 #include "aclk_stats.h"
9
aclk/legacy/aclk_lws_wss_client.h renamed
aclk/legacy/aclk_query.c renamed
aclk/legacy/aclk_query.h renamed
aclk/legacy/aclk_rrdhost_state.h renamed
+1 -1
@@ -1,7 +1,7 @@
1 #ifndef ACLK_RRDHOST_STATE_H
2 #define ACLK_RRDHOST_STATE_H
3
4 -#include "../libnetdata/libnetdata.h"
4 +#include "../../libnetdata/libnetdata.h"
5
6 typedef enum aclk_cmd {
7 ACLK_CMD_CLOUD,
aclk/legacy/aclk_rx_msgs.c renamed
aclk/legacy/aclk_rx_msgs.h renamed
+1 -1
@@ -3,7 +3,7 @@
3 #ifndef NETDATA_ACLK_RX_MSGS_H
4 #define NETDATA_ACLK_RX_MSGS_H
5
6 -#include "../daemon/common.h"
6 +#include "../../daemon/common.h"
7 #include "libnetdata/libnetdata.h"
8
9 int aclk_handle_cloud_message(char *payload);
aclk/legacy/aclk_stats.c renamed
aclk/legacy/aclk_stats.h renamed
+1 -1
@@ -3,7 +3,7 @@
3 #ifndef NETDATA_ACLK_STATS_H
4 #define NETDATA_ACLK_STATS_H
5
6 -#include "../daemon/common.h"
6 +#include "../../daemon/common.h"
7 #include "libnetdata/libnetdata.h"
8 #include "aclk_common.h"
9
aclk/legacy/agent_cloud_link.c renamed
aclk/legacy/agent_cloud_link.h renamed
+1 -1
@@ -3,7 +3,7 @@
3 #ifndef NETDATA_AGENT_CLOUD_LINK_H
4 #define NETDATA_AGENT_CLOUD_LINK_H
5
6 -#include "../daemon/common.h"
6 +#include "../../daemon/common.h"
7 #include "mqtt.h"
8 #include "aclk_common.h"
9
aclk/legacy/mqtt.c renamed
+1 -1
@@ -1,7 +1,7 @@
1 // SPDX-License-Identifier: GPL-3.0-or-later
2
3 #include <libnetdata/json/json.h>
4 -#include "../daemon/common.h"
4 +#include "../../daemon/common.h"
5 #include "mqtt.h"
6 #include "aclk_lws_wss_client.h"
7 #include "aclk_stats.h"
aclk/legacy/mqtt.h renamed
aclk/legacy/tests/fake-charts.d.plugin renamed
aclk/legacy/tests/install-fake-charts.d.sh.in renamed
aclk/legacy/tests/launch-paho.sh renamed
aclk/legacy/tests/paho-inspection.py renamed
aclk/legacy/tests/paho.Dockerfile renamed
claim/claim.c
+1 -1
@@ -2,7 +2,7 @@
2
3 #include "claim.h"
4 #include "../registry/registry_internals.h"
5 -#include "../aclk/aclk_common.h"
5 +#include "../aclk/legacy/aclk_common.h"
6
7 char *claiming_pending_arguments = NULL;
8
configure.ac
+1 -1
@@ -1615,7 +1615,7 @@ AC_CONFIG_FILES([
1615 web/server/Makefile
1616 web/server/static/Makefile
1617 claim/Makefile
1618 - aclk/Makefile
1618 + aclk/legacy/Makefile
1619 spawn/Makefile
1620 parser/Makefile
1621 ])
daemon/common.h
+1 -1
@@ -66,7 +66,7 @@
66 #include "claim/claim.h"
67
68 // netdata agent cloud link
69 -#include "aclk/agent_cloud_link.h"
69 +#include "aclk/legacy/agent_cloud_link.h"
70
71 // global GUID map functions
72
database/rrd.h
+1 -1
@@ -34,7 +34,7 @@ struct pg_cache_page_index;
34 #include "rrdcalc.h"
35 #include "rrdcalctemplate.h"
36 #include "../streaming/rrdpush.h"
37 -#include "../aclk/aclk_rrdhost_state.h"
37 +#include "../aclk/legacy/aclk_rrdhost_state.h"
38
39 struct context_param {
40 RRDDIM *rd;