@cryptotaxi247 / netdata-1 / commits / a166bbd09

Pass node_id and config_hash vars when queueing alert configurations (#14769)

fix passing of node_id, config_hash

Emmanuel Vasilakis committed Mar 21, 2023 at 09:41 UTC a166bbd092a304d476bd80dba37c932f4956ee3a

2 files changed +5 -2

database/sqlite/sqlite_aclk.c

+1 -1

@@ -584,7 +584,7 @@ void aclk_push_alert_config(const char *node_id, const char *config_hash)

584 if (unlikely(!aclk_sync_config.initialized))

585 return;

586

587 - queue_aclk_sync_cmd(ACLK_DATABASE_PUSH_ALERT_CONFIG, node_id, config_hash);

587 + queue_aclk_sync_cmd(ACLK_DATABASE_PUSH_ALERT_CONFIG, strdupz(node_id), strdupz(config_hash));

588 }

589

590 void aclk_push_node_alert_snapshot(const char *node_id)

database/sqlite/sqlite_aclk_alert.c

+4 -1

@@ -644,12 +644,14 @@ int aclk_push_alert_config_event(char *node_id __maybe_unused, char *config_hash

644

645 if (unlikely(!host)) {

646 freez(config_hash);

647 + freez(node_id);

648 return 1;

649 }

650

651 wc = (struct aclk_sync_host_config *)host->aclk_sync_host_config;

652 if (unlikely(!wc)) {

653 freez(config_hash);

654 + freez(node_id);

655 return 1;

656 }

657

@@ -734,7 +736,6 @@ int aclk_push_alert_config_event(char *node_id __maybe_unused, char *config_hash

736 if (likely(p_alarm_config.cfg_hash)) {

737 log_access("ACLK RES [%s (%s)]: Sent alert config %s.", wc->node_id, wc->host ? rrdhost_hostname(wc->host) : "N/A", config_hash);

738 aclk_send_provide_alarm_cfg(&p_alarm_config);

737 - freez((char *) config_hash);

739 freez(p_alarm_config.cfg_hash);

740 destroy_aclk_alarm_configuration(&alarm_config);

741 }

@@ -746,6 +747,8 @@ bind_fail:

747 if (unlikely(rc != SQLITE_OK))

748 error_report("Failed to reset statement when pushing alarm config hash, rc = %d", rc);

749

750 + freez(config_hash);

751 + freez(node_id);

752 #endif

753 return rc;

754 }