Updating the info endpoint for cloud notifications (netdata#8519)

MohameedElsaeid · Mar 30, 2020 · d6f0703 · d6f0703
1 parent 71e1ef8
commit d6f0703
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/aclk/agent_cloud_link.c b/aclk/agent_cloud_link.c
@@ -22,7 +22,7 @@ static char *aclk_password = NULL;
 
 static char *global_base_topic = NULL;
 static int aclk_connecting = 0;
-static int aclk_connected = 0;
+int aclk_connected = 0;             // Exposed in the web-api
 
 static netdata_mutex_t aclk_mutex = NETDATA_MUTEX_INITIALIZER;
 static netdata_mutex_t query_mutex = NETDATA_MUTEX_INITIALIZER;

diff --git a/web/api/web_api_v1.c b/web/api/web_api_v1.c
@@ -807,6 +807,7 @@ inline void host_labels2json(RRDHOST *host, BUFFER *wb, size_t indentation) {
     rrdhost_unlock(host);
 }
 
+extern int aclk_connected;
 inline int web_client_api_request_v1_info_fill_buffer(RRDHOST *host, BUFFER *wb)
 {
     buffer_strcat(wb, "{\n");
@@ -872,9 +873,15 @@ inline int web_client_api_request_v1_info_fill_buffer(RRDHOST *host, BUFFER *wb)
     buffer_strcat(wb, "\t\"cloud-available\": false,\n");
 #endif
     if (is_agent_claimed() == NULL)
-        buffer_strcat(wb, "\t\"agent-claimed\": false\n");
+        buffer_strcat(wb, "\t\"agent-claimed\": false,\n");
     else
-        buffer_strcat(wb, "\t\"agent-claimed\": true\n");
+        buffer_strcat(wb, "\t\"agent-claimed\": true,\n");
+#ifdef ENABLE_ACLK
+    if (aclk_connected)
+        buffer_strcat(wb, "\t\"aclk-available\": true\n");
+    else
+#endif
+        buffer_strcat(wb, "\t\"aclk-available\": false\n");     // Intentionally valid with/without #ifdef above
 
     buffer_strcat(wb, "}");
     return 0;