Merging upstream version 1.37.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 104 insertions, 140 deletions

diff --git a/Makefile.am b/Makefile.am
index 7f8adf6a..5e160523 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,7 @@ EXTRA_DIST = \
     build/m4/ax_c_mallopt.m4 \
     build/m4/tcmalloc.m4 \
     build/m4/ax_c__generic.m4 \
-    ml/kmeans/dlib \
+    ml/dlib \
     README.md \
     LICENSE \
     REDISTRIBUTED.md \
@@ -109,7 +109,6 @@ SUBDIRS += \
     claim \
     parser \
     spawn \
-    ml \
     $(NULL)
 
 AM_CFLAGS = \
@@ -173,6 +172,8 @@ LIBNETDATA_FILES = \
     libnetdata/socket/security.h \
     libnetdata/statistical/statistical.c \
     libnetdata/statistical/statistical.h \
+    libnetdata/string/string.c \
+    libnetdata/string/string.h \
     libnetdata/storage_number/storage_number.c \
     libnetdata/storage_number/storage_number.h \
     libnetdata/threads/threads.c \
@@ -202,10 +203,6 @@ APPS_PLUGIN_FILES = \
     $(LIBNETDATA_FILES) \
     $(NULL)
 
-CHECKS_PLUGIN_FILES = \
-    collectors/checks.plugin/plugin_checks.c \
-    $(NULL)
-
 FREEBSD_PLUGIN_FILES = \
     collectors/freebsd.plugin/plugin_freebsd.c \
     collectors/freebsd.plugin/plugin_freebsd.h \
@@ -235,39 +232,40 @@ ML_FILES = \
 if ENABLE_ML
 
 ML_FILES += \
-    ml/BitBufferCounter.h \
-    ml/BitBufferCounter.cc \
-    ml/BitRateWindow.h \
-    ml/BitRateWindow.cc \
+    ml/ADCharts.h \
+    ml/ADCharts.cc \
     ml/Config.h \
     ml/Config.cc \
-    ml/Database.h \
-    ml/Database.cc \
     ml/Dimension.cc \
     ml/Dimension.h \
     ml/Host.h \
     ml/Host.cc \
     ml/Query.h \
-    ml/kmeans/KMeans.h \
-    ml/kmeans/KMeans.cc \
-    ml/kmeans/SamplesBuffer.h \
-    ml/kmeans/SamplesBuffer.cc \
-    ml/kmeans/dlib/dlib/all/source.cpp \
+    ml/KMeans.h \
+    ml/KMeans.cc \
+    ml/SamplesBuffer.h \
+    ml/SamplesBuffer.cc \
+    ml/dlib/dlib/all/source.cpp \
     ml/json/single_include/nlohmann/json.hpp \
     ml/ml.cc \
     ml/ml-private.h \
     $(NULL)
 
 # Disable warnings from dlib library
-ml/kmeans/dlib/dlib/all/source.$(OBJEXT) : CXXFLAGS += -Wno-sign-compare -Wno-type-limits -Wno-aggressive-loop-optimizations -Wno-stringop-overflow
+ml/dlib/dlib/all/source.$(OBJEXT) : CXXFLAGS += -Wno-sign-compare -Wno-type-limits -Wno-aggressive-loop-optimizations -Wno-stringop-overflow -Wno-psabi
+
+# Disable ml warnings
+ml/Dimension.$(OBJEXT) : CXXFLAGS += -Wno-psabi
+ml/Host.$(OBJEXT) : CXXFLAGS += -Wno-psabi
+ml/KMeans.$(OBJEXT) : CXXFLAGS += -Wno-psabi
+ml/ml.$(OBJEXT) : CXXFLAGS += -Wno-psabi
 
 endif
 
 
 if ENABLE_ML_TESTS
 ML_TESTS_FILES = \
-    ml/kmeans/Tests.cc \
-    ml/Tests.cc \
+    ml/SamplesBufferTests.cc \
     $(NULL)
 endif
 
@@ -384,8 +382,6 @@ PROC_PLUGIN_FILES = \
     collectors/proc.plugin/proc_net_netstat.c \
     collectors/proc.plugin/proc_net_rpc_nfs.c \
     collectors/proc.plugin/proc_net_rpc_nfsd.c \
