From 34a0b66bc2d48223748ed1cf5bc1b305c396bd74 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 26 Jan 2022 19:05:10 +0100 Subject: Adding upstream version 1.33.0. Signed-off-by: Daniel Baumann --- collectors/cgroups.plugin/cgroup-network.c | 35 +----------------------------- collectors/cgroups.plugin/sys_fs_cgroup.h | 21 ------------------ 2 files changed, 1 insertion(+), 55 deletions(-) (limited to 'collectors/cgroups.plugin') diff --git a/collectors/cgroups.plugin/cgroup-network.c b/collectors/cgroups.plugin/cgroup-network.c index 562d30663..6465c91e7 100644 --- a/collectors/cgroups.plugin/cgroup-network.c +++ b/collectors/cgroups.plugin/cgroup-network.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "libnetdata/libnetdata.h" +#include "libnetdata/required_dummies.h" #ifdef HAVE_SETNS #ifndef _GNU_SOURCE @@ -16,40 +17,6 @@ char *environment[] = { NULL }; - -// ---------------------------------------------------------------------------- - -// callback required by fatal() -void netdata_cleanup_and_exit(int ret) { - exit(ret); -} - -void send_statistics( const char *action, const char *action_result, const char *action_data) { - (void) action; - (void) action_result; - (void) action_data; - return; -} - -// callbacks required by popen() -void signals_block(void) {}; -void signals_unblock(void) {}; -void signals_reset(void) {}; - -// callback required by eval() -int health_variable_lookup(const char *variable, uint32_t hash, struct rrdcalc *rc, calculated_number *result) { - (void)variable; - (void)hash; - (void)rc; - (void)result; - return 0; -}; - -// required by get_system_cpus() -char *netdata_configured_host_prefix = ""; - -// ---------------------------------------------------------------------------- - struct iface { const char *device; uint32_t hash; diff --git a/collectors/cgroups.plugin/sys_fs_cgroup.h b/collectors/cgroups.plugin/sys_fs_cgroup.h index 017aa8fb5..85968a4da 100644 --- a/collectors/cgroups.plugin/sys_fs_cgroup.h +++ b/collectors/cgroups.plugin/sys_fs_cgroup.h @@ -5,21 +5,6 @@ #include "daemon/common.h" -#if (TARGET_OS == OS_LINUX) - -#define NETDATA_PLUGIN_HOOK_LINUX_CGROUPS \ - { \ - .name = "PLUGIN[cgroups]", \ - .config_section = CONFIG_SECTION_PLUGINS, \ - .config_name = "cgroups", \ - .enabled = 1, \ - .thread = NULL, \ - .init_routine = NULL, \ - .start_routine = cgroups_main \ - }, - -extern void *cgroups_main(void *ptr); - #define CGROUP_OPTIONS_DISABLED_DUPLICATE 0x00000001 #define CGROUP_OPTIONS_SYSTEM_SLICE_SERVICE 0x00000002 #define CGROUP_OPTIONS_IS_UNIFIED 0x00000004 @@ -54,12 +39,6 @@ typedef struct netdata_ebpf_cgroup_shm { #include "../proc.plugin/plugin_proc.h" -#else // (TARGET_OS == OS_LINUX) - -#define NETDATA_PLUGIN_HOOK_LINUX_CGROUPS - -#endif // (TARGET_OS == OS_LINUX) - extern char *parse_k8s_data(struct label **labels, char *data); #endif //NETDATA_SYS_FS_CGROUP_H -- cgit v1.2.3