diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 08:15:24 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 08:15:35 +0000 |
| commit | f09848204fa5283d21ea43e262ee41aa578e1808 (patch) | |
| tree | c62385d7adf209fa6a798635954d887f718fb3fb /src/daemon/buildinfo.c | |
| parent | Releasing debian version 1.46.3-2. (diff) | |
| download | netdata-f09848204fa5283d21ea43e262ee41aa578e1808.tar.xz netdata-f09848204fa5283d21ea43e262ee41aa578e1808.zip | |
Merging upstream version 1.47.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/daemon/buildinfo.c')
| -rw-r--r-- | src/daemon/buildinfo.c | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/src/daemon/buildinfo.c b/src/daemon/buildinfo.c index 4ee5b43de..ace96199a 100644 --- a/src/daemon/buildinfo.c +++ b/src/daemon/buildinfo.c @@ -75,6 +75,7 @@ typedef enum __attribute__((packed)) { BIB_LIB_LIBCAP, BIB_LIB_LIBCRYPTO, BIB_LIB_LIBYAML, + BIB_LIB_LIBMNL, BIB_PLUGIN_APPS, BIB_PLUGIN_LINUX_CGROUPS, BIB_PLUGIN_LINUX_CGROUP_NETWORK, @@ -96,7 +97,6 @@ typedef enum __attribute__((packed)) { BIB_PLUGIN_SLABINFO, BIB_PLUGIN_XEN, BIB_PLUGIN_XEN_VBD_ERROR, - BIB_PLUGIN_LOGS_MANAGEMENT, BIB_EXPORT_AWS_KINESIS, BIB_EXPORT_GCP_PUBSUB, BIB_EXPORT_MONGOC, @@ -698,6 +698,14 @@ static struct { .json = "libyaml", .value = NULL, }, + [BIB_LIB_LIBMNL] = { + .category = BIC_LIBS, + .type = BIT_BOOLEAN, + .analytics = "libmnl", + .print = "libmnl (library for working with netfilter)", + .json = "libmnl", + .value = NULL, + }, [BIB_PLUGIN_APPS] = { .category = BIC_PLUGINS, .type = BIT_BOOLEAN, @@ -866,14 +874,6 @@ static struct { .json = "xen-vbd-error", .value = NULL, }, - [BIB_PLUGIN_LOGS_MANAGEMENT] = { - .category = BIC_PLUGINS, - .type = BIT_BOOLEAN, - .analytics = "Logs Management", - .print = "Logs Management", - .json = "logs-management", - .value = NULL, - }, [BIB_EXPORT_MONGOC] = { .category = BIC_EXPORTERS, .type = BIT_BOOLEAN, @@ -1177,6 +1177,9 @@ __attribute__((constructor)) void initialize_build_info(void) { #ifdef HAVE_LIBYAML build_info_set_status(BIB_LIB_LIBYAML, true); #endif +#ifdef HAVE_LIBMNL + build_info_set_status(BIB_LIB_LIBMNL, true); +#endif #ifdef ENABLE_PLUGIN_APPS build_info_set_status(BIB_PLUGIN_APPS, true); @@ -1217,9 +1220,6 @@ __attribute__((constructor)) void initialize_build_info(void) { #ifdef HAVE_XENSTAT_VBD_ERROR build_info_set_status(BIB_PLUGIN_XEN_VBD_ERROR, true); #endif -#ifdef ENABLE_LOGSMANAGEMENT - build_info_set_status(BIB_PLUGIN_LOGS_MANAGEMENT, true); -#endif build_info_set_status(BIB_EXPORT_PROMETHEUS_EXPORTER, true); build_info_set_status(BIB_EXPORT_GRAPHITE, true); @@ -1278,9 +1278,18 @@ static void populate_system_info(void) { system_info = localhost->system_info; } else { + bool started_spawn_server = false; + if(!netdata_main_spawn_server) { + started_spawn_server = true; + netdata_main_spawn_server_init(NULL, 0, NULL); + } + system_info = callocz(1, sizeof(struct rrdhost_system_info)); get_system_info(system_info); free_system_info = true; + + if(started_spawn_server) + netdata_main_spawn_server_cleanup(); } build_info_set_value_strdupz(BIB_OS_KERNEL_NAME, system_info->kernel_name); |