From 882bc018f3f128a3f825ce537e00952f84e013e6 Mon Sep 17 00:00:00 2001 From: Emmanuel Vasilakis Date: Thu, 14 Oct 2021 15:22:19 +0300 Subject: Fix build issue related to legacy aclk and new arch code (#11655) * add idefs to protect regions of alerts code * remove check --- database/sqlite/sqlite_aclk_alert.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'database') diff --git a/database/sqlite/sqlite_aclk_alert.c b/database/sqlite/sqlite_aclk_alert.c index 846d9bdf2d..dfc948b529 100644 --- a/database/sqlite/sqlite_aclk_alert.c +++ b/database/sqlite/sqlite_aclk_alert.c @@ -3,7 +3,7 @@ #include "sqlite_functions.h" #include "sqlite_aclk_alert.h" -#ifdef ENABLE_ACLK +#ifdef ENABLE_NEW_CLOUD_PROTOCOL #include "../../aclk/aclk_alarm_api.h" #include "../../aclk/aclk.h" #endif @@ -15,12 +15,17 @@ void sql_queue_alarm_to_aclk(RRDHOST *host, ALARM_ENTRY *ae) //check aclk architecture and handle old json alarm update to cloud //include also the valid statuses for this case #ifdef ENABLE_ACLK +#ifdef ENABLE_NEW_CLOUD_PROTOCOL if (!aclk_use_new_cloud_arch) { +#endif + if ((ae->new_status == RRDCALC_STATUS_WARNING || ae->new_status == RRDCALC_STATUS_CRITICAL) || ((ae->old_status == RRDCALC_STATUS_WARNING || ae->old_status == RRDCALC_STATUS_CRITICAL))) { aclk_update_alarm(host, ae); } return; +#endif +#ifdef ENABLE_NEW_CLOUD_PROTOCOL } if (ae->flags & HEALTH_ENTRY_FLAG_ACLK_QUEUED) @@ -92,7 +97,7 @@ bind_fail: int rrdcalc_status_to_proto_enum(RRDCALC_STATUS status) { -#ifdef ENABLE_ACLK +#ifdef ENABLE_NEW_CLOUD_PROTOCOL switch(status) { case RRDCALC_STATUS_REMOVED: return ALARM_STATUS_REMOVED; -- cgit v1.2.3