@cryptotaxi247 / netdata-1 / commits / d0cd29a91

unified rrdset and rrddim to use enum for flags

Costa Tsaousis (ktsaou) committed Feb 18, 2017 at 22:29 UTC d0cd29a9196763270421280e97bf53a49a3db85c
23 files changed +206 -169
src/freebsd_sysctl.c
+26 -26
@@ -353,7 +353,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
353 st = rrdset_find_localhost("mem.committed");
354 if (unlikely(!st)) {
355 st = rrdset_create_localhost("mem", "committed", NULL, "system", NULL, "Committed (Allocated) Memory", "MB", 5000, update_every, RRDSET_TYPE_AREA);
356 - st->isdetail = 1;
356 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
357
358 rrddim_add(st, "Committed_AS", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
359 }
@@ -466,7 +466,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
466 st = rrdset_find_bytype_localhost("system", "intr");
467 if (unlikely(!st)) {
468 st = rrdset_create_localhost("system", "intr", NULL, "interrupts", NULL, "Total Hardware Interrupts", "interrupts/s", 900, update_every, RRDSET_TYPE_LINE);
469 - st->isdetail = 1;
469 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
470
471 rrddim_add(st, "interrupts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
472 }
@@ -579,7 +579,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
579 st = rrdset_find_bytype_localhost("system", "forks");
580 if (unlikely(!st)) {
581 st = rrdset_create_localhost("system", "forks", NULL, "processes", NULL, "Started Processes", "processes/s", 700, update_every, RRDSET_TYPE_LINE);
582 - st->isdetail = 1;
582 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
583
584 rrddim_add(st, "started", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
585 }
@@ -632,7 +632,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
632 st = rrdset_find_bytype_localhost("disk_ops", disk);
633 if (unlikely(!st)) {
634 st = rrdset_create_localhost("disk_ops", disk, NULL, disk, "disk.ops", "Disk Completed I/O Operations", "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
635 - st->isdetail = 1;
635 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
636
637 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
638 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -648,7 +648,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
648 st = rrdset_find_bytype_localhost("disk_qops", disk);
649 if (unlikely(!st)) {
650 st = rrdset_create_localhost("disk_qops", disk, NULL, disk, "disk.qops", "Disk Current I/O Operations", "operations", 2002, update_every, RRDSET_TYPE_LINE);
651 - st->isdetail = 1;
651 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
652
653 rrddim_add(st, "operations", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
654 }
@@ -662,7 +662,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
662 st = rrdset_find_bytype_localhost("disk_util", disk);
663 if (unlikely(!st)) {
664 st = rrdset_create_localhost("disk_util", disk, NULL, disk, "disk.util", "Disk Utilization Time", "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
665 - st->isdetail = 1;
665 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
666
667 rrddim_add(st, "utilization", NULL, 1, 10, RRD_ALGORITHM_INCREMENTAL);
668 }
@@ -677,7 +677,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
677 st = rrdset_find_bytype_localhost("disk_iotime", disk);
678 if (unlikely(!st)) {
679 st = rrdset_create_localhost("disk_iotime", disk, NULL, disk, "disk.iotime", "Disk Total I/O Time", "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
680 - st->isdetail = 1;
680 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
681
682 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
683 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -701,7 +701,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
701 st = rrdset_find_bytype_localhost("disk_await", disk);
702 if (unlikely(!st)) {
703 st = rrdset_create_localhost("disk_await", disk, NULL, disk, "disk.await", "Average Completed I/O Operation Time", "ms per operation", 2005, update_every, RRDSET_TYPE_LINE);
704 - st->isdetail = 1;
704 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
705
706 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
707 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -719,7 +719,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
719 st = rrdset_find_bytype_localhost("disk_avgsz", disk);
720 if (unlikely(!st)) {
721 st = rrdset_create_localhost("disk_avgsz", disk, NULL, disk, "disk.avgsz", "Average Completed I/O Operation Bandwidth", "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
722 - st->isdetail = 1;
722 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
723
724 rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
725 rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -737,7 +737,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
737 st = rrdset_find_bytype_localhost("disk_svctm", disk);
738 if (unlikely(!st)) {
739 st = rrdset_create_localhost("disk_svctm", disk, NULL, disk, "disk.svctm", "Average Service Time", "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
740 - st->isdetail = 1;
740 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
741
742 rrddim_add(st, "svctm", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
743 }
@@ -801,7 +801,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
801 st = rrdset_find_localhost("system.swap");
802 if (unlikely(!st)) {
803 st = rrdset_create_localhost("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every, RRDSET_TYPE_STACKED);
804 - st->isdetail = 1;
804 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
805
806 rrddim_add(st, "free", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
807 rrddim_add(st, "used", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
@@ -892,7 +892,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
892 st = rrdset_find_localhost("mem.pgfaults");
893 if (unlikely(!st)) {
894 st = rrdset_create_localhost("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults", "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
895 - st->isdetail = 1;
895 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
896
897 rrddim_add(st, "memory", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
898 rrddim_add(st, "io_requiring", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1246,7 +1246,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1246 st = rrdset_find_bytype_localhost("net_packets", ifa->ifa_name);
1247 if (unlikely(!st)) {
1248 st = rrdset_create_localhost("net_packets", ifa->ifa_name, NULL, ifa->ifa_name, "net.packets", "Packets", "packets/s", 7001, update_every, RRDSET_TYPE_LINE);
1249 - st->isdetail = 1;
1249 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1250
1251 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1252 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1266,7 +1266,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1266 st = rrdset_find_bytype_localhost("net_errors", ifa->ifa_name);
1267 if (unlikely(!st)) {
1268 st = rrdset_create_localhost("net_errors", ifa->ifa_name, NULL, ifa->ifa_name, "net.errors", "Interface Errors", "errors/s", 7002, update_every, RRDSET_TYPE_LINE);
1269 - st->isdetail = 1;
1269 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1270
1271 rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1272 rrddim_add(st, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1282,7 +1282,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1282 st = rrdset_find_bytype_localhost("net_drops", ifa->ifa_name);
1283 if (unlikely(!st)) {
1284 st = rrdset_create_localhost("net_drops", ifa->ifa_name, NULL, ifa->ifa_name, "net.drops", "Interface Drops", "drops/s", 7003, update_every, RRDSET_TYPE_LINE);
1285 - st->isdetail = 1;
1285 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1286
1287 rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1288 #if __FreeBSD__ >= 11
@@ -1302,7 +1302,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1302 st = rrdset_find_bytype_localhost("net_events", ifa->ifa_name);
1303 if (unlikely(!st)) {
1304 st = rrdset_create_localhost("net_events", ifa->ifa_name, NULL, ifa->ifa_name, "net.events", "Network Interface Events", "events/s", 7006, update_every, RRDSET_TYPE_LINE);
1305 - st->isdetail = 1;
1305 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1306
1307 rrddim_add(st, "frames", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1308 rrddim_add(st, "collisions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1387,7 +1387,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1387 st = rrdset_create_localhost("ipv4", "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors",
1388 "packets/s",
1389 2700, update_every, RRDSET_TYPE_LINE);
1390 - st->isdetail = 1;
1390 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1391
1392 rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1393 rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1413,7 +1413,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1413 st = rrdset_create_localhost("ipv4", "tcphandshake", NULL, "tcp", NULL,
1414 "IPv4 TCP Handshake Issues",
1415 "events/s", 2900, update_every, RRDSET_TYPE_LINE);
1416 - st->isdetail = 1;
1416 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1417
1418 rrddim_add(st, "EstabResets", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1419 rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1497,7 +1497,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1497 st = rrdset_find_localhost("ipv4.ecnpkts");
1498 if (unlikely(!st)) {
1499 st = rrdset_create_localhost("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics", "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
1500 - st->isdetail = 1;
1500 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1501
1502 rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1503 rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1549,7 +1549,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1549 if (unlikely(!st)) {
1550 st = rrdset_create_localhost("ipv4", "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s",
1551 2701, update_every, RRDSET_TYPE_LINE);
1552 - st->isdetail = 1;
1552 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1553
1554 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1555 rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1691,7 +1691,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1691 if (unlikely(!st)) {
1692 st = rrdset_create_localhost("ipv4", "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent",
1693 "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
1694 - st->isdetail = 1;
1694 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1695
1696 rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1697 rrddim_add(st, "FragFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1713,7 +1713,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1713 st = rrdset_create_localhost("ipv4", "fragsin", NULL, "fragments", NULL,
1714 "IPv4 Fragments Reassembly",
1715 "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
1716 - st->isdetail = 1;
1716 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1717
1718 rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1719 rrddim_add(st, "ReasmFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1735,7 +1735,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1735 st = rrdset_create_localhost("ipv4", "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s",
1736 3002,
1737 update_every, RRDSET_TYPE_LINE);
1738 - st->isdetail = 1;
1738 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1739
1740 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1741 rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1805,7 +1805,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1805 if (unlikely(!st)) {
1806 st = rrdset_create_localhost("ipv6", "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent",
1807 "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
1808 - st->isdetail = 1;
1808 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1809
1810 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1811 rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1829,7 +1829,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1829 if (unlikely(!st)) {
1830 st = rrdset_create_localhost("ipv6", "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly",
1831 "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
1832 - st->isdetail = 1;
1832 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1833
1834 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1835 rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1862,7 +1862,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1862 if (unlikely(!st)) {
1863 st = rrdset_create_localhost("ipv6", "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s", 3002,
1864 update_every, RRDSET_TYPE_LINE);
1865 - st->isdetail = 1;
1865 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1866
1867 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1868 rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/macos_fw.c
+10 -10
@@ -168,7 +168,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
168 st = rrdset_create_localhost("disk_ops", diskstat.name, NULL, diskstat.name, "disk.ops"
169 , "Disk Completed I/O Operations", "operations/s", 2001
170 , update_every, RRDSET_TYPE_LINE);
171 - st->isdetail = 1;
171 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
172
173 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
174 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -196,7 +196,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
196 st = rrdset_create_localhost("disk_util", diskstat.name, NULL, diskstat.name, "disk.util"
197 , "Disk Utilization Time", "% of time working", 2004, update_every
198 , RRDSET_TYPE_AREA);
199 - st->isdetail = 1;
199 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
200
201 rrddim_add(st, "utilization", NULL, 1, 10000000, RRD_ALGORITHM_INCREMENTAL);
202 }
@@ -223,7 +223,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
223 st = rrdset_create_localhost("disk_iotime", diskstat.name, NULL, diskstat.name, "disk.iotime"
224 , "Disk Total I/O Time", "milliseconds/s", 2022, update_every
225 , RRDSET_TYPE_LINE);
226 - st->isdetail = 1;
226 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
227
228 rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_INCREMENTAL);
229 rrddim_add(st, "writes", NULL, -1, 1000000, RRD_ALGORITHM_INCREMENTAL);
@@ -249,7 +249,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
249 st = rrdset_create_localhost("disk_await", diskstat.name, NULL, diskstat.name, "disk.await"
250 , "Average Completed I/O Operation Time", "ms per operation"
251 , 2005, update_every, RRDSET_TYPE_LINE);
252 - st->isdetail = 1;
252 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
253
254 rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
255 rrddim_add(st, "writes", NULL, -1, 1000000, RRD_ALGORITHM_ABSOLUTE);
@@ -270,7 +270,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
270 , "Average Completed I/O Operation Bandwidth"
271 , "kilobytes per operation", 2006, update_every
272 , RRDSET_TYPE_AREA);
273 - st->isdetail = 1;
273 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
274
275 rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
276 rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -290,7 +290,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
290 st = rrdset_create_localhost("disk_svctm", diskstat.name, NULL, diskstat.name, "disk.svctm"
291 , "Average Service Time", "ms per operation", 2007
292 , update_every, RRDSET_TYPE_LINE);
293 - st->isdetail = 1;
293 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
294
295 rrddim_add(st, "svctm", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
296 }
@@ -435,7 +435,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
435 if (unlikely(!st)) {
436 st = rrdset_create_localhost("net_packets", ifa->ifa_name, NULL, ifa->ifa_name, "net.packets"
437 , "Packets", "packets/s", 7001, update_every, RRDSET_TYPE_LINE);
438 - st->isdetail = 1;
438 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
439
440 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
441 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -456,7 +456,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
456 if (unlikely(!st)) {
457 st = rrdset_create_localhost("net_errors", ifa->ifa_name, NULL, ifa->ifa_name, "net.errors"
458 , "Interface Errors", "errors/s", 7002, update_every, RRDSET_TYPE_LINE);
459 - st->isdetail = 1;
459 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
460
461 rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
462 rrddim_add(st, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -473,7 +473,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
473 if (unlikely(!st)) {
474 st = rrdset_create_localhost("net_drops", ifa->ifa_name, NULL, ifa->ifa_name, "net.drops"
475 , "Interface Drops", "drops/s", 7003, update_every, RRDSET_TYPE_LINE);
476 - st->isdetail = 1;
476 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
477
478 rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
479 }
@@ -489,7 +489,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
489 st = rrdset_create_localhost("net_events", ifa->ifa_name, NULL, ifa->ifa_name, "net.events"
490 , "Network Interface Events", "events/s", 7006, update_every
491 , RRDSET_TYPE_LINE);
492 - st->isdetail = 1;
492 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
493
494 rrddim_add(st, "frames", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
495 rrddim_add(st, "collisions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/macos_mach_smi.c
+1 -1
@@ -137,7 +137,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
137 if (unlikely(!st)) {
138 st = rrdset_create_localhost("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults"
139 , "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
140 - st->isdetail = 1;
140 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
141
142 rrddim_add(st, "memory", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
143 rrddim_add(st, "cow", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/macos_sysctl.c
+11 -11
@@ -248,7 +248,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
248 if (unlikely(!st)) {
249 st = rrdset_create_localhost("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201
250 , update_every, RRDSET_TYPE_STACKED);
251 - st->isdetail = 1;
251 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
252
253 rrddim_add(st, "free", NULL, 1, 1048576, RRD_ALGORITHM_ABSOLUTE);
254 rrddim_add(st, "used", NULL, 1, 1048576, RRD_ALGORITHM_ABSOLUTE);
@@ -354,7 +354,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
354 if (unlikely(!st)) {
355 st = rrdset_create_localhost("ipv4", "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors", "packets/s"
356 , 2700, update_every, RRDSET_TYPE_LINE);
357 - st->isdetail = 1;
357 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
358
359 rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
360 rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -375,7 +375,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
375 if (unlikely(!st)) {
376 st = rrdset_create_localhost("ipv4", "tcphandshake", NULL, "tcp", NULL, "IPv4 TCP Handshake Issues"
377 , "events/s", 2900, update_every, RRDSET_TYPE_LINE);
378 - st->isdetail = 1;
378 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
379
380 rrddim_add(st, "EstabResets", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
381 rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -461,7 +461,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
461 if (unlikely(!st)) {
462 st = rrdset_create_localhost("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics"
463 , "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
464 - st->isdetail = 1;
464 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
465
466 rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRD_ALGORITHM_INCREMENTAL);
467 rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -509,7 +509,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
509 if (unlikely(!st)) {
510 st = rrdset_create_localhost("ipv4", "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s"
511 , 2701, update_every, RRDSET_TYPE_LINE);
512 - st->isdetail = 1;
512 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
513
514 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
515 rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -649,7 +649,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
649 if (unlikely(!st)) {
650 st = rrdset_create_localhost("ipv4", "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent"
651 , "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
652 - st->isdetail = 1;
652 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
653
654 rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
655 rrddim_add(st, "FragFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -670,7 +670,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
670 if (unlikely(!st)) {
671 st = rrdset_create_localhost("ipv4", "fragsin", NULL, "fragments", NULL, "IPv4 Fragments Reassembly"
672 , "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
673 - st->isdetail = 1;
673 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
674
675 rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
676 rrddim_add(st, "ReasmFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -691,7 +691,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
691 if (unlikely(!st)) {
692 st = rrdset_create_localhost("ipv4", "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s"
693 , 3002, update_every, RRDSET_TYPE_LINE);
694 - st->isdetail = 1;
694 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
695
696 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
697 rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -761,7 +761,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
761 if (unlikely(!st)) {
762 st = rrdset_create_localhost("ipv6", "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent"
763 , "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
764 - st->isdetail = 1;
764 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
765
766 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
767 rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -785,7 +785,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
785 if (unlikely(!st)) {
786 st = rrdset_create_localhost("ipv6", "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly"
787 , "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
788 - st->isdetail = 1;
788 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
789
790 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
791 rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -818,7 +818,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
818 if (unlikely(!st)) {
819 st = rrdset_create_localhost("ipv6", "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s"
820 , 3002, update_every, RRDSET_TYPE_LINE);
821 - st->isdetail = 1;
821 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
822
823 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
824 rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/plugins_d.c
+14 -12
@@ -161,7 +161,7 @@ void *pluginsd_worker_thread(void *arg) {
161 break;
162 }
163
164 - if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: '%s' is setting dimension %s/%s to %s", cd->fullfilename, st->id, dimension, value?value:"<nothing>");
164 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))) debug(D_PLUGINSD, "PLUGINSD: '%s' is setting dimension %s/%s to %s", cd->fullfilename, st->id, dimension, value?value:"<nothing>");
165
166 if(value) rrddim_set(st, dimension, strtoll(value, NULL, 0));
167 }
@@ -199,7 +199,7 @@ void *pluginsd_worker_thread(void *arg) {
199 break;
200 }
201
202 - if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: '%s' is requesting an END on chart %s", cd->fullfilename, st->id);
202 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))) debug(D_PLUGINSD, "PLUGINSD: '%s' is requesting an END on chart %s", cd->fullfilename, st->id);
203
204 rrdset_done(st);
205 st = NULL;
@@ -322,15 +322,16 @@ void *pluginsd_worker_thread(void *arg) {
322
323 if(unlikely(!algorithm || !*algorithm)) algorithm = "absolute";
324
325 - if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: Creating dimension in chart %s, id='%s', name='%s', algorithm='%s', multiplier=%ld, divisor=%ld, hidden='%s'"
326 - , st->id
327 - , id
328 - , name?name:""
329 - , rrd_algorithm_name(rrd_algorithm_id(algorithm))
330 - , multiplier
331 - , divisor
332 - , options?options:""
333 - );
325 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
326 + debug(D_PLUGINSD, "PLUGINSD: Creating dimension in chart %s, id='%s', name='%s', algorithm='%s', multiplier=%ld, divisor=%ld, hidden='%s'"
327 + , st->id
328 + , id
329 + , name?name:""
330 + , rrd_algorithm_name(rrd_algorithm_id(algorithm))
331 + , multiplier
332 + , divisor
333 + , options?options:""
334 + );
335
336 RRDDIM *rd = rrddim_find(st, id);
337 if(unlikely(!rd)) {
@@ -342,7 +343,8 @@ void *pluginsd_worker_thread(void *arg) {
343 if(strstr(options, "nooverflow") != NULL) rrddim_flag_set(rd, RRDDIM_FLAG_DONT_DETECT_RESETS_OR_OVERFLOWS);
344 }
345 }
345 - else if(unlikely(st->debug)) debug(D_PLUGINSD, "PLUGINSD: dimension %s/%s already exists. Not adding it again.", st->id, id);
346 + else if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
347 + debug(D_PLUGINSD, "PLUGINSD: dimension %s/%s already exists. Not adding it again.", st->id, id);
348 }
349 else if(unlikely(hash == DISABLE_HASH && !strcmp(s, "DISABLE"))) {
350 info("PLUGINSD: '%s' called DISABLE. Disabling it.", cd->fullfilename);
src/proc_diskstats.c
+9 -9
@@ -441,7 +441,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
441 if(unlikely(!st)) {
442 st = rrdset_create_localhost("disk_ops", disk, NULL, family, "disk.ops", "Disk Completed I/O Operations"
443 , "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
444 - st->isdetail = 1;
444 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
445
446 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
447 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -462,7 +462,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
462 if(unlikely(!st)) {
463 st = rrdset_create_localhost("disk_qops", disk, NULL, family, "disk.qops", "Disk Current I/O Operations"
464 , "operations", 2002, update_every, RRDSET_TYPE_LINE);
465 - st->isdetail = 1;
465 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
466
467 rrddim_add(st, "operations", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
468 }
@@ -481,7 +481,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
481 if(unlikely(!st)) {
482 st = rrdset_create_localhost("disk_backlog", disk, NULL, family, "disk.backlog", "Disk Backlog"
483 , "backlog (ms)", 2003, update_every, RRDSET_TYPE_AREA);
484 - st->isdetail = 1;
484 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
485
486 rrddim_add(st, "backlog", NULL, 1, 10, RRD_ALGORITHM_INCREMENTAL);
487 }
@@ -500,7 +500,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
500 if(unlikely(!st)) {
501 st = rrdset_create_localhost("disk_util", disk, NULL, family, "disk.util", "Disk Utilization Time"
502 , "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
503 - st->isdetail = 1;
503 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
504
505 rrddim_add(st, "utilization", NULL, 1, 10, RRD_ALGORITHM_INCREMENTAL);
506 }
@@ -519,7 +519,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
519 if(unlikely(!st)) {
520 st = rrdset_create_localhost("disk_mops", disk, NULL, family, "disk.mops", "Disk Merged Operations"
521 , "merged operations/s", 2021, update_every, RRDSET_TYPE_LINE);
522 - st->isdetail = 1;
522 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
523
524 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
525 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -540,7 +540,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
540 if(unlikely(!st)) {
541 st = rrdset_create_localhost("disk_iotime", disk, NULL, family, "disk.iotime", "Disk Total I/O Time"
542 , "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
543 - st->isdetail = 1;
543 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
544
545 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
546 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -564,7 +564,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
564 st = rrdset_create_localhost("disk_await", disk, NULL, family, "disk.await"
565 , "Average Completed I/O Operation Time", "ms per operation", 2005
566 , update_every, RRDSET_TYPE_LINE);
567 - st->isdetail = 1;
567 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
568
569 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
570 rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -583,7 +583,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
583 st = rrdset_create_localhost("disk_avgsz", disk, NULL, family, "disk.avgsz"
584 , "Average Completed I/O Operation Bandwidth"
585 , "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
586 - st->isdetail = 1;
586 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
587
588 rrddim_add(st, "reads", NULL, d->sector_size, 1024, RRD_ALGORITHM_ABSOLUTE);
589 rrddim_add(st, "writes", NULL, d->sector_size * -1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -601,7 +601,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
601 if(unlikely(!st)) {
602 st = rrdset_create_localhost("disk_svctm", disk, NULL, family, "disk.svctm", "Average Service Time"
603 , "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
604 - st->isdetail = 1;
604 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
605
606 rrddim_add(st, "svctm", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
607 }
src/proc_meminfo.c
+6 -6
@@ -170,7 +170,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
170 if(!st) {
171 st = rrdset_create_localhost("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every
172 , RRDSET_TYPE_STACKED);
173 - st->isdetail = 1;
173 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
174
175 rrddim_add(st, "free", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
176 rrddim_add(st, "used", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -191,7 +191,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
191 if(!st) {
192 st = rrdset_create_localhost("mem", "hwcorrupt", NULL, "ecc", NULL, "Hardware Corrupted ECC", "MB", 9000
193 , update_every, RRDSET_TYPE_LINE);
194 - st->isdetail = 1;
194 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
195
196 rrddim_add(st, "HardwareCorrupted", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
197 }
@@ -208,7 +208,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
208 if(!st) {
209 st = rrdset_create_localhost("mem", "committed", NULL, "system", NULL, "Committed (Allocated) Memory", "MB"
210 , 5000, update_every, RRDSET_TYPE_AREA);
211 - st->isdetail = 1;
211 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
212
213 rrddim_add(st, "Committed_AS", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
214 }
@@ -225,7 +225,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
225 if(!st) {
226 st = rrdset_create_localhost("mem", "writeback", NULL, "kernel", NULL, "Writeback Memory", "MB", 4000
227 , update_every, RRDSET_TYPE_LINE);
228 - st->isdetail = 1;
228 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
229
230 rrddim_add(st, "Dirty", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
231 rrddim_add(st, "Writeback", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -250,7 +250,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
250 if(!st) {
251 st = rrdset_create_localhost("mem", "kernel", NULL, "kernel", NULL, "Memory Used by Kernel", "MB", 6000
252 , update_every, RRDSET_TYPE_STACKED);
253 - st->isdetail = 1;
253 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
254
255 rrddim_add(st, "Slab", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
256 rrddim_add(st, "KernelStack", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -273,7 +273,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
273 if(!st) {
274 st = rrdset_create_localhost("mem", "slab", NULL, "slab", NULL, "Reclaimable Kernel Memory", "MB", 6500
275 , update_every, RRDSET_TYPE_STACKED);
276 - st->isdetail = 1;
276 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
277
278 rrddim_add(st, "reclaimable", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
279 rrddim_add(st, "unreclaimable", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
src/proc_net_dev.c
+6 -7
@@ -252,8 +252,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
252 d->st_packets = rrdset_create_localhost("net_packets", d->name, NULL, d->name, "net.packets"
253 , "Packets", "packets/s", 7001, update_every
254 , RRDSET_TYPE_LINE);
255 -
256 - d->st_packets->isdetail = 1;
255 + rrdset_flag_set(d->st_packets, RRDSET_FLAG_DETAIL);
256
257 d->rd_rpackets = rrddim_add(d->st_packets, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
258 d->rd_tpackets = rrddim_add(d->st_packets, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -281,7 +280,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
280 , "Interface Errors", "errors/s", 7002, update_every
281 , RRDSET_TYPE_LINE);
282
284 - d->st_errors->isdetail = 1;
283 + rrdset_flag_set(d->st_errors, RRDSET_FLAG_DETAIL);
284
285 d->rd_rerrors = rrddim_add(d->st_errors, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
286 d->rd_terrors = rrddim_add(d->st_errors, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -307,7 +306,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
306 , "Interface Drops", "drops/s", 7003, update_every
307 , RRDSET_TYPE_LINE);
308
310 - d->st_drops->isdetail = 1;
309 + rrdset_flag_set(d->st_drops, RRDSET_FLAG_DETAIL);
310
311 d->rd_rdrops = rrddim_add(d->st_drops, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
312 d->rd_tdrops = rrddim_add(d->st_drops, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -333,7 +332,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
332 , "Interface FIFO Buffer Errors", "errors", 7004, update_every
333 , RRDSET_TYPE_LINE);
334
336 - d->st_fifo->isdetail = 1;
335 + rrdset_flag_set(d->st_fifo, RRDSET_FLAG_DETAIL);
336
337 d->rd_rfifo = rrddim_add(d->st_fifo, "receive", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
338 d->rd_tfifo = rrddim_add(d->st_fifo, "transmit", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -358,7 +357,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
357 , "net.compressed", "Compressed Packets", "packets/s"
358 , 7005, update_every, RRDSET_TYPE_LINE);
359
361 - d->st_compressed->isdetail = 1;
360 + rrdset_flag_set(d->st_compressed, RRDSET_FLAG_DETAIL);
361
362 d->rd_rcompressed = rrddim_add(d->st_compressed, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
363 d->rd_tcompressed = rrddim_add(d->st_compressed, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -383,7 +382,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
382 , "Network Interface Events", "events/s", 7006, update_every
383 , RRDSET_TYPE_LINE);
384
386 - d->st_events->isdetail = 1;
385 + rrdset_flag_set(d->st_events, RRDSET_FLAG_DETAIL);
386
387 d->rd_rframe = rrddim_add(d->st_events, "frames", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
388 d->rd_tcollisions = rrddim_add(d->st_events, "collisions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_netstat.c
+6 -6
@@ -253,7 +253,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
253 if(unlikely(!st)) {
254 st = rrdset_create_localhost("ipv4", "inerrors", NULL, "errors", NULL, "IPv4 Input Errors"
255 , "packets/s", 4000, update_every, RRDSET_TYPE_LINE);
256 - st->isdetail = 1;
256 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
257
258 rrddim_add(st, "InNoRoutes", "noroutes", 1, 1, RRD_ALGORITHM_INCREMENTAL);
259 rrddim_add(st, "InTruncatedPkts", "truncated", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -275,7 +275,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
275 if(unlikely(!st)) {
276 st = rrdset_create_localhost("ipv4", "mcast", NULL, "multicast", NULL, "IPv4 Multicast Bandwidth"
277 , "kilobits/s", 9000, update_every, RRDSET_TYPE_AREA);
278 - st->isdetail = 1;
278 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
279
280 rrddim_add(st, "InMcastOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
281 rrddim_add(st, "OutMcastOctets", "sent", -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -295,7 +295,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
295 if(unlikely(!st)) {
296 st = rrdset_create_localhost("ipv4", "bcast", NULL, "broadcast", NULL, "IPv4 Broadcast Bandwidth"
297 , "kilobits/s", 8000, update_every, RRDSET_TYPE_AREA);
298 - st->isdetail = 1;
298 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
299
300 rrddim_add(st, "InBcastOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
301 rrddim_add(st, "OutBcastOctets", "sent", -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -315,7 +315,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
315 if(unlikely(!st)) {
316 st = rrdset_create_localhost("ipv4", "mcastpkts", NULL, "multicast", NULL, "IPv4 Multicast Packets"
317 , "packets/s", 8600, update_every, RRDSET_TYPE_LINE);
318 - st->isdetail = 1;
318 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
319
320 rrddim_add(st, "InMcastPkts", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
321 rrddim_add(st, "OutMcastPkts", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -335,7 +335,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
335 if(unlikely(!st)) {
336 st = rrdset_create_localhost("ipv4", "bcastpkts", NULL, "broadcast", NULL, "IPv4 Broadcast Packets"
337 , "packets/s", 8500, update_every, RRDSET_TYPE_LINE);
338 - st->isdetail = 1;
338 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
339
340 rrddim_add(st, "InBcastPkts", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
341 rrddim_add(st, "OutBcastPkts", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -355,7 +355,7 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
355 if(unlikely(!st)) {
356 st = rrdset_create_localhost("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics"
357 , "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
358 - st->isdetail = 1;
358 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
359
360 rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRD_ALGORITHM_INCREMENTAL);
361 rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_rpc_nfs.c
+2 -2
@@ -273,7 +273,7 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
273 if(!st) {
274 st = rrdset_create_localhost("nfs", "net", NULL, "network", NULL, "NFS Client Network", "operations/s", 5007
275 , update_every, RRDSET_TYPE_STACKED);
276 - st->isdetail = 1;
276 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
277
278 rrddim_add(st, "udp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
279 rrddim_add(st, "tcp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -296,7 +296,7 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
296 if(!st) {
297 st = rrdset_create_localhost("nfs", "rpc", NULL, "rpc", NULL, "NFS Client Remote Procedure Calls Statistics"
298 , "calls/s", 5008, update_every, RRDSET_TYPE_LINE);
299 - st->isdetail = 1;
299 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
300
301 rrddim_add(st, "calls", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
302 rrddim_add(st, "retransmits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_rpc_nfsd.c
+3 -3
@@ -516,7 +516,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
516 if(!st) {
517 st = rrdset_create_localhost("nfsd", "filehandles", NULL, "filehandles", NULL, "NFS Server File Handles"
518 , "handles/s", 5001, update_every, RRDSET_TYPE_LINE);
519 - st->isdetail = 1;
519 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
520
521 rrddim_add(st, "stale", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
522 rrddim_add(st, "total_lookups", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -658,7 +658,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
658 if(!st) {
659 st = rrdset_create_localhost("nfsd", "net", NULL, "network", NULL, "NFS Server Network Statistics"
660 , "packets/s", 5007, update_every, RRDSET_TYPE_STACKED);
661 - st->isdetail = 1;
661 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
662
663 rrddim_add(st, "udp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
664 rrddim_add(st, "tcp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -682,7 +682,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
682 st = rrdset_create_localhost("nfsd", "rpc", NULL, "rpc", NULL
683 , "NFS Server Remote Procedure Calls Statistics", "calls/s", 5008, update_every
684 , RRDSET_TYPE_LINE);
685 - st->isdetail = 1;
685 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
686
687 rrddim_add(st, "calls", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
688 rrddim_add(st, "bad_format", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_snmp.c
+6 -6
@@ -419,7 +419,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
419 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "fragsout", NULL, "fragments", NULL
420 , "IPv4 Fragments Sent", "packets/s", 3010, update_every
421 , RRDSET_TYPE_LINE);
422 - st->isdetail = 1;
422 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
423
424 rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
425 rrddim_add(st, "FragFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -441,7 +441,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
441 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "fragsin", NULL, "fragments", NULL
442 , "IPv4 Fragments Reassembly", "packets/s", 3011, update_every
443 , RRDSET_TYPE_LINE);
444 - st->isdetail = 1;
444 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
445
446 rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
447 rrddim_add(st, "ReasmFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -462,7 +462,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
462 if(!st) {
463 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "errors", NULL, "errors", NULL, "IPv4 Errors"
464 , "packets/s", 3002, update_every, RRDSET_TYPE_LINE);
465 - st->isdetail = 1;
465 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
466
467 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
468 rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -626,7 +626,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
626 if(!st) {
627 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors"
628 , "packets/s", 2700, update_every, RRDSET_TYPE_LINE);
629 - st->isdetail = 1;
629 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
630
631 rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
632 rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -648,7 +648,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
648 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "tcphandshake", NULL, "tcp", NULL
649 , "IPv4 TCP Handshake Issues", "events/s", 2900, update_every
650 , RRDSET_TYPE_LINE);
651 - st->isdetail = 1;
651 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
652
653 rrddim_add(st, "EstabResets", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
654 rrddim_add(st, "OutRsts", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -708,7 +708,7 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
708 if(!st) {
709 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors"
710 , "events/s", 2701, update_every, RRDSET_TYPE_LINE);
711 - st->isdetail = 1;
711 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
712
713 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
714 rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_snmp6.c
+8 -8
@@ -324,7 +324,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
324 if(unlikely(!st)) {
325 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent"
326 , "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
327 - st->isdetail = 1;
327 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
328
329 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
330 rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -353,7 +353,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
353 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "fragsin", NULL, "fragments", NULL
354 , "IPv6 Fragments Reassembly", "packets/s", 3011, update_every
355 , RRDSET_TYPE_LINE);
356 - st->isdetail = 1;
356 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
357
358 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
359 rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -387,7 +387,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
387 if(unlikely(!st)) {
388 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s"
389 , 3002, update_every, RRDSET_TYPE_LINE);
390 - st->isdetail = 1;
390 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
391
392 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
393 rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -452,7 +452,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
452 if(unlikely(!st)) {
453 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "udperrors", NULL, "udp", NULL, "IPv6 UDP Errors"
454 , "events/s", 3701, update_every, RRDSET_TYPE_LINE);
455 - st->isdetail = 1;
455 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
456
457 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
458 rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -507,7 +507,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
507 if(unlikely(!st)) {
508 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "udpliteerrors", NULL, "udplite", NULL
509 , "IPv6 UDP Lite Errors", "events/s", 3701, update_every, RRDSET_TYPE_LINE);
510 - st->isdetail = 1;
510 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
511
512 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
513 rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -534,7 +534,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
534 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "mcast", NULL, "multicast", NULL
535 , "IPv6 Multicast Bandwidth", "kilobits/s", 9000, update_every
536 , RRDSET_TYPE_AREA);
537 - st->isdetail = 1;
537 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
538
539 rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
540 rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -555,7 +555,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
555 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "bcast", NULL, "broadcast", NULL
556 , "IPv6 Broadcast Bandwidth", "kilobits/s", 8000, update_every
557 , RRDSET_TYPE_AREA);
558 - st->isdetail = 1;
558 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
559
560 rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
561 rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -575,7 +575,7 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
575 if(unlikely(!st)) {
576 st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "mcastpkts", NULL, "multicast", NULL
577 , "IPv6 Multicast Packets", "packets/s", 9500, update_every, RRDSET_TYPE_LINE);
578 - st->isdetail = 1;
578 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
579
580 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
581 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_stat_conntrack.c
+4 -4
@@ -173,7 +173,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
173 st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_changes", NULL
174 , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Changes", "changes/s"
175 , 3002, update_every, RRDSET_TYPE_LINE);
176 - st->isdetail = 1;
176 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
177
178 rrddim_add(st, "inserted", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
179 rrddim_add(st, "deleted", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -195,7 +195,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
195 st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_expect", NULL
196 , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Expectations"
197 , "expectations/s", 3003, update_every, RRDSET_TYPE_LINE);
198 - st->isdetail = 1;
198 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
199
200 rrddim_add(st, "created", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
201 rrddim_add(st, "deleted", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -217,7 +217,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
217 st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_search", NULL
218 , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Searches"
219 , "searches/s", 3010, update_every, RRDSET_TYPE_LINE);
220 - st->isdetail = 1;
220 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
221
222 rrddim_add(st, "searched", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
223 rrddim_add(st, "restarted", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -239,7 +239,7 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
239 st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_errors", NULL
240 , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Errors", "events/s"
241 , 3005, update_every, RRDSET_TYPE_LINE);
242 - st->isdetail = 1;
242 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
243
244 rrddim_add(st, "icmp_error", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
245 rrddim_add(st, "insert_failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_stat.c
+2 -2
@@ -137,7 +137,7 @@ int do_proc_stat(int update_every, usec_t dt) {
137 if(unlikely(!st)) {
138 st = rrdset_create_localhost("system", "intr", NULL, "interrupts", NULL, "CPU Interrupts"
139 , "interrupts/s", 900, update_every, RRDSET_TYPE_LINE);
140 - st->isdetail = 1;
140 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
141
142 rrddim_add(st, "interrupts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
143 }
@@ -184,7 +184,7 @@ int do_proc_stat(int update_every, usec_t dt) {
184 if(unlikely(!st)) {
185 st = rrdset_create_localhost("system", "forks", NULL, "processes", NULL, "Started Processes", "processes/s"
186 , 700, update_every, RRDSET_TYPE_LINE);
187 - st->isdetail = 1;
187 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
188
189 rrddim_add(st, "started", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
190 }
src/proc_vmstat.c
+2 -2
@@ -130,7 +130,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
130 if(unlikely(!st_pgfaults)) {
131 st_pgfaults = rrdset_create_localhost("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults"
132 , "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
133 - st_pgfaults->isdetail = 1;
133 + rrdset_flag_set(st_pgfaults, RRDSET_FLAG_DETAIL);
134
135 rrddim_add(st_pgfaults, "minor", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
136 rrddim_add(st_pgfaults, "major", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -159,7 +159,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
159 if(unlikely(!st_numa)) {
160 st_numa = rrdset_create_localhost("mem", "numa", NULL, "numa", NULL, "NUMA events", "events/s", 800
161 , update_every, RRDSET_TYPE_LINE);
162 - st_numa->isdetail = 1;
162 + rrdset_flag_set(st_numa, RRDSET_FLAG_DETAIL);
163
164 // These depend on CONFIG_NUMA in the kernel.
165 rrddim_add(st_numa, "local", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/rrd.h
+12 -5
@@ -188,6 +188,17 @@ typedef struct rrddim RRDDIM;
188 // ----------------------------------------------------------------------------
189 // RRDSET - this is a chart
190
191 +typedef enum rrdset_flags {
192 + RRDSET_FLAG_ENABLED = 1 << 0, // enables or disables a chart
193 + RRDSET_FLAG_DETAIL = 1 << 1, // if set, the data set should be considered as a detail of another
194 + // (the master data set should be the one that has the same family and is not detail)
195 + RRDSET_FLAG_DEBUG = 1 << 2 // enables or disables debugging for a chart
196 +} RRDSET_FLAGS;
197 +
198 +#define rrdset_flag_check(st, flag) ((st)->flags & flag)
199 +#define rrdset_flag_set(st, flag) (st)->flags |= flag
200 +#define rrdset_flag_clear(st, flag) (st)->flags &= ~flag
201 +
202 struct rrdset {
203 // ------------------------------------------------------------------------
204 // binary indexing structures
@@ -222,23 +233,19 @@ struct rrdset {
233 long current_entry; // the entry that is currently being updated
234 // it goes around in a round-robin fashion
235
225 - int enabled;
236 + uint32_t flags;
237
238 int gap_when_lost_iterations_above; // after how many lost iterations a gap should be stored
239 // netdata will interpolate values for gaps lower than this
240
241 long priority;
242
232 - int isdetail; // if set, the data set should be considered as a detail of another
233 - // (the master data set should be the one that has the same family and is not detail)
243
244 // ------------------------------------------------------------------------
245 // members for temporary data we need for calculations
246
247 RRD_MEMORY_MODE rrd_memory_mode; // if set to 1, this is memory mapped
248
240 - int debug;
241 -
249 char *cache_dir; // the directory to store dimensions
250 char cache_filename[FILENAME_MAX+1]; // the filename to store this set
251
src/rrd2json.c
+13 -11
@@ -29,7 +29,7 @@ void rrd_stats_api_v1_chart_with_data(RRDSET *st, BUFFER *wb, size_t *dimensions
29 , st->context
30 , st->title
31 , st->priority
32 - , st->enabled?"true":"false"
32 + , rrdset_flag_check(st, RRDSET_FLAG_ENABLED)?"true":"false"
33 , st->units
34 , st->name
35 , rrdset_type_name(st->chart_type)
@@ -99,7 +99,7 @@ void rrd_stats_api_v1_charts(RRDHOST *host, BUFFER *wb)
99
100 pthread_rwlock_rdlock(&host->rrdset_root_rwlock);
101 for(st = host->rrdset_root, c = 0; st ; st = st->next) {
102 - if(st->enabled && st->dimensions) {
102 + if(rrdset_flag_check(st, RRDSET_FLAG_ENABLED) && st->dimensions) {
103 if(c) buffer_strcat(wb, ",");
104 buffer_strcat(wb, "\n\t\t\"");
105 buffer_strcat(wb, st->id);
@@ -162,7 +162,7 @@ void rrd_stats_api_v1_charts_allmetrics_prometheus(RRDHOST *host, BUFFER *wb) {
162 prometheus_name_copy(chart, st->id, PROMETHEUS_ELEMENT_MAX);
163
164 buffer_strcat(wb, "\n");
165 - if(st->enabled && st->dimensions) {
165 + if(rrdset_flag_check(st, RRDSET_FLAG_ENABLED) && st->dimensions) {
166 pthread_rwlock_rdlock(&st->rwlock);
167
168 // for each dimension
@@ -234,7 +234,7 @@ void rrd_stats_api_v1_charts_allmetrics_shell(RRDHOST *host, BUFFER *wb) {
234 shell_name_copy(chart, st->id, SHELL_ELEMENT_MAX);
235
236 buffer_sprintf(wb, "\n# chart: %s (name: %s)\n", st->id, st->name);
237 - if(st->enabled && st->dimensions) {
237 + if(rrdset_flag_check(st, RRDSET_FLAG_ENABLED) && st->dimensions) {
238 pthread_rwlock_rdlock(&st->rwlock);
239
240 // for each dimension
@@ -330,7 +330,7 @@ unsigned long rrd_stats_one_json(RRDSET *st, char *options, BUFFER *wb)
330 , st->context
331 , st->title
332 , st->priority
333 - , st->enabled
333 + , rrdset_flag_check(st, RRDSET_FLAG_ENABLED)?1:0
334 , st->units
335 , st->name, options?options:""
336 , rrdset_type_name(st->chart_type)
@@ -341,7 +341,7 @@ unsigned long rrd_stats_one_json(RRDSET *st, char *options, BUFFER *wb)
341 , rrdset_last_entry_t(st)
342 , (now < rrdset_last_entry_t(st)) ? (time_t)0 : now - rrdset_last_entry_t(st)
343 , st->update_every
344 - , st->isdetail
344 + , rrdset_flag_check(st, RRDSET_FLAG_DETAIL)?1:0
345 , st->usec_since_last_update
346 , st->collected_total
347 , st->last_collected_total
@@ -418,7 +418,7 @@ void rrd_stats_all_json(RRDHOST *host, BUFFER *wb)
418
419 pthread_rwlock_rdlock(&host->rrdset_root_rwlock);
420 for(st = host->rrdset_root, c = 0; st ; st = st->next) {
421 - if(st->enabled && st->dimensions) {
421 + if(rrdset_flag_check(st, RRDSET_FLAG_ENABLED) && st->dimensions) {
422 if(c) buffer_strcat(wb, ",\n");
423 memory += rrd_stats_one_json(st, NULL, wb);
424 c++;
@@ -1421,7 +1421,7 @@ static RRDR *rrdr_create(RRDSET *st, long n)
1421
1422 RRDR *rrd2rrdr(RRDSET *st, long points, long long after, long long before, int group_method, int aligned)
1423 {
1424 - int debug = st->debug;
1424 + int debug = rrdset_flag_check(st, RRDSET_FLAG_DEBUG)?1:0;
1425 int absolute_period_requested = -1;
1426
1427 time_t first_entry_t = rrdset_first_entry_t(st);
@@ -2056,7 +2056,7 @@ time_t rrd_stats_json(int type, RRDSET *st, BUFFER *wb, long points, long group,
2056 // -------------------------------------------------------------------------
2057 // checks for debugging
2058
2059 - if(st->debug) {
2059 + if(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)) {
2060 debug(D_RRD_STATS, "%s first_entry_t = %ld, last_entry_t = %ld, duration = %ld, after = %ld, before = %ld, duration = %ld, entries_to_show = %ld, group = %ld"
2061 , st->id
2062 , rrdset_first_entry_t(st)
@@ -2149,7 +2149,8 @@ time_t rrd_stats_json(int type, RRDSET *st, BUFFER *wb, long points, long group,
2149 long count = 0, printed = 0, group_count = 0;
2150 last_timestamp = 0;
2151
2152 - if(st->debug) debug(D_RRD_STATS, "%s: REQUEST after:%u before:%u, points:%ld, group:%ld, CHART cur:%ld first: %u last:%u, CALC start_t:%ld, stop_t:%ld"
2152 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
2153 + debug(D_RRD_STATS, "%s: REQUEST after:%u before:%u, points:%ld, group:%ld, CHART cur:%ld first: %u last:%u, CALC start_t:%ld, stop_t:%ld"
2154 , st->id
2155 , (uint32_t)after
2156 , (uint32_t)before
@@ -2169,7 +2170,8 @@ time_t rrd_stats_json(int type, RRDSET *st, BUFFER *wb, long points, long group,
2170
2171 int print_this = 0;
2172
2172 - if(st->debug) debug(D_RRD_STATS, "%s t = %ld, count = %ld, group_count = %ld, printed = %ld, now = %ld, %s %s"
2173 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
2174 + debug(D_RRD_STATS, "%s t = %ld, count = %ld, group_count = %ld, printed = %ld, now = %ld, %s %s"
2175 , st->id
2176 , t
2177 , count + 1
src/rrdhost.c
+1 -1
@@ -237,7 +237,7 @@ void rrdhost_save(RRDHOST *host) {
237 RRDSET *st;
238 RRDDIM *rd;
239
240 - // we get an write lock
240 + // we get a write lock
241 // to ensure only one thread is saving the database
242 rrdhost_rwlock(host);
243
src/rrdset.c
+53 -31
@@ -329,10 +329,13 @@ RRDSET *rrdset_create(RRDHOST *host, const char *type, const char *id, const cha
329 st->hash_context = simple_hash(st->context);
330
331 st->priority = config_get_number(st->id, "priority", priority);
332 - st->enabled = enabled;
332 + if(enabled)
333 + rrdset_flag_set(st, RRDSET_FLAG_ENABLED);
334 + else
335 + rrdset_flag_clear(st, RRDSET_FLAG_ENABLED);
336
334 - st->isdetail = 0;
335 - st->debug = 0;
337 + rrdset_flag_clear(st, RRDSET_FLAG_DETAIL);
338 + rrdset_flag_clear(st, RRDSET_FLAG_DEBUG);
339
340 // if(!strcmp(st->id, "disk_util.dm-0")) {
341 // st->debug = 1;
@@ -446,7 +449,9 @@ void rrdset_next_usec(RRDSET *st, usec_t microseconds)
449 }
450 debug(D_RRD_CALLS, "rrdset_next_usec() for chart %s with microseconds %llu", st->name, microseconds);
451
449 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: NEXT: %llu microseconds", st->name, microseconds);
452 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
453 + debug(D_RRD_STATS, "%s: NEXT: %llu microseconds", st->name, microseconds);
454 +
455 st->usec_since_last_update = microseconds;
456 }
457
@@ -497,7 +502,9 @@ usec_t rrdset_done(RRDSET *st) {
502 st->usec_since_last_update = update_every_ut;
503 first_entry = 1;
504 }
500 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: microseconds since last update: %llu", st->name, st->usec_since_last_update);
505 +
506 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
507 + debug(D_RRD_STATS, "%s: microseconds since last update: %llu", st->name, st->usec_since_last_update);
508
509 // set last_collected_time
510 if(unlikely(!st->last_collected_time.tv_sec)) {
@@ -512,7 +519,8 @@ usec_t rrdset_done(RRDSET *st) {
519 store_this_entry = 0;
520 first_entry = 1;
521
515 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: has not set last_collected_time. Setting it now. Will not store the next entry.", st->name);
522 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
523 + debug(D_RRD_STATS, "%s: has not set last_collected_time. Setting it now. Will not store the next entry.", st->name);
524 }
525 else {
526 // it is not the first entry
@@ -536,7 +544,8 @@ usec_t rrdset_done(RRDSET *st) {
544 store_this_entry = 0;
545 first_entry = 1;
546
539 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: initializing last_updated to now - %llu microseconds (%0.3Lf). Will not store the next entry.", st->name, st->usec_since_last_update, (long double)ut/1000000.0);
547 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
548 + debug(D_RRD_STATS, "%s: initializing last_updated to now - %llu microseconds (%0.3Lf). Will not store the next entry.", st->name, st->usec_since_last_update, (long double)ut/1000000.0);
549 }
550
551 // check if we will re-write the entire data set
@@ -566,7 +575,7 @@ usec_t rrdset_done(RRDSET *st) {
575 now_collect_ut = st->last_collected_time.tv_sec * USEC_PER_SEC + st->last_collected_time.tv_usec;
576 next_store_ut = (st->last_updated.tv_sec + st->update_every) * USEC_PER_SEC;
577
569 - if(unlikely(st->debug)) {
578 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))) {
579 debug(D_RRD_STATS, "%s: last_collect_ut = %0.3Lf (last collection time)", st->name, (long double)last_collect_ut/1000000.0);
580 debug(D_RRD_STATS, "%s: now_collect_ut = %0.3Lf (current collection time)", st->name, (long double)now_collect_ut/1000000.0);
581 debug(D_RRD_STATS, "%s: last_stored_ut = %0.3Lf (last updated time)", st->name, (long double)last_stored_ut/1000000.0);
@@ -575,7 +584,8 @@ usec_t rrdset_done(RRDSET *st) {
584
585 if(unlikely(!st->counter_done)) {
586 store_this_entry = 0;
578 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: Will not store the next entry.", st->name);
587 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
588 + debug(D_RRD_STATS, "%s: Will not store the next entry.", st->name);
589 }
590 st->counter_done++;
591
@@ -598,7 +608,8 @@ usec_t rrdset_done(RRDSET *st) {
608 continue;
609 }
610
601 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: START "
611 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
612 + debug(D_RRD_STATS, "%s/%s: START "
613 " last_collected_value = " COLLECTED_NUMBER_FORMAT
614 " collected_value = " COLLECTED_NUMBER_FORMAT
615 " last_calculated_value = " CALCULATED_NUMBER_FORMAT
@@ -616,7 +627,7 @@ usec_t rrdset_done(RRDSET *st) {
627 * (calculated_number)rd->multiplier
628 / (calculated_number)rd->divisor;
629
619 - if(unlikely(st->debug))
630 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
631 debug(D_RRD_STATS, "%s/%s: CALC ABS/ABS-NO-IN "
632 CALCULATED_NUMBER_FORMAT " = "
633 COLLECTED_NUMBER_FORMAT
@@ -641,7 +652,7 @@ usec_t rrdset_done(RRDSET *st) {
652 * (calculated_number)rd->collected_value
653 / (calculated_number)st->collected_total;
654
644 - if(unlikely(st->debug))
655 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
656 debug(D_RRD_STATS, "%s/%s: CALC PCENT-ROW "
657 CALCULATED_NUMBER_FORMAT " = 100"
658 " * " COLLECTED_NUMBER_FORMAT
@@ -678,7 +689,7 @@ usec_t rrdset_done(RRDSET *st) {
689 * (calculated_number)rd->multiplier
690 / (calculated_number)rd->divisor;
691
681 - if(unlikely(st->debug))
692 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
693 debug(D_RRD_STATS, "%s/%s: CALC INC PRE "
694 CALCULATED_NUMBER_FORMAT " = ("
695 COLLECTED_NUMBER_FORMAT " - " COLLECTED_NUMBER_FORMAT
@@ -723,7 +734,7 @@ usec_t rrdset_done(RRDSET *st) {
734 * (calculated_number)(rd->collected_value - rd->last_collected_value)
735 / (calculated_number)(st->collected_total - st->last_collected_total);
736
726 - if(unlikely(st->debug))
737 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
738 debug(D_RRD_STATS, "%s/%s: CALC PCENT-DIFF "
739 CALCULATED_NUMBER_FORMAT " = 100"
740 " * (" COLLECTED_NUMBER_FORMAT " - " COLLECTED_NUMBER_FORMAT ")"
@@ -740,7 +751,7 @@ usec_t rrdset_done(RRDSET *st) {
751 // it gets noticed when we add new types
752 rd->calculated_value = 0;
753
743 - if(unlikely(st->debug))
754 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
755 debug(D_RRD_STATS, "%s/%s: CALC "
756 CALCULATED_NUMBER_FORMAT " = 0"
757 , st->id, rd->name
@@ -749,7 +760,8 @@ usec_t rrdset_done(RRDSET *st) {
760 break;
761 }
762
752 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: PHASE2 "
763 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
764 + debug(D_RRD_STATS, "%s/%s: PHASE2 "
765 " last_collected_value = " COLLECTED_NUMBER_FORMAT
766 " collected_value = " COLLECTED_NUMBER_FORMAT
767 " last_calculated_value = " CALCULATED_NUMBER_FORMAT
@@ -768,7 +780,10 @@ usec_t rrdset_done(RRDSET *st) {
780
781 if(unlikely(now_collect_ut < next_store_ut)) {
782 // this is collected in the same interpolation point
771 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: THIS IS IN THE SAME INTERPOLATION POINT", st->name);
783 +
784 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
785 + debug(D_RRD_STATS, "%s: THIS IS IN THE SAME INTERPOLATION POINT", st->name);
786 +
787 #ifdef NETDATA_INTERNAL_CHECKS
788 info("%s is collected in the same interpolation point: short by %llu microseconds", st->name, next_store_ut - now_collect_ut);
789 #endif
@@ -783,7 +798,7 @@ usec_t rrdset_done(RRDSET *st) {
798 if(iterations < 0) { error("%s: iterations calculation wrapped! first_ut = %llu, last_stored_ut = %llu, next_store_ut = %llu, now_collect_ut = %llu", st->name, first_ut, last_stored_ut, next_store_ut, now_collect_ut); }
799 #endif
800
786 - if(unlikely(st->debug)) {
801 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))) {
802 debug(D_RRD_STATS, "%s: last_stored_ut = %0.3Lf (last updated time)", st->name, (long double)last_stored_ut/1000000.0);
803 debug(D_RRD_STATS, "%s: next_store_ut = %0.3Lf (next interpolation point)", st->name, (long double)next_store_ut/1000000.0);
804 }
@@ -802,7 +817,7 @@ usec_t rrdset_done(RRDSET *st) {
817 / (calculated_number)(now_collect_ut - last_collect_ut)
818 );
819
805 - if(unlikely(st->debug))
820 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
821 debug(D_RRD_STATS, "%s/%s: CALC2 INC "
822 CALCULATED_NUMBER_FORMAT " = "
823 CALCULATED_NUMBER_FORMAT
@@ -821,7 +836,7 @@ usec_t rrdset_done(RRDSET *st) {
836 new_value /= (calculated_number)st->update_every;
837
838 if(unlikely(next_store_ut - last_stored_ut < update_every_ut)) {
824 - if(unlikely(st->debug))
839 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
840 debug(D_RRD_STATS, "%s/%s: COLLECTION POINT IS SHORT " CALCULATED_NUMBER_FORMAT " - EXTRAPOLATING",
841 st->id, rd->name
842 , (calculated_number)(next_store_ut - last_stored_ut)
@@ -853,7 +868,7 @@ usec_t rrdset_done(RRDSET *st) {
868 + rd->last_calculated_value
869 );
870
856 - if(unlikely(st->debug))
871 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
872 debug(D_RRD_STATS, "%s/%s: CALC2 DEF "
873 CALCULATED_NUMBER_FORMAT " = ((("
874 "(" CALCULATED_NUMBER_FORMAT " - " CALCULATED_NUMBER_FORMAT ")"
@@ -878,7 +893,7 @@ usec_t rrdset_done(RRDSET *st) {
893 rd->values[st->current_entry] = pack_storage_number(new_value, storage_flags );
894 rd->last_stored_value = new_value;
895
881 - if(unlikely(st->debug))
896 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
897 debug(D_RRD_STATS, "%s/%s: STORE[%ld] "
898 CALCULATED_NUMBER_FORMAT " = " CALCULATED_NUMBER_FORMAT
899 , st->id, rd->name
@@ -887,9 +902,10 @@ usec_t rrdset_done(RRDSET *st) {
902 );
903 }
904 else {
890 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: STORE[%ld] = NON EXISTING "
891 - , st->id, rd->name
892 - , st->current_entry
905 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
906 + debug(D_RRD_STATS, "%s/%s: STORE[%ld] = NON EXISTING "
907 + , st->id, rd->name
908 + , st->current_entry
909 );
910 rd->values[st->current_entry] = pack_storage_number(0, SN_NOT_EXISTS);
911 rd->last_stored_value = NAN;
@@ -897,7 +913,7 @@ usec_t rrdset_done(RRDSET *st) {
913
914 stored_entries++;
915
900 - if(unlikely(st->debug)) {
916 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))) {
917 calculated_number t1 = new_value * (calculated_number)rd->multiplier / (calculated_number)rd->divisor;
918 calculated_number t2 = unpack_storage_number(rd->values[st->current_entry]);
919 calculated_number accuracy = accuracy_loss(t1, t2);
@@ -939,24 +955,29 @@ usec_t rrdset_done(RRDSET *st) {
955 if(unlikely(!rrddim_flag_check(rd, RRDDIM_FLAG_UPDATED)))
956 continue;
957
942 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: setting last_collected_value (old: " COLLECTED_NUMBER_FORMAT ") to last_collected_value (new: " COLLECTED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_collected_value, rd->collected_value);
958 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
959 + debug(D_RRD_STATS, "%s/%s: setting last_collected_value (old: " COLLECTED_NUMBER_FORMAT ") to last_collected_value (new: " COLLECTED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_collected_value, rd->collected_value);
960 +
961 rd->last_collected_value = rd->collected_value;
962
963 switch(rd->algorithm) {
964 case RRD_ALGORITHM_INCREMENTAL:
965 if(unlikely(!first_entry)) {
948 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: setting last_calculated_value (old: " CALCULATED_NUMBER_FORMAT ") to last_calculated_value (new: " CALCULATED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_calculated_value + rd->calculated_value, rd->calculated_value);
966 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
967 + debug(D_RRD_STATS, "%s/%s: setting last_calculated_value (old: " CALCULATED_NUMBER_FORMAT ") to last_calculated_value (new: " CALCULATED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_calculated_value + rd->calculated_value, rd->calculated_value);
968 rd->last_calculated_value += rd->calculated_value;
969 }
970 else {
952 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s: THIS IS THE FIRST POINT", st->name);
971 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
972 + debug(D_RRD_STATS, "%s: THIS IS THE FIRST POINT", st->name);
973 }
974 break;
975
976 case RRD_ALGORITHM_ABSOLUTE:
977 case RRD_ALGORITHM_PCENT_OVER_ROW_TOTAL:
978 case RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL:
959 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: setting last_calculated_value (old: " CALCULATED_NUMBER_FORMAT ") to last_calculated_value (new: " CALCULATED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_calculated_value, rd->calculated_value);
979 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
980 + debug(D_RRD_STATS, "%s/%s: setting last_calculated_value (old: " CALCULATED_NUMBER_FORMAT ") to last_calculated_value (new: " CALCULATED_NUMBER_FORMAT ")", st->id, rd->name, rd->last_calculated_value, rd->calculated_value);
981 rd->last_calculated_value = rd->calculated_value;
982 break;
983 }
@@ -965,7 +986,8 @@ usec_t rrdset_done(RRDSET *st) {
986 rd->collected_value = 0;
987 rrddim_flag_clear(rd, RRDDIM_FLAG_UPDATED);
988
968 - if(unlikely(st->debug)) debug(D_RRD_STATS, "%s/%s: END "
989 + if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
990 + debug(D_RRD_STATS, "%s/%s: END "
991 " last_collected_value = " COLLECTED_NUMBER_FORMAT
992 " collected_value = " COLLECTED_NUMBER_FORMAT
993 " last_calculated_value = " CALCULATED_NUMBER_FORMAT
src/sys_devices_system_node.c
+1 -1
@@ -94,7 +94,7 @@ int do_proc_sys_devices_system_node(int update_every, usec_t dt) {
94 if(unlikely(!st)) {
95 st = rrdset_create_localhost("mem", m->name, NULL, "numa", NULL, "NUMA events", "events/s", 1000
96 , update_every, RRDSET_TYPE_LINE);
97 - st->isdetail = 1;
97 + rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
98
99 rrddim_add(st, "local_node", "local", 1, 1, RRD_ALGORITHM_INCREMENTAL);
100 rrddim_add(st, "numa_foreign", "foreign", 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/unit_test.c
+2 -2
@@ -899,7 +899,7 @@ int run_test(struct test *test)
899 if(test->feed2)
900 rd2 = rrddim_add(st, "dim2", NULL, test->multiplier, test->divisor, test->algorithm);
901
902 - st->debug = 1;
902 + rrdset_flag_set(st, RRDSET_FLAG_DEBUG);
903
904 // feed it with the test data
905 time_t time_now = 0, time_start = now_realtime_sec();
@@ -1101,7 +1101,7 @@ int unit_test(long delay, long shift)
1101
1102 RRDSET *st = rrdset_create_localhost("netdata", name, name, "netdata", NULL, "Unit Testing", "a value", 1, 1
1103 , RRDSET_TYPE_LINE);
1104 - st->debug = 1;
1104 + rrdset_flag_set(st, RRDSET_FLAG_DEBUG);
1105
1106 RRDDIM *rdabs = NULL;
1107 RRDDIM *rdinc = NULL;
src/web_client.c
+8 -3
@@ -2250,10 +2250,15 @@ void web_client_process(struct web_client *w) {
2250 else {
2251 code = 200;
2252 debug_flags |= D_RRD_STATS;
2253 - st->debug = !st->debug;
2254 - buffer_sprintf(w->response.data, "Chart has now debug %s: ", st->debug?"enabled":"disabled");
2253 +
2254 + if(rrdset_flag_check(st, RRDSET_FLAG_DEBUG))
2255 + rrdset_flag_clear(st, RRDSET_FLAG_DEBUG);
2256 + else
2257 + rrdset_flag_set(st, RRDSET_FLAG_DEBUG);
2258 +
2259 + buffer_sprintf(w->response.data, "Chart has now debug %s: ", rrdset_flag_check(st, RRDSET_FLAG_DEBUG)?"enabled":"disabled");
2260 buffer_strcat_htmlescape(w->response.data, tok);
2256 - debug(D_WEB_CLIENT_ACCESS, "%llu: debug for %s is %s.", w->id, tok, st->debug?"enabled":"disabled");
2261 + debug(D_WEB_CLIENT_ACCESS, "%llu: debug for %s is %s.", w->id, tok, rrdset_flag_check(st, RRDSET_FLAG_DEBUG)?"enabled":"disabled");
2262 }
2263 }
2264 else {