-    collectors/proc.plugin/proc_net_snmp.c \
-    collectors/proc.plugin/proc_net_snmp6.c \
     collectors/proc.plugin/proc_net_sctp_snmp.c \
     collectors/proc.plugin/proc_net_sockstat.c \
     collectors/proc.plugin/proc_net_sockstat6.c \
@@ -445,6 +441,8 @@ RRD_PLUGIN_FILES = \
     database/rrd.c \
     database/rrd.h \
     database/rrdset.c \
+    database/rrdfunctions.c \
+    database/rrdfunctions.h \
     database/rrdsetvar.c \
     database/rrdsetvar.h \
     database/rrdvar.c \
@@ -460,13 +458,13 @@ RRD_PLUGIN_FILES = \
     database/sqlite/sqlite_db_migration.c \
     database/sqlite/sqlite_db_migration.h \
     database/sqlite/sqlite_aclk.c \
-    database/sqlite/sqlite_aclk.h \
+	database/sqlite/sqlite_aclk.h \
+    database/sqlite/sqlite_metadata.c \
+    database/sqlite/sqlite_metadata.h \
     database/sqlite/sqlite_health.c \
     database/sqlite/sqlite_health.h \
     database/sqlite/sqlite_aclk_node.c \
     database/sqlite/sqlite_aclk_node.h \
-    database/sqlite/sqlite_aclk_chart.c \
-    database/sqlite/sqlite_aclk_chart.h \
     database/sqlite/sqlite_aclk_alert.c \
     database/sqlite/sqlite_aclk_alert.h \
     database/sqlite/sqlite3.c \
@@ -478,65 +476,65 @@ RRD_PLUGIN_FILES = \
 database/sqlite/sqlite3.$(OBJEXT) : CFLAGS += -Wno-cast-function-type
 database/KolmogorovSmirnovDist.$(OBJEXT) : CFLAGS += -Wno-maybe-uninitialized
 
-if ENABLE_DBENGINE
-    noinst_LIBRARIES = libjudy.a
-
-    libjudy_a_SOURCES = libnetdata/libjudy/src/Judy.h \
-        libnetdata/libjudy/src/JudyCommon/JudyMalloc.c \
-        libnetdata/libjudy/src/JudyCommon/JudyPrivate.h \
-        libnetdata/libjudy/src/JudyCommon/JudyPrivate1L.h \
-        libnetdata/libjudy/src/JudyCommon/JudyPrivateBranch.h \
-        libnetdata/libjudy/src/JudyL/JudyL.h \
-        libnetdata/libjudy/src/JudyL/JudyLByCount.c \
-        libnetdata/libjudy/src/JudyL/JudyLCascade.c \
-        libnetdata/libjudy/src/JudyL/JudyLCount.c \
-        libnetdata/libjudy/src/JudyL/JudyLCreateBranch.c \
-        libnetdata/libjudy/src/JudyL/JudyLDecascade.c \
-        libnetdata/libjudy/src/JudyL/JudyLDel.c \
-        libnetdata/libjudy/src/JudyL/JudyLFirst.c \
-        libnetdata/libjudy/src/JudyL/JudyLFreeArray.c \
-        libnetdata/libjudy/src/JudyL/j__udyLGet.c \
-        libnetdata/libjudy/src/JudyL/JudyLGet.c \
-        libnetdata/libjudy/src/JudyL/JudyLInsArray.c \
-        libnetdata/libjudy/src/JudyL/JudyLIns.c \
-        libnetdata/libjudy/src/JudyL/JudyLInsertBranch.c \
-        libnetdata/libjudy/src/JudyL/JudyLMallocIF.c \
-        libnetdata/libjudy/src/JudyL/JudyLMemActive.c \
-        libnetdata/libjudy/src/JudyL/JudyLMemUsed.c \
-        libnetdata/libjudy/src/JudyL/JudyLNext.c \
-        libnetdata/libjudy/src/JudyL/JudyLNextEmpty.c \
-        libnetdata/libjudy/src/JudyL/JudyLPrev.c \
-        libnetdata/libjudy/src/JudyL/JudyLPrevEmpty.c \
-        libnetdata/libjudy/src/JudyHS/JudyHS.c \
-        $(NULL)
+noinst_LIBRARIES = libjudy.a
+
+libjudy_a_SOURCES = libnetdata/libjudy/src/Judy.h \
+    libnetdata/libjudy/src/JudyCommon/JudyMalloc.c \
+    libnetdata/libjudy/src/JudyCommon/JudyPrivate.h \
+    libnetdata/libjudy/src/JudyCommon/JudyPrivate1L.h \
+    libnetdata/libjudy/src/JudyCommon/JudyPrivateBranch.h \
+    libnetdata/libjudy/src/JudyL/JudyL.h \
+    libnetdata/libjudy/src/JudyL/JudyLByCount.c \
+    libnetdata/libjudy/src/JudyL/JudyLCascade.c \
+    libnetdata/libjudy/src/JudyL/JudyLCount.c \
+    libnetdata/libjudy/src/JudyL/JudyLCreateBranch.c \
+    libnetdata/libjudy/src/JudyL/JudyLDecascade.c \
+    libnetdata/libjudy/src/JudyL/JudyLDel.c \
+    libnetdata/libjudy/src/JudyL/JudyLFirst.c \
+    libnetdata/libjudy/src/JudyL/JudyLFreeArray.c \
+    libnetdata/libjudy/src/JudyL/j__udyLGet.c \
+    libnetdata/libjudy/src/JudyL/JudyLGet.c \
+    libnetdata/libjudy/src/JudyL/JudyLInsArray.c \
+    libnetdata/libjudy/src/JudyL/JudyLIns.c \
+    libnetdata/libjudy/src/JudyL/JudyLInsertBranch.c \
+    libnetdata/libjudy/src/JudyL/JudyLMallocIF.c \
+    libnetdata/libjudy/src/JudyL/JudyLMemActive.c \
+    libnetdata/libjudy/src/JudyL/JudyLMemUsed.c \
+    libnetdata/libjudy/src/JudyL/JudyLNext.c \
+    libnetdata/libjudy/src/JudyL/JudyLNextEmpty.c \
+    libnetdata/libjudy/src/JudyL/JudyLPrev.c \
+    libnetdata/libjudy/src/JudyL/JudyLPrevEmpty.c \
+    libnetdata/libjudy/src/JudyHS/JudyHS.c \
+    $(NULL)
 
