Merging upstream version 1.36.0.

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

1 files changed, 2 insertions, 16 deletions

diff --git a/aclk/aclk_api.h b/aclk/aclk_api.h
index 557b70d70..36a6d603f 100644
--- a/aclk/aclk_api.h
+++ b/aclk/aclk_api.h
@@ -15,31 +15,17 @@ extern usec_t aclk_session_us;
 extern time_t aclk_session_sec;
 
 extern int aclk_disable_runtime;
-extern int aclk_disable_single_updates;
 
 extern int aclk_stats_enabled;
 extern int aclk_alert_reloaded;
 
-extern int aclk_ng;
 extern int use_mqtt_5;
+extern int aclk_ctx_based;
 
 #ifdef ENABLE_ACLK
 void *aclk_starter(void *ptr);
 
-void aclk_single_update_disable();
-void aclk_single_update_enable();
-
-void aclk_alarm_reload(void);
-
-int aclk_update_chart(RRDHOST *host, char *chart_name, int create);
-int aclk_update_alarm(RRDHOST *host, ALARM_ENTRY *ae);
-
-void aclk_add_collector(RRDHOST *host, const char *plugin_name, const char *module_name);
-void aclk_del_collector(RRDHOST *host, const char *plugin_name, const char *module_name);
-
-#ifdef ENABLE_NEW_CLOUD_PROTOCOL
 void aclk_host_state_update(RRDHOST *host, int connect);
-#endif
 
 #define NETDATA_ACLK_HOOK                                                                                              \
     { .name = "ACLK_Main",                                                                                             \
@@ -52,7 +38,7 @@ void aclk_host_state_update(RRDHOST *host, int connect);
 
 #endif
 
-struct label *add_aclk_host_labels(struct label *label);
+void add_aclk_host_labels(void);
 char *aclk_state(void);
 char *aclk_state_json(void);