Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

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

1 files changed, 0 insertions, 27 deletions

diff --git a/src/collectors/freebsd.plugin/freebsd_sysctl.c b/src/collectors/freebsd.plugin/freebsd_sysctl.c
index 0fa710275..525170e47 100644
--- a/src/collectors/freebsd.plugin/freebsd_sysctl.c
+++ b/src/collectors/freebsd.plugin/freebsd_sysctl.c
@@ -271,7 +271,6 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
                             update_every,
                             RRDSET_TYPE_AREA
                     );
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
 
                     rd = rrddim_add(st, "used", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
                 }
@@ -798,8 +797,6 @@ int do_vm_stats_sys_v_forks(int update_every, usec_t dt) {
                     RRDSET_TYPE_LINE
             );
 
-            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
             rd = rrddim_add(st, "started", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
         }
 
@@ -871,8 +868,6 @@ int do_vm_swap_info(int update_every, usec_t dt) {
                     RRDSET_TYPE_STACKED
             );
 
-            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
             rd_free = rrddim_add(st, "free",    NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
             rd_used = rrddim_add(st, "used",    NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
         }
@@ -1081,8 +1076,6 @@ int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) {
                     RRDSET_TYPE_LINE
             );
 
-            rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
             rd_memory        = rrddim_add(st, "memory",        NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rd_io_requiring  = rrddim_add(st, "io_requiring",  NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
             rd_cow           = rrddim_add(st, "cow",           NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1756,8 +1749,6 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
                             RRDSET_TYPE_LINE
                     );
 
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
                     rd_in_errs      = rrddim_add(st, "InErrs",       NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_in_csum_errs = rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_retrans_segs = rrddim_add(st, "RetransSegs",  NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1795,8 +1786,6 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
                             RRDSET_TYPE_LINE
                     );
 
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
                     rd_estab_resets  = rrddim_add(st, "EstabResets",  NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_active_opens  = rrddim_add(st, "ActiveOpens",  NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_passive_opens = rrddim_add(st, "PassiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1971,8 +1960,6 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
                             RRDSET_TYPE_LINE
                     );
 
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
                     rd_rcvce     = rrddim_add(st, "InCEPkts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
 #if __FreeBSD_version < 1400074
                     rd_ect0      = rrddim_add(st, "ECT0Pkts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -2082,8 +2069,6 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
                             RRDSET_TYPE_LINE
                     );
 
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
                     rd_in_errors       = rrddim_add(st, "InErrors",     NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_no_ports        = rrddim_add(st, "NoPorts",      NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_recv_buf_errors = rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -2332,8 +2317,6 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
                             RRDSET_TYPE_LINE
                     );
 
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
                     rd_ok      = rrddim_add(st, "FragOKs",     "ok",      1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_fails   = rrddim_add(st, "FragFails",   "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_created = rrddim_add(st, "FragCreates", "created", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -2365,8 +2348,6 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
                             RRDSET_TYPE_LINE
                     );
 
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
                     rd_ok     = rrddim_add(st, "ReasmOKs",   "ok",      1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_failed = rrddim_add(st, "ReasmFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_all    = rrddim_add(st, "ReasmReqds", "all",     1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -2400,8 +2381,6 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
                             RRDSET_TYPE_LINE
                     );
 
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
                     rd_in_discards       = rrddim_add(st, "InDiscards",      NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_out_discards      = rrddim_add(st, "OutDiscards",     NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_in_hdr_errors     = rrddim_add(st, "InHdrErrors",     NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -2519,8 +2498,6 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
                              RRDSET_TYPE_LINE
                     );
 
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
                     rd_ok     = rrddim_add(st, "ok",     NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_failed = rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_all    = rrddim_add(st, "all",    NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -2554,8 +2531,6 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
                             RRDSET_TYPE_LINE
                     );
 
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
                     rd_ok      = rrddim_add(st, "ok",      NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_failed  = rrddim_add(st, "failed",  NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_timeout = rrddim_add(st, "timeout", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -2593,8 +2568,6 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
                             RRDSET_TYPE_LINE
                     );
 
-                    rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
-
                     rd_in_discards       = rrddim_add(st, "InDiscards",      NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_out_discards      = rrddim_add(st, "OutDiscards",     NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
                     rd_in_hdr_errors     = rrddim_add(st, "InHdrErrors",     NULL,  1, 1, RRD_ALGORITHM_INCREMENTAL);