-    nodist_libjudy_a_SOURCES = JudyLTables.c
+nodist_libjudy_a_SOURCES = JudyLTables.c
 
-    BUILT_SOURCES += JudyLTables.c
+BUILT_SOURCES += JudyLTables.c
 
-    CLEANFILES += JudyLTables.c
+CLEANFILES += JudyLTables.c
 
-    libjudy_a_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough
+libjudy_a_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough
 
-    libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrev.$(OBJEXT) : CFLAGS += -DJUDYPREV
-    libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrevEmpty.$(OBJEXT) : CFLAGS += -DJUDYPREV
-    libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNext.$(OBJEXT) : CFLAGS += -DJUDYNEXT
-    libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNextEmpty.$(OBJEXT) : CFLAGS += -DJUDYNEXT
-    libnetdata/libjudy/src/JudyL/libjudy_a-JudyLByCount.$(OBJEXT) : CFLAGS +=  -DNOSMARTJBB -DNOSMARTJBU -DNOSMARTJLB
-    libnetdata/libjudy/src/JudyL/libjudy_a-j__udyLGet.$(OBJEXT) : CFLAGS +=  -DJUDYGETINLINE
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrev.$(OBJEXT) : CFLAGS += -DJUDYPREV
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLPrevEmpty.$(OBJEXT) : CFLAGS += -DJUDYPREV
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNext.$(OBJEXT) : CFLAGS += -DJUDYNEXT
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLNextEmpty.$(OBJEXT) : CFLAGS += -DJUDYNEXT
+libnetdata/libjudy/src/JudyL/libjudy_a-JudyLByCount.$(OBJEXT) : CFLAGS +=  -DNOSMARTJBB -DNOSMARTJBU -DNOSMARTJLB
+libnetdata/libjudy/src/JudyL/libjudy_a-j__udyLGet.$(OBJEXT) : CFLAGS +=  -DJUDYGETINLINE
 
-    noinst_PROGRAMS = judyltablesgen
+noinst_PROGRAMS = judyltablesgen
 
-    judyltablesgen_SOURCES = libnetdata/libjudy/src/JudyL/JudyLTablesGen.c
-    judyltablesgen_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough
+judyltablesgen_SOURCES = libnetdata/libjudy/src/JudyL/JudyLTablesGen.c
+judyltablesgen_CFLAGS = $(LIBJUDY_CFLAGS) -DJUDYL -I$(abs_top_srcdir)/libnetdata/libjudy/src -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyCommon -Wno-sign-compare -Wno-implicit-fallthrough
 
-    judyltablesgen$(EXEEXT) : CFLAGS += -Wno-format -Wno-format-security
+$(builddir)/judyltablesgen$(EXEEXT) : CFLAGS += -Wno-format -Wno-format-security
 
 JudyLTables.c: $(abs_top_srcdir)/libnetdata/libjudy/src/JudyL/JudyLTablesGen.c $(builddir)/judyltablesgen$(EXEEXT)
 	$(builddir)/judyltablesgen$(EXEEXT)
 
-    libjudy_a-JudyLTables.$(OBJEXT) : CFLAGS += -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyL
+libjudy_a-JudyLTables.$(OBJEXT) : CFLAGS += -I$(abs_top_srcdir)/libnetdata/libjudy/src/JudyL
 
+if ENABLE_DBENGINE
     RRD_PLUGIN_FILES += \
         database/engine/rrdengine.c \
         database/engine/rrdengine.h \
@@ -553,16 +551,6 @@ JudyLTables.c: $(abs_top_srcdir)/libnetdata/libjudy/src/JudyL/JudyLTablesGen.c $
         database/engine/pagecache.h \
         database/engine/rrdenglocking.c \
         database/engine/rrdenglocking.h \
-        database/engine/metadata_log/metadatalog.h \
-        database/engine/metadata_log/metadatalogapi.c \
-        database/engine/metadata_log/metadatalogapi.h \
-        database/engine/metadata_log/logfile.h \
-        database/engine/metadata_log/logfile.c \
-        database/engine/metadata_log/metadatalogprotocol.h \
-        database/engine/metadata_log/metalogpluginsd.c \
-        database/engine/metadata_log/metalogpluginsd.h \
-        database/engine/metadata_log/compaction.c \
-        database/engine/metadata_log/compaction.h \
         $(NULL)
 endif
 
@@ -630,6 +618,8 @@ STREAMING_PLUGIN_FILES = \
     streaming/compression.c \
     streaming/sender.c \
     streaming/receiver.c \
+    streaming/replication.h \
+    streaming/replication.c \
     streaming/rrdpush.h \
     $(NULL)
 
@@ -676,8 +666,6 @@ PARSER_FILES = \
 
 if ENABLE_ACLK
 ACLK_FILES = \
-    aclk/aclk.c \
-    aclk/aclk.h \
     aclk/aclk_util.c \
     aclk/aclk_util.h \
     aclk/aclk_stats.c \
@@ -694,38 +682,20 @@ ACLK_FILES = \
     aclk/aclk_rx_msgs.h \
     aclk/https_client.c \
     aclk/https_client.h \
-    mqtt_websockets/src/mqtt_wss_client.c \
-    mqtt_websockets/src/include/mqtt_wss_client.h \
-    mqtt_websockets/src/mqtt_wss_log.c \
-    mqtt_websockets/src/include/mqtt_wss_log.h \
-    mqtt_websockets/src/ws_client.c \
-    mqtt_websockets/src/include/ws_client.h \
-    mqtt_websockets/src/mqtt_ng.c \
-    mqtt_websockets/src/include/mqtt_ng.h \
-    mqtt_websockets/src/common_public.c \
-    mqtt_websockets/src/include/common_public.h \
-    mqtt_websockets/src/include/common_internal.h \
-    mqtt_websockets/c-rbuf/src/ringbuffer.c \
-    mqtt_websockets/c-rbuf/include/ringbuffer.h \
-    mqtt_websockets/c-rbuf/src/ringbuffer_internal.h \
-    mqtt_websockets/MQTT-C/src/mqtt.c \
-    mqtt_websockets/MQTT-C/include/mqtt.h \
-    aclk/aclk_charts_api.c \
-    aclk/aclk_charts_api.h \
     aclk/aclk_alarm_api.c \
     aclk/aclk_alarm_api.h \
     aclk/aclk_contexts_api.c \
     aclk/aclk_contexts_api.h \
+    aclk/aclk_capas.c \
+    aclk/aclk_capas.h \
+    aclk/helpers/mqtt_wss_pal.h \
+    aclk/helpers/ringbuffer_pal.h \
     aclk/schema-wrappers/connection.cc \
     aclk/schema-wrappers/connection.h \
     aclk/schema-wrappers/node_connection.cc \
     aclk/schema-wrappers/node_connection.h \
     aclk/schema-wrappers/node_creation.cc \
     aclk/schema-wrappers/node_creation.h \
-    aclk/schema-wrappers/chart_stream.cc \
-    aclk/schema-wrappers/chart_stream.h \
-    aclk/schema-wrappers/chart_config.cc \
-    aclk/schema-wrappers/chart_config.h \
     aclk/schema-wrappers/alarm_stream.cc \
     aclk/schema-wrappers/alarm_stream.h \
     aclk/schema-wrappers/alarm_config.cc \
@@ -745,6 +715,28 @@ ACLK_FILES = \
     aclk/schema-wrappers/context.h \
     $(NULL)
 
+noinst_LIBRARIES += libmqttwebsockets.a
+
+libmqttwebsockets_a_SOURCES = \
+    mqtt_websockets/src/mqtt_wss_client.c \
+    mqtt_websockets/src/include/mqtt_wss_client.h \
+    mqtt_websockets/src/mqtt_wss_log.c \
+    mqtt_websockets/src/include/mqtt_wss_log.h \
+    mqtt_websockets/src/ws_client.c \
+    mqtt_websockets/src/include/ws_client.h \
+    mqtt_websockets/src/mqtt_ng.c \
+    mqtt_websockets/src/include/mqtt_ng.h \
+    mqtt_websockets/src/common_public.c \
+    mqtt_websockets/src/include/common_public.h \
+    mqtt_websockets/src/include/common_internal.h \
+    mqtt_websockets/c-rbuf/src/ringbuffer.c \
+    mqtt_websockets/c-rbuf/include/ringbuffer.h \
+    mqtt_websockets/c-rbuf/src/ringbuffer_internal.h \
+    mqtt_websockets/MQTT-C/src/mqtt.c \
+    mqtt_websockets/MQTT-C/include/mqtt.h
+
+libmqttwebsockets_a_CFLAGS = $(CFLAGS) -DMQTT_WSS_CUSTOM_ALLOC -DRBUF_CUSTOM_MALLOC -I$(srcdir)/aclk/helpers
+
 mqtt_websockets/src/mqtt_wss_client.$(OBJEXT) : CFLAGS += -Wno-unused-result
 
 ACLK_PROTO_DEFINITIONS = \
@@ -753,10 +745,6 @@ ACLK_PROTO_DEFINITIONS = \
     aclk/aclk-schemas/proto/agent/v1/connection.proto \
     aclk/aclk-schemas/proto/alarm/v1/config.proto \
     aclk/aclk-schemas/proto/alarm/v1/stream.proto \
-    aclk/aclk-schemas/proto/chart/v1/config.proto \
-    aclk/aclk-schemas/proto/chart/v1/dimension.proto \
-    aclk/aclk-schemas/proto/chart/v1/instance.proto \
-    aclk/aclk-schemas/proto/chart/v1/stream.proto \
     aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.proto \
     aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.proto \
     aclk/aclk-schemas/proto/nodeinstance/info/v1/info.proto \
@@ -772,14 +760,6 @@ ACLK_PROTO_BUILT_FILES = aclk/aclk-schemas/proto/agent/v1/connection.pb.cc \
     aclk/aclk-schemas/proto/nodeinstance/connection/v1/connection.pb.h \
     aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.pb.cc \
     aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.pb.h \
-    aclk/aclk-schemas/proto/chart/v1/stream.pb.cc \
-    aclk/aclk-schemas/proto/chart/v1/stream.pb.h \
-    aclk/aclk-schemas/proto/chart/v1/instance.pb.cc \
-    aclk/aclk-schemas/proto/chart/v1/instance.pb.h \
-    aclk/aclk-schemas/proto/chart/v1/dimension.pb.cc \
-    aclk/aclk-schemas/proto/chart/v1/dimension.pb.h \
-    aclk/aclk-schemas/proto/chart/v1/config.pb.cc \
-    aclk/aclk-schemas/proto/chart/v1/config.pb.h \
     aclk/aclk-schemas/proto/aclk/v1/lib.pb.cc \
     aclk/aclk-schemas/proto/aclk/v1/lib.pb.h \
     aclk/aclk-schemas/proto/agent/v1/disconnect.pb.cc \
@@ -812,22 +792,6 @@ aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.pb.cc \
 aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.pb.h: aclk/aclk-schemas/proto/nodeinstance/create/v1/creation.proto
 	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
 
-aclk/aclk-schemas/proto/chart/v1/stream.pb.cc \
-aclk/aclk-schemas/proto/chart/v1/stream.pb.h: aclk/aclk-schemas/proto/chart/v1/stream.proto
-	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
-
-aclk/aclk-schemas/proto/chart/v1/instance.pb.cc \
-aclk/aclk-schemas/proto/chart/v1/instance.pb.h: aclk/aclk-schemas/proto/chart/v1/instance.proto
-	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
-
-aclk/aclk-schemas/proto/chart/v1/dimension.pb.cc \
-aclk/aclk-schemas/proto/chart/v1/dimension.pb.h: aclk/aclk-schemas/proto/chart/v1/dimension.proto
-	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
-
-aclk/aclk-schemas/proto/chart/v1/config.pb.cc \
-aclk/aclk-schemas/proto/chart/v1/config.pb.h: aclk/aclk-schemas/proto/chart/v1/config.proto
-	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
-
 aclk/aclk-schemas/proto/aclk/v1/lib.pb.cc \
 aclk/aclk-schemas/proto/aclk/v1/lib.pb.h: aclk/aclk-schemas/proto/aclk/v1/lib.proto
 	$(PROTOC) -I=aclk/aclk-schemas --cpp_out=$(builddir)/aclk/aclk-schemas $^
@@ -860,10 +824,10 @@ endif #ENABLE_ACLK
 
 ACLK_ALWAYS_BUILD_FILES = \
     aclk/aclk_rrdhost_state.h \
-    aclk/aclk_api.c \
-    aclk/aclk_api.h \
     aclk/aclk_proxy.c \
     aclk/aclk_proxy.h \
+    aclk/aclk.c \
+    aclk/aclk.h \
     $(NULL)
 
 SPAWN_PLUGIN_FILES = \
@@ -950,7 +914,6 @@ NETDATA_FILES = \
     $(LIBNETDATA_FILES) \
     $(API_PLUGIN_FILES) \
     $(EXPORTING_ENGINE_FILES) \
-    $(CHECKS_PLUGIN_FILES) \
     $(HEALTH_PLUGIN_FILES) \
     $(ML_FILES) \
     $(ML_TESTS_FILES) \
@@ -1002,15 +965,15 @@ NETDATA_COMMON_LIBS = \
     $(OPTIONAL_MQTT_LIBS) \
     $(OPTIONAL_UV_LIBS) \
     $(OPTIONAL_LZ4_LIBS) \
-    $(OPTIONAL_JUDY_LIBS) \
+    libjudy.a \
     $(OPTIONAL_SSL_LIBS) \
     $(OPTIONAL_JSONC_LIBS) \
     $(OPTIONAL_ATOMIC_LIBS) \
+    $(OPTIONAL_DL_LIBS) \
     $(NULL)
 
-if ENABLE_DBENGINE
-    NETDATA_COMMON_LIBS += libjudy.a \
-    $(NULL)
+if ENABLE_ACLK
+    NETDATA_COMMON_LIBS += libmqttwebsockets.a
 endif
 
 if LINK_STATIC_JSONC
@@ -1254,6 +1217,7 @@ if ENABLE_UNITTESTS
         $(EXPORTING_ENGINE_FILES) \
         $(LIBNETDATA_FILES) \
         database/rrdlabels.c \
+        database/rrdvar.c \
         $(NULL)
     exporting_tests_exporting_engine_testdriver_CFLAGS = \
         $(AM_CFLAGS) \