Cleanup of APIs (#13539)
ACLK related API cleanup
Timotej S committed
Aug 19, 2022 at 17:20 UTC
2df6667153cfcd4b116589315063d73b8ed9b111
2 files changed
+6
-15
daemon/buildinfo.c
+4
-7
@@ -266,9 +266,7 @@ void print_build_info(void) {
266
printf(" dbengine: %s\n", FEAT_YES_NO(FEAT_DBENGINE));
267
printf(" Native HTTPS: %s\n", FEAT_YES_NO(FEAT_NATIVE_HTTPS));
268
printf(" Netdata Cloud: %s %s\n", FEAT_YES_NO(FEAT_CLOUD), FEAT_CLOUD_MSG);
269
- printf(" ACLK Next Generation: %s\n", FEAT_YES_NO(FEAT_CLOUD));
270
- printf(" ACLK-NG New Cloud Protocol: %s\n", FEAT_YES_NO(1));
271
- printf(" ACLK Legacy: %s\n", FEAT_YES_NO(0));
269
+ printf(" ACLK: %s\n", FEAT_YES_NO(FEAT_CLOUD));
270
printf(" TLS Host Verification: %s\n", FEAT_YES_NO(FEAT_TLS_HOST_VERIFY));
271
printf(" Machine Learning: %s\n", FEAT_YES_NO(FEAT_ML));
272
printf(" Stream Compression: %s\n", FEAT_YES_NO(FEAT_STREAM_COMPRESSION));
@@ -318,9 +316,8 @@ void print_build_info_json(void) {
316
#else
317
printf(" \"cloud-disabled\": false,\n");
318
#endif
321
- printf(" \"aclk-ng\": %s,\n", FEAT_JSON_BOOL(FEAT_CLOUD));
322
- printf(" \"aclk-ng-new-cloud-proto\": %s,\n", FEAT_JSON_BOOL(1));
323
- printf(" \"aclk-legacy\": %s,\n", FEAT_JSON_BOOL(0));
319
+ printf(" \"aclk\": %s,\n", FEAT_JSON_BOOL(FEAT_CLOUD));
320
+ printf(" \"aclk-new-cloud-proto\": %s,\n", FEAT_JSON_BOOL(1));
321
322
printf(" \"tls-host-verify\": %s,\n", FEAT_JSON_BOOL(FEAT_TLS_HOST_VERIFY));
323
printf(" \"machine-learning\": %s\n", FEAT_JSON_BOOL(FEAT_ML));
@@ -377,7 +374,7 @@ void analytics_build_info(BUFFER *b) {
374
add_to_bi(b, "Native HTTPS");
375
#endif
376
#ifdef ENABLE_ACLK
380
- add_to_bi(b, "Netdata Cloud|ACLK Next Generation|New Cloud Protocol Support");
377
+ add_to_bi(b, "Netdata Cloud");
378
#endif
379
#if (FEAT_TLS_HOST_VERIFY!=0)
380
add_to_bi(b, "TLS Host Verification");
web/api/web_api_v1.c
+2
-8
@@ -1215,14 +1215,9 @@ inline int web_client_api_request_v1_info_fill_buffer(RRDHOST *host, BUFFER *wb)
1215
1216
#ifdef ENABLE_ACLK
1217
buffer_strcat(wb, "\t\"cloud-available\": true,\n");
1218
- buffer_strcat(wb, "\t\"aclk-ng-available\": true,\n");
1219
- buffer_strcat(wb, "\t\"aclk-ng-new-cloud-protocol\": true,\n");
1220
- buffer_strcat(wb, "\t\"aclk-legacy-available\": false,\n");
1221
- buffer_strcat(wb, "\t\"aclk-implementation\": \"Next Generation\",\n");
1218
+ buffer_strcat(wb, "\t\"aclk-new-cloud-protocol\": true,\n");
1219
#else
1220
buffer_strcat(wb, "\t\"cloud-available\": false,\n");
1224
- buffer_strcat(wb, "\t\"aclk-ng-available\": false,\n");
1225
- buffer_strcat(wb, "\t\"aclk-legacy-available\": false,\n");
1221
#endif
1222
char *agent_id = get_agent_claimid();
1223
if (agent_id == NULL)
@@ -1234,11 +1229,10 @@ inline int web_client_api_request_v1_info_fill_buffer(RRDHOST *host, BUFFER *wb)
1229
#ifdef ENABLE_ACLK
1230
if (aclk_connected) {
1231
buffer_strcat(wb, "\t\"aclk-available\": true,\n");
1237
- buffer_strcat(wb, "\t\"aclk-available-protocol\": \"New\",\n");
1232
}
1233
else
1234
#endif
1241
- buffer_strcat(wb, "\t\"aclk-available\": false,\n\t\"aclk-available-protocol\": null,\n"); // Intentionally valid with/without #ifdef above
1235
+ buffer_strcat(wb, "\t\"aclk-available\": false,\n"); // Intentionally valid with/without #ifdef above
1236
1237
buffer_strcat(wb, "\t\"memory-mode\": ");
1238
analytics_get_data(analytics_data.netdata_config_memory_mode, wb);