is_get_claimed is actually get the current claim id

10 files changed, 24 insertions, 24 deletions

diff --git a/aclk/aclk.c b/aclk/aclk.c
index 891bae1b7a..d3f965389e 100644
--- a/aclk/aclk.c
+++ b/aclk/aclk.c
@@ -141,12 +141,12 @@ static int wait_till_cloud_enabled()
 static int wait_till_agent_claimed(void)
 {
     //TODO prevent malloc and freez
-    char *agent_id = is_agent_claimed();
+    char *agent_id = get_agent_claimid();
     while (likely(!agent_id)) {
         sleep_usec(USEC_PER_SEC * 1);
         if (netdata_exit)
             return 1;
-        agent_id = is_agent_claimed();
+        agent_id = get_agent_claimid();
     }
     freez(agent_id);
     return 0;
@@ -923,7 +923,7 @@ char *ng_aclk_state(void)
     );
     buffer_sprintf(wb, "Protocol Used: Protobuf\nMQTT Version: %d\nClaimed: ", use_mqtt_5 ? 5 : 3);
 
-    char *agent_id = is_agent_claimed();
+    char *agent_id = get_agent_claimid();
     if (agent_id == NULL)
         buffer_strcat(wb, "No\n");
     else {
@@ -1089,7 +1089,7 @@ char *ng_aclk_state_json(void)
     json_object_array_add(grp, tmp);
     json_object_object_add(msg, "protocols-supported", grp);
 
-    char *agent_id = is_agent_claimed();
+    char *agent_id = get_agent_claimid();
     tmp = json_object_new_boolean(agent_id != NULL);
     json_object_object_add(msg, "agent-claimed", tmp);
 
diff --git a/aclk/aclk_otp.c b/aclk/aclk_otp.c
index a0a6607d07..b7bf173c4a 100644
--- a/aclk/aclk_otp.c
+++ b/aclk/aclk_otp.c
@@ -493,7 +493,7 @@ int aclk_get_mqtt_otp(RSA *p_key, char **mqtt_id, char **mqtt_usr, char **mqtt_p
     unsigned char *challenge;
     int challenge_bytes;
 
-    char *agent_id = is_agent_claimed();
+    char *agent_id = get_agent_claimid();
     if (agent_id == NULL) {
         error("Agent was not claimed - cannot perform challenge/response");
         return 1;
@@ -836,7 +836,7 @@ int aclk_get_env(aclk_env_t *env, const char* aclk_hostname, int aclk_port) {
 
     req.request_type = HTTP_REQ_GET;
 
-    char *agent_id = is_agent_claimed();
+    char *agent_id = get_agent_claimid();
     if (agent_id == NULL)
     {
         error("Agent was not claimed - cannot perform challenge/response");
diff --git a/claim/claim.c b/claim/claim.c
index f066797862..59c21aa35a 100644
--- a/claim/claim.c
+++ b/claim/claim.c
@@ -31,7 +31,7 @@ static char *claiming_errors[] = {
 /* Retrieve the claim id for the agent.
  * Caller owns the string.
 */
-char *is_agent_claimed()
+char *get_agent_claimid()
 {
     char *result;
     rrdhost_aclk_state_lock(localhost);
diff --git a/claim/claim.h b/claim/claim.h
index 171cc1fab1..fc76037d39 100644
--- a/claim/claim.h
+++ b/claim/claim.h
@@ -9,7 +9,7 @@ extern char *claiming_pending_arguments;
 extern struct config cloud_config;
 
 void claim_agent(char *claiming_arguments);
-char *is_agent_claimed(void);
+char *get_agent_claimid(void);
 void load_claiming_state(void);
 void load_cloud_conf(int silent);
 
diff --git a/daemon/analytics.c b/daemon/analytics.c
index 6090169446..370818b8a3 100644
--- a/daemon/analytics.c
+++ b/daemon/analytics.c
@@ -541,7 +541,7 @@ void analytics_gather_mutable_meta_data(void)
     analytics_set_data(
         &analytics_data.netdata_config_is_parent, (localhost->next || configured_as_parent()) ? "true" : "false");
 
-    char *claim_id = is_agent_claimed();
+    char *claim_id = get_agent_claimid();
     analytics_set_data(&analytics_data.netdata_host_agent_claimed, claim_id ? "true" : "false");
     freez(claim_id);
 
diff --git a/database/rrdcontext.c b/database/rrdcontext.c
index 639fac68e9..cac7b4706b 100644
--- a/database/rrdcontext.c
+++ b/database/rrdcontext.c
@@ -2176,7 +2176,7 @@ void *rrdcontext_main(void *ptr) {
 
                 worker_is_busy(WORKER_JOB_QUEUED);
                 usec_t dispatch_ut = rrdcontext_queued_dispatch_ut(rc, now_ut);
-                char *claim_id = is_agent_claimed();
+                char *claim_id = get_agent_claimid();
                 if(unlikely(now_ut >= dispatch_ut) && claim_id) {
                     worker_is_busy(WORKER_JOB_CHECK);
 
diff --git a/database/sqlite/sqlite_aclk_alert.c b/database/sqlite/sqlite_aclk_alert.c
index 70c4cbd579..c5c06a4943 100644
--- a/database/sqlite/sqlite_aclk_alert.c
+++ b/database/sqlite/sqlite_aclk_alert.c
@@ -224,7 +224,7 @@ void aclk_push_alert_event(struct aclk_database_worker_config *wc, struct aclk_d
         return;
     }
 
-    char *claim_id = is_agent_claimed();
+    char *claim_id = get_agent_claimid();
     if (unlikely(!claim_id))
         return;
 
@@ -449,7 +449,7 @@ void aclk_push_alarm_health_log(struct aclk_database_worker_config *wc, struct a
 #else
     int rc;
 
-    char *claim_id = is_agent_claimed();
+    char *claim_id = get_agent_claimid();
     if (unlikely(!claim_id))
         return;
 
@@ -911,7 +911,7 @@ void aclk_push_alert_snapshot_event(struct aclk_database_worker_config *wc, stru
     if (unlikely(!wc->alerts_snapshot_id))
         return;
 
-    char *claim_id = is_agent_claimed();
+    char *claim_id = get_agent_claimid();
     if (unlikely(!claim_id))
         return;
 
diff --git a/database/sqlite/sqlite_aclk_chart.c b/database/sqlite/sqlite_aclk_chart.c
index 089e42c9c6..658d8da252 100644
--- a/database/sqlite/sqlite_aclk_chart.c
+++ b/database/sqlite/sqlite_aclk_chart.c
@@ -143,7 +143,7 @@ int aclk_add_chart_event(struct aclk_database_worker_config *wc, struct aclk_dat
     int rc = 0;
     CHECK_SQLITE_CONNECTION(db_meta);
 
-    char *claim_id = is_agent_claimed();
+    char *claim_id = get_agent_claimid();
 
     RRDSET *st = cmd.data;
 
@@ -222,7 +222,7 @@ void aclk_process_dimension_deletion(struct aclk_database_worker_config *wc, str
     if (uuid_parse(wc->host_guid, host_id))
         return;
 
-    char *claim_id = is_agent_claimed();
+    char *claim_id = get_agent_claimid();
     if (!claim_id)
         return;
 
@@ -281,7 +281,7 @@ int aclk_add_dimension_event(struct aclk_database_worker_config *wc, struct aclk
 
     struct aclk_chart_dimension_data *aclk_cd_data = cmd.data;
 
-    char *claim_id = is_agent_claimed();
+    char *claim_id = get_agent_claimid();
     if (!claim_id)
         goto cleanup;
 
@@ -308,7 +308,7 @@ void aclk_send_chart_event(struct aclk_database_worker_config *wc, struct aclk_d
         return;
     }
 
-    char *claim_id = is_agent_claimed();
+    char *claim_id = get_agent_claimid();
     if (unlikely(!claim_id))
         return;
 
@@ -736,7 +736,7 @@ void aclk_start_streaming(char *node_id, uint64_t sequence_id, time_t created_at
                         wc->chart_reset_count);
 
                     chart_reset_t chart_reset;
-                    chart_reset.claim_id = is_agent_claimed();
+                    chart_reset.claim_id = get_agent_claimid();
                     if (chart_reset.claim_id) {
                         chart_reset.node_id = node_id;
                         chart_reset.reason = SEQ_ID_NOT_EXISTS;
@@ -825,7 +825,7 @@ void aclk_update_retention(struct aclk_database_worker_config *wc)
     if (!aclk_connected)
         return;
 
-    char *claim_id = is_agent_claimed();
+    char *claim_id = get_agent_claimid();
     if (unlikely(!claim_id))
         return;
 
@@ -1076,7 +1076,7 @@ void queue_dimension_to_aclk(RRDDIM *rd, time_t last_updated)
     if (unlikely(!wc))
         return;
 
-    char *claim_id = is_agent_claimed();
+    char *claim_id = get_agent_claimid();
     if (unlikely(!claim_id))
         return;
 
@@ -1120,7 +1120,7 @@ void queue_dimension_to_aclk(RRDDIM *rd, time_t last_updated)
 
 void aclk_send_dimension_update(RRDDIM *rd)
 {
-    char *claim_id = is_agent_claimed();
+    char *claim_id = get_agent_claimid();
     if (unlikely(!claim_id))
         return;
 
diff --git a/database/sqlite/sqlite_aclk_node.c b/database/sqlite/sqlite_aclk_node.c
index dda659bb46..cc16dc8aac 100644
--- a/database/sqlite/sqlite_aclk_node.c
+++ b/database/sqlite/sqlite_aclk_node.c
@@ -39,7 +39,7 @@ void sql_build_node_collectors(struct aclk_database_worker_config *wc)
     DICTIONARY *dict = dictionary_create(DICTIONARY_FLAG_SINGLE_THREADED);
 
     upd_node_collectors.node_id = wc->node_id;
-    upd_node_collectors.claim_id = is_agent_claimed();
+    upd_node_collectors.claim_id = get_agent_claimid();
 
     upd_node_collectors.node_collectors = collectors_from_charts(wc->host, dict);
     aclk_update_node_collectors(&upd_node_collectors);
@@ -68,7 +68,7 @@ void sql_build_node_info(struct aclk_database_worker_config *wc, struct aclk_dat
 
     rrd_rdlock();
     node_info.node_id = wc->node_id;
-    node_info.claim_id = is_agent_claimed();
+    node_info.claim_id = get_agent_claimid();
     node_info.machine_guid = wc->host_guid;
     node_info.child = (wc->host != localhost);
     node_info.ml_info.ml_capable = ml_capable(localhost);
diff --git a/web/api/web_api_v1.c b/web/api/web_api_v1.c
index edcdb93024..cf733a8f4b 100644
--- a/web/api/web_api_v1.c
+++ b/web/api/web_api_v1.c
@@ -1077,7 +1077,7 @@ inline int web_client_api_request_v1_info_fill_buffer(RRDHOST *host, BUFFER *wb)
     buffer_strcat(wb, "\t\"aclk-ng-available\": false,\n");
     buffer_strcat(wb, "\t\"aclk-legacy-available\": false,\n");
 #endif
-    char *agent_id = is_agent_claimed();
+    char *agent_id = get_agent_claimid();
     if (agent_id == NULL)
         buffer_strcat(wb, "\t\"agent-claimed\": false,\n");
     else {