diff options
author | Stelios Fragkakis <52996999+stelfrag@users.noreply.github.com> | 2021-09-20 18:51:50 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-20 18:51:50 +0300 |
commit | cb405deec824848fada38d363cfafa557f6727a4 (patch) | |
tree | 605aae1a7f56c94b5257c2feaa9a4d6efc5d3aed /database | |
parent | 11c6f025df21903be6998f4bba468ee934c55611 (diff) |
Add node message support for ACLK new architecture (#11514)
* node info function
* Code cleanup
* Remove unnecessary strdupz / freez functions
* Fix complication error if ACLK_NG is not available
Diffstat (limited to 'database')
-rw-r--r-- | database/sqlite/sqlite_aclk.c | 8 | ||||
-rw-r--r-- | database/sqlite/sqlite_aclk_node.c | 61 | ||||
-rw-r--r-- | database/sqlite/sqlite_aclk_node.h | 7 |
3 files changed, 70 insertions, 6 deletions
diff --git a/database/sqlite/sqlite_aclk.c b/database/sqlite/sqlite_aclk.c index 6e22be80ed..7dbc8e69ee 100644 --- a/database/sqlite/sqlite_aclk.c +++ b/database/sqlite/sqlite_aclk.c @@ -6,7 +6,7 @@ // TODO: To be added //#include "sqlite_aclk_chart.h" //#include "sqlite_aclk_alert.h" -//#include "sqlite_aclk_node.h" +#include "sqlite_aclk_node.h" const char *aclk_sync_config[] = { NULL, @@ -412,13 +412,9 @@ void aclk_database_worker(void *arg) break; // NODE OPERATIONS - case ACLK_DATABASE_RESET_NODE: - debug(D_ACLK_SYNC,"Resetting the node instance id of %s", (char *) cmd.data); -// aclk_reset_node_event(wc, cmd); - break; case ACLK_DATABASE_NODE_INFO: debug(D_ACLK_SYNC,"Sending node info for %s", wc->uuid_str); -// sql_build_node_info(wc, cmd); + sql_build_node_info(wc, cmd); break; case ACLK_DATABASE_UPD_STATS: // sql_update_metric_statistics(wc, cmd); diff --git a/database/sqlite/sqlite_aclk_node.c b/database/sqlite/sqlite_aclk_node.c new file mode 100644 index 0000000000..98dbd1f99b --- /dev/null +++ b/database/sqlite/sqlite_aclk_node.c @@ -0,0 +1,61 @@ +// SPDX-License-Identifier: GPL-3.0-or-later + +#include "sqlite_functions.h" +#include "sqlite_aclk_node.h" + +#ifdef ACLK_NG +#include "../../aclk/aclk_charts_api.h" +#endif + +void sql_build_node_info(struct aclk_database_worker_config *wc, struct aclk_database_cmd cmd) +{ + UNUSED(cmd); + +#ifdef ACLK_NG + struct update_node_info node_info; + + rrd_wrlock(); + node_info.node_id = wc->node_id; + node_info.claim_id = is_agent_claimed(); + node_info.machine_guid = wc->host_guid; + node_info.child = (wc->host != localhost); + now_realtime_timeval(&node_info.updated_at); + + RRDHOST *host = wc->host; + + node_info.data.name = host->hostname; + node_info.data.os = (char *) host->os; + node_info.data.os_name = host->system_info->host_os_name; + node_info.data.os_version = host->system_info->host_os_version; + node_info.data.kernel_name = host->system_info->kernel_name; + node_info.data.kernel_version = host->system_info->kernel_version; + node_info.data.architecture = host->system_info->architecture; + node_info.data.cpus = str2uint32_t(host->system_info->host_cores); + node_info.data.cpu_frequency = host->system_info->host_cpu_freq; + node_info.data.memory = host->system_info->host_ram_total; + node_info.data.disk_space = host->system_info->host_disk_space; + node_info.data.version = VERSION; + node_info.data.release_channel = "nightly"; + node_info.data.timezone = (char *) host->abbrev_timezone; + node_info.data.virtualization_type = host->system_info->virtualization; + node_info.data.container_type = host->system_info->container; + node_info.data.custom_info = config_get(CONFIG_SECTION_WEB, "custom dashboard_info.js", ""); + node_info.data.services = NULL; // char ** + node_info.data.service_count = 0; + node_info.data.machine_guid = wc->host_guid; + + struct label_index *labels = &host->labels; + netdata_rwlock_wrlock(&labels->labels_rwlock); + node_info.data.host_labels_head = labels->head; + + aclk_update_node_info(&node_info); + + netdata_rwlock_unlock(&labels->labels_rwlock); + rrd_unlock(); + freez(node_info.claim_id); +#else + UNUSED(wc); +#endif + + return; +} diff --git a/database/sqlite/sqlite_aclk_node.h b/database/sqlite/sqlite_aclk_node.h new file mode 100644 index 0000000000..b8f8c6bbf4 --- /dev/null +++ b/database/sqlite/sqlite_aclk_node.h @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-3.0-or-later + +#ifndef NETDATA_SQLITE_ACLK_NODE_H +#define NETDATA_SQLITE_ACLK_NODE_H + +void sql_build_node_info(struct aclk_database_worker_config *wc, struct aclk_database_cmd cmd); +#endif //NETDATA_SQLITE_ACLK_NODE_H |