Adding upstream version 1.35.0.upstream/1.35.0

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

5 files changed, 39 insertions, 97 deletions

diff --git a/collectors/freebsd.plugin/freebsd_ipfw.c b/collectors/freebsd.plugin/freebsd_ipfw.c
index 76466c3dd..16e9fd332 100644
--- a/collectors/freebsd.plugin/freebsd_ipfw.c
+++ b/collectors/freebsd.plugin/freebsd_ipfw.c
@@ -233,7 +233,7 @@ int do_ipfw(int update_every, usec_t dt) {
                     break;
 
                 if (likely(do_static)) {
-                    sprintf(rule_num_str, "%d_%d", rule->rulenum, rule->id);
+                    sprintf(rule_num_str, "%"PRIu32"_%"PRIu32"", (uint32_t)rule->rulenum, (uint32_t)rule->id);
 
                     rd_packets = rrddim_find_active(st_packets, rule_num_str);
                     if (unlikely(!rd_packets))
diff --git a/collectors/freebsd.plugin/freebsd_kstat_zfs.c b/collectors/freebsd.plugin/freebsd_kstat_zfs.c
index 8b5cc5799..142fdb974 100644
--- a/collectors/freebsd.plugin/freebsd_kstat_zfs.c
+++ b/collectors/freebsd.plugin/freebsd_kstat_zfs.c
@@ -5,6 +5,8 @@
 
 extern struct arcstats arcstats;
 
+unsigned long long zfs_arcstats_shrinkable_cache_size_bytes = 0;
+
 // --------------------------------------------------------------------------------------------------------------------
 // kstat.zfs.misc.arcstats
 
@@ -213,6 +215,12 @@ int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
     // missing mib: GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.arc_need_free", mibs.arc_need_free, arcstats.arc_need_free);
     // missing mib: GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.arc_sys_free", mibs.arc_sys_free, arcstats.arc_sys_free);
 
+    if (arcstats.size > arcstats.c_min) {
+        zfs_arcstats_shrinkable_cache_size_bytes = arcstats.size - arcstats.c_min;
+    } else {
+        zfs_arcstats_shrinkable_cache_size_bytes = 0;
+    }
+
     generate_charts_arcstats("freebsd.plugin", "zfs", show_zero_charts, update_every);
     generate_charts_arc_summary("freebsd.plugin", "zfs", show_zero_charts, update_every);
 
diff --git a/collectors/freebsd.plugin/freebsd_sysctl.c b/collectors/freebsd.plugin/freebsd_sysctl.c
index 3dc1fbfb1..c43743c35 100644
--- a/collectors/freebsd.plugin/freebsd_sysctl.c
+++ b/collectors/freebsd.plugin/freebsd_sysctl.c
@@ -972,8 +972,14 @@ int do_vm_swap_info(int update_every, usec_t dt) {
 
 int do_system_ram(int update_every, usec_t dt) {
     (void)dt;
-    static int mib_active_count[4] = {0, 0, 0, 0}, mib_inactive_count[4] = {0, 0, 0, 0}, mib_wire_count[4] = {0, 0, 0, 0},
-               mib_cache_count[4] = {0, 0, 0, 0}, mib_vfs_bufspace[2] = {0, 0}, mib_free_count[4] = {0, 0, 0, 0};
+    static int mib_active_count[4] = {0, 0, 0, 0},
+               mib_inactive_count[4] = {0, 0, 0, 0},
+               mib_wire_count[4] = {0, 0, 0, 0},
+#if __FreeBSD_version < 1200016
+               mib_cache_count[4] = {0, 0, 0, 0},
+#endif
+               mib_vfs_bufspace[2] = {0, 0},
+               mib_free_count[4] = {0, 0, 0, 0};
     vmmeter_t vmmeter_data;
     size_t vfs_bufspace_count;
 
@@ -1026,10 +1032,8 @@ int do_system_ram(int update_every, usec_t dt) {
             rd_free     = rrddim_add(st, "free",     NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
             rd_active   = rrddim_add(st, "active",   NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
             rd_inactive = rrddim_add(st, "inactive", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
-            rd_wired    = rrddim_add(st, "wired",    NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
-#if __FreeBSD_version < 1200016
-            rd_cache    = rrddim_add(st, "cache",    NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
-#endif
+            rd_wired    = rrddim_add(st, "wired",    NULL, 1, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
+            rd_cache    = rrddim_add(st, "cache",    NULL, 1, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
 #if defined(NETDATA_COLLECT_LAUNDRY)
             rd_laundry  = rrddim_add(st, "laundry",  NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
 #endif
@@ -1040,9 +1044,11 @@ int do_system_ram(int update_every, usec_t dt) {
         rrddim_set_by_pointer(st, rd_free,     vmmeter_data.v_free_count);
         rrddim_set_by_pointer(st, rd_active,   vmmeter_data.v_active_count);
         rrddim_set_by_pointer(st, rd_inactive, vmmeter_data.v_inactive_count);
-        rrddim_set_by_pointer(st, rd_wired,    vmmeter_data.v_wire_count);
+        rrddim_set_by_pointer(st, rd_wired,    vmmeter_data.v_wire_count * system_pagesize - zfs_arcstats_shrinkable_cache_size_bytes);
 #if __FreeBSD_version < 1200016
-        rrddim_set_by_pointer(st, rd_cache,    vmmeter_data.v_cache_count);
+        rrddim_set_by_pointer(st, rd_cache,    vmmeter_data.v_cache_count * system_pagesize + zfs_arcstats_shrinkable_cache_size_bytes);
+#else
+        rrddim_set_by_pointer(st, rd_cache,    zfs_arcstats_shrinkable_cache_size_bytes);
 #endif
 #if defined(NETDATA_COLLECT_LAUNDRY)
         rrddim_set_by_pointer(st, rd_laundry,  vmmeter_data.v_laundry_count);
diff --git a/collectors/freebsd.plugin/plugin_freebsd.c b/collectors/freebsd.plugin/plugin_freebsd.c
index 97ca1d9ae..a52ece3f9 100644
--- a/collectors/freebsd.plugin/plugin_freebsd.c
+++ b/collectors/freebsd.plugin/plugin_freebsd.c
@@ -9,7 +9,6 @@ static struct freebsd_module {
     int enabled;
 
     int (*func)(int update_every, usec_t dt);
-    usec_t duration;
 
     RRDDIM *rd;
 
@@ -68,8 +67,14 @@ static struct freebsd_module {
     {.name = NULL, .dim = NULL, .enabled = 0, .func = NULL}
 };
 
+#if WORKER_UTILIZATION_MAX_JOB_TYPES < 33
+#error WORKER_UTILIZATION_MAX_JOB_TYPES has to be at least 33
+#endif
+
 static void freebsd_main_cleanup(void *ptr)
 {
+    worker_unregister();
+
     struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
     static_thread->enabled = NETDATA_MAIN_THREAD_EXITING;
 
@@ -80,9 +85,9 @@ static void freebsd_main_cleanup(void *ptr)
 
 void *freebsd_main(void *ptr)
 {
-    netdata_thread_cleanup_push(freebsd_main_cleanup, ptr);
+    worker_register("FREEBSD");
 
-    int vdo_cpu_netdata = config_get_boolean("plugin:freebsd", "netdata server resources", 1);
+    netdata_thread_cleanup_push(freebsd_main_cleanup, ptr);
 
     // initialize FreeBSD plugin
     if (freebsd_plugin_init())
@@ -94,8 +99,9 @@ void *freebsd_main(void *ptr)
         struct freebsd_module *pm = &freebsd_modules[i];
 
         pm->enabled = config_get_boolean("plugin:freebsd", pm->name, pm->enabled);
-        pm->duration = 0ULL;
         pm->rd = NULL;
+
+        worker_register_job_name(i, freebsd_modules[i].dim);
     }
 
     usec_t step = localhost->rrd_update_every * USEC_PER_SEC;
@@ -103,14 +109,13 @@ void *freebsd_main(void *ptr)
     heartbeat_init(&hb);
 
     while (!netdata_exit) {
+        worker_is_idle();
+
         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; freebsd_modules[i].name; i++) {
             struct freebsd_module *pm = &freebsd_modules[i];
             if (unlikely(!pm->enabled))
@@ -118,92 +123,12 @@ void *freebsd_main(void *ptr)
 
             debug(D_PROCNETDEV_LOOP, "FREEBSD calling %s.", pm->name);
 
+            worker_is_busy(i);
             pm->enabled = !pm->func(localhost->rrd_update_every, hb_dt);
-            pm->duration = heartbeat_monotonic_dt_to_now_usec(&hb) - duration;
-            duration += pm->duration;
 
             if (unlikely(netdata_exit))
                 break;
         }
-
-        // END -- the job is done
-
-        if (vdo_cpu_netdata) {
-            static RRDSET *st_cpu_thread = NULL, *st_duration = NULL;
-            static RRDDIM *rd_user = NULL, *rd_system = NULL;
-
-            // ----------------------------------------------------------------
-
-            struct rusage thread;
-            getrusage(RUSAGE_THREAD, &thread);
-
-            if (unlikely(!st_cpu_thread)) {
-                st_cpu_thread = rrdset_create_localhost(
-                    "netdata",
-                    "plugin_freebsd_cpu",
-                    NULL,
-                    "freebsd",
-                    NULL,
-                    "Netdata FreeBSD plugin CPU usage",
-                    "milliseconds/s",
-                    "freebsd.plugin",
-                    "stats",
-                    132000,
-                    localhost->rrd_update_every,
-                    RRDSET_TYPE_STACKED);
-
-                rd_user = rrddim_add(st_cpu_thread, "user", NULL, 1, USEC_PER_MS, RRD_ALGORITHM_INCREMENTAL);
-                rd_system = rrddim_add(st_cpu_thread, "system", NULL, 1, USEC_PER_MS, RRD_ALGORITHM_INCREMENTAL);
-            } else {
-                rrdset_next(st_cpu_thread);
-            }
-
-            rrddim_set_by_pointer(
-                st_cpu_thread, rd_user, thread.ru_utime.tv_sec * USEC_PER_SEC + thread.ru_utime.tv_usec);
-            rrddim_set_by_pointer(
-                st_cpu_thread, rd_system, thread.ru_stime.tv_sec * USEC_PER_SEC + thread.ru_stime.tv_usec);
-            rrdset_done(st_cpu_thread);
-
-            // ----------------------------------------------------------------
-
-            if (unlikely(!st_duration)) {
-                st_duration = rrdset_find_active_bytype_localhost("netdata", "plugin_freebsd_modules");
-
-                if (!st_duration) {
-                    st_duration = rrdset_create_localhost(
-                        "netdata",
-                        "plugin_freebsd_modules",
-                        NULL,
-                        "freebsd",
-                        NULL,
-                        "Netdata FreeBSD plugin modules durations",
-                        "milliseconds/run",
-                        "freebsd.plugin",
-                        "stats",
-                        132001,
-                        localhost->rrd_update_every,
-                        RRDSET_TYPE_STACKED);
-
-                    for (i = 0; freebsd_modules[i].name; i++) {
-                        struct freebsd_module *pm = &freebsd_modules[i];
-                        if (unlikely(!pm->enabled))
-                            continue;
-
-                        pm->rd = rrddim_add(st_duration, pm->dim, NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
-                    }
-                }
-            } else
-                rrdset_next(st_duration);
-
-            for (i = 0; freebsd_modules[i].name; i++) {
-                struct freebsd_module *pm = &freebsd_modules[i];
-                if (unlikely(!pm->enabled))
-                    continue;
-
-                rrddim_set_by_pointer(st_duration, pm->rd, pm->duration);
-            }
-            rrdset_done(st_duration);
-        }
     }
 
     netdata_thread_cleanup_pop(1);
diff --git a/collectors/freebsd.plugin/plugin_freebsd.h b/collectors/freebsd.plugin/plugin_freebsd.h
index 26f76b6bf..3a4ec13a7 100644
--- a/collectors/freebsd.plugin/plugin_freebsd.h
+++ b/collectors/freebsd.plugin/plugin_freebsd.h
@@ -49,4 +49,7 @@ extern int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt);
 extern int do_kstat_zfs_misc_zio_trim(int update_every, usec_t dt);
 extern int do_ipfw(int update_every, usec_t dt);
 
+// metrics that need to be shared among data collectors
+extern unsigned long long zfs_arcstats_shrinkable_cache_size_bytes;
+
 #endif /* NETDATA_PLUGIN_FREEBSD_H */