1 files changed, 7 insertions, 37 deletions

diff --git a/src/database/sqlite/sqlite_aclk.h b/src/database/sqlite/sqlite_aclk.h
index ce9fed84..ec8cfa9d 100644
--- a/src/database/sqlite/sqlite_aclk.h
+++ b/src/database/sqlite/sqlite_aclk.h
@@ -3,21 +3,9 @@
 #ifndef NETDATA_SQLITE_ACLK_H
 #define NETDATA_SQLITE_ACLK_H
 
-#define ACLK_MAX_ALERT_UPDATES  "5"
-#define ACLK_DATABASE_CLEANUP_FIRST  (1200)
-#define ACLK_DATABASE_CLEANUP_INTERVAL (3600)
-#define ACLK_DELETE_ACK_ALERTS_INTERNAL (86400)
+#define ACLK_MAX_ALERT_UPDATES  "50"
 #define ACLK_SYNC_QUERY_SIZE 512
 
-static inline void uuid_unparse_lower_fix(nd_uuid_t *uuid, char *out)
-{
-    uuid_unparse_lower(*uuid, out);
-    out[8] = '_';
-    out[13] = '_';
-    out[18] = '_';
-    out[23] = '_';
-}
-
 static inline int uuid_parse_fix(char *in, nd_uuid_t uuid)
 {
     in[8] = '-';
@@ -32,25 +20,11 @@ static inline int claimed()
     return localhost->aclk_state.claimed_id != NULL;
 }
 
-#define TABLE_ACLK_ALERT                                                                                               \
-    "CREATE TABLE IF NOT EXISTS aclk_alert_%s (sequence_id INTEGER PRIMARY KEY, "                                      \
-    "alert_unique_id, date_created, date_submitted, date_cloud_ack, filtered_alert_unique_id NOT NULL, "               \
-    "UNIQUE(alert_unique_id))"
-
-#define INDEX_ACLK_ALERT1 "CREATE INDEX IF NOT EXISTS aclk_alert_index1_%s ON aclk_alert_%s (filtered_alert_unique_id)"
-#define INDEX_ACLK_ALERT2 "CREATE INDEX IF NOT EXISTS aclk_alert_index2_%s ON aclk_alert_%s (date_submitted)"
-
 enum aclk_database_opcode {
     ACLK_DATABASE_NOOP = 0,
-
-    ACLK_DATABASE_CLEANUP,
-    ACLK_DATABASE_DELETE_HOST,
     ACLK_DATABASE_NODE_STATE,
     ACLK_DATABASE_PUSH_ALERT,
     ACLK_DATABASE_PUSH_ALERT_CONFIG,
-    ACLK_DATABASE_PUSH_ALERT_SNAPSHOT,
-    ACLK_DATABASE_PUSH_ALERT_CHECKPOINT,
-    ACLK_DATABASE_QUEUE_REMOVED_ALERTS,
     ACLK_DATABASE_NODE_UNREGISTER,
     ACLK_DATABASE_TIMER,
 
@@ -62,29 +36,25 @@ enum aclk_database_opcode {
 struct aclk_database_cmd {
     enum aclk_database_opcode opcode;
     void *param[2];
-    struct completion *completion;
     struct aclk_database_cmd *prev, *next;
 };
 
 typedef struct aclk_sync_cfg_t {
     RRDHOST *host;
-    int alert_updates;
-    int alert_checkpoint_req;
-    int alert_queue_removed;
+    int8_t send_snapshot;
+    bool stream_alerts;
+    int alert_count;
+    int snapshot_count;
+    int checkpoint_count;
     time_t node_info_send_time;
     time_t node_collectors_send;
-    char uuid_str[UUID_STR_LEN];
     char node_id[UUID_STR_LEN];
     char *alerts_snapshot_uuid;        // will contain the snapshot_uuid value if snapshot was requested
-    uint64_t alerts_log_first_sequence_id;
-    uint64_t alerts_log_last_sequence_id;
 } aclk_sync_cfg_t;
 
-void sql_create_aclk_table(RRDHOST *host, nd_uuid_t *host_uuid, nd_uuid_t *node_id);
+void create_aclk_config(RRDHOST *host, nd_uuid_t *host_uuid, nd_uuid_t *node_id);
 void sql_aclk_sync_init(void);
 void aclk_push_alert_config(const char *node_id, const char *config_hash);
-void aclk_push_node_alert_snapshot(const char *node_id);
-void aclk_push_node_removed_alerts(const char *node_id);
 void schedule_node_info_update(RRDHOST *host);
 #ifdef ENABLE_ACLK
 void unregister_node(const char *machine_guid);