Merging upstream version 1.11.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 201 deletions

diff --git a/src/plugin_proc.c b/src/plugin_proc.c
deleted file mode 100644
index e0afb0d6..00000000
--- a/src/plugin_proc.c
+++ /dev/null
@@ -1,201 +0,0 @@
-#include "common.h"
-
-static struct proc_module {
-    const char *name;
-    const char *dim;
-
-    int enabled;
-
-    int (*func)(int update_every, usec_t dt);
-    usec_t duration;
-
-    RRDDIM *rd;
-
-} proc_modules[] = {
-
-        // system metrics
-        { .name = "/proc/stat", .dim = "stat", .func = do_proc_stat },
-        { .name = "/proc/uptime", .dim = "uptime", .func = do_proc_uptime },
-        { .name = "/proc/loadavg", .dim = "loadavg", .func = do_proc_loadavg },
-        { .name = "/proc/sys/kernel/random/entropy_avail", .dim = "entropy", .func = do_proc_sys_kernel_random_entropy_avail },
-
-        // CPU metrics
-        { .name = "/proc/interrupts", .dim = "interrupts", .func = do_proc_interrupts },
-        { .name = "/proc/softirqs", .dim = "softirqs", .func = do_proc_softirqs },
-
-        // memory metrics
-        { .name = "/proc/vmstat", .dim = "vmstat", .func = do_proc_vmstat },
-        { .name = "/proc/meminfo", .dim = "meminfo", .func = do_proc_meminfo },
-        { .name = "/sys/kernel/mm/ksm", .dim = "ksm", .func = do_sys_kernel_mm_ksm },
-        { .name = "/sys/devices/system/edac/mc", .dim = "ecc", .func = do_proc_sys_devices_system_edac_mc },
-        { .name = "/sys/devices/system/node", .dim = "numa", .func = do_proc_sys_devices_system_node },
-
-        // network metrics
-        { .name = "/proc/net/dev", .dim = "netdev", .func = do_proc_net_dev },
-        { .name = "/proc/net/sockstat", .dim = "sockstat", .func = do_proc_net_sockstat },
-        { .name = "/proc/net/sockstat6", .dim = "sockstat6", .func = do_proc_net_sockstat6 },
-        { .name = "/proc/net/netstat", .dim = "netstat", .func = do_proc_net_netstat }, // this has to be before /proc/net/snmp, because there is a shared metric
-        { .name = "/proc/net/snmp", .dim = "snmp", .func = do_proc_net_snmp },
-        { .name = "/proc/net/snmp6", .dim = "snmp6", .func = do_proc_net_snmp6 },
-        { .name = "/proc/net/softnet_stat", .dim = "softnet", .func = do_proc_net_softnet_stat },
-        { .name = "/proc/net/ip_vs/stats", .dim = "ipvs", .func = do_proc_net_ip_vs_stats },
-
-        // firewall metrics
-        { .name = "/proc/net/stat/conntrack", .dim = "conntrack", .func = do_proc_net_stat_conntrack },
-        { .name = "/proc/net/stat/synproxy", .dim = "synproxy", .func = do_proc_net_stat_synproxy },
-
-        // disk metrics
-        { .name = "/proc/diskstats", .dim = "diskstats", .func = do_proc_diskstats },
-
-        // NFS metrics
-        { .name = "/proc/net/rpc/nfsd", .dim = "nfsd", .func = do_proc_net_rpc_nfsd },
-        { .name = "/proc/net/rpc/nfs", .dim = "nfs", .func = do_proc_net_rpc_nfs },
-
-        // ZFS metrics
-        { .name = "/proc/spl/kstat/zfs/arcstats", .dim = "zfs_arcstats", .func = do_proc_spl_kstat_zfs_arcstats },
-
-        // BTRFS metrics
-        { .name = "/sys/fs/btrfs", .dim = "btrfs", .func = do_sys_fs_btrfs },
-
-        // IPC metrics
-        { .name = "ipc", .dim = "ipc", .func = do_ipc },
-
-        // the terminator of this array
-        { .name = NULL, .dim = NULL, .func = NULL }
-};
-
-static void proc_main_cleanup(void *ptr) {
-    struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
-    static_thread->enabled = NETDATA_MAIN_THREAD_EXITING;
-
-    info("cleaning up...");
-
-    static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
-}
-
-void *proc_main(void *ptr) {
-    netdata_thread_cleanup_push(proc_main_cleanup, ptr);
-
-    int vdo_cpu_netdata = config_get_boolean("plugin:proc", "netdata server resources", 1);
-
-    // check the enabled status for each module
-    int i;
-    for(i = 0 ; proc_modules[i].name ;i++) {
-        struct proc_module *pm = &proc_modules[i];
-
-        pm->enabled = config_get_boolean("plugin:proc", pm->name, 1);
-        pm->duration = 0ULL;
-        pm->rd = NULL;
-    }
-
-    usec_t step = localhost->rrd_update_every * USEC_PER_SEC;
-    heartbeat_t hb;
-    heartbeat_init(&hb);
-
-    while(!netdata_exit) {
-        usec_t hb_dt = heartbeat_next(&hb, step);
-        usec_t duration = 0ULL;
-
-        if(unlikely(netdata_exit)) break;
-
-        // BEGIN -- the job to be done
-
-        for(i = 0 ; proc_modules[i].name ;i++) {
-            struct proc_module *pm = &proc_modules[i];
-            if(unlikely(!pm->enabled)) continue;
-
-            debug(D_PROCNETDEV_LOOP, "PROC calling %s.", pm->name);
-
-            pm->enabled = !pm->func(localhost->rrd_update_every, hb_dt);
-            pm->duration = heartbeat_dt_usec(&hb) - duration;
-            duration += pm->duration;
-
-            if(unlikely(netdata_exit)) break;
-        }
-
-        // END -- the job is done
-
-        // --------------------------------------------------------------------
-
-        if(vdo_cpu_netdata) {
-            static RRDSET *st = NULL;
-
-            if(unlikely(!st)) {
-                st = rrdset_find_bytype_localhost("netdata", "plugin_proc_modules");
-
-                if(!st) {
-                    st = rrdset_create_localhost(
-                            "netdata"
-                            , "plugin_proc_modules"
-                            , NULL
-                            , "proc"
-                            , NULL
-                            , "NetData Proc Plugin Modules Durations"
-                            , "milliseconds/run"
-                            , "netdata"
-                            , "stats"
-                            , 132001
-                            , localhost->rrd_update_every
-                            , RRDSET_TYPE_STACKED
-                    );
-
-                    for(i = 0 ; proc_modules[i].name ;i++) {
-                        struct proc_module *pm = &proc_modules[i];
-                        if(unlikely(!pm->enabled)) continue;
-
-                        pm->rd = rrddim_add(st, pm->dim, NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
-                    }
-                }
-            }
-            else rrdset_next(st);
-
-            for(i = 0 ; proc_modules[i].name ;i++) {
-                struct proc_module *pm = &proc_modules[i];
-                if(unlikely(!pm->enabled)) continue;
-
-                rrddim_set_by_pointer(st, pm->rd, pm->duration);
-            }
-            rrdset_done(st);
-
-            global_statistics_charts();
-            registry_statistics();
-        }
-    }
-
-    netdata_thread_cleanup_pop(1);
-    return NULL;
-}
-
-int get_numa_node_count(void)
-{
-    static int numa_node_count = -1;
-
-    if (numa_node_count != -1)
-        return numa_node_count;
-
-    numa_node_count = 0;
-
-    char name[FILENAME_MAX + 1];
-    snprintfz(name, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/devices/system/node");
-    char *dirname = config_get("plugin:proc:/sys/devices/system/node", "directory to monitor", name);
-
-    DIR *dir = opendir(dirname);
-    if(dir) {
-        struct dirent *de = NULL;
-        while((de = readdir(dir))) {
-            if(de->d_type != DT_DIR)
-                continue;
-
-            if(strncmp(de->d_name, "node", 4) != 0)
-                continue;
-
-            if(!isdigit(de->d_name[4]))
-                continue;
-
-            numa_node_count++;
-        }
-        closedir(dir);
-    }
-
-    return numa_node_count;
-}