@cryptotaxi247 / netdata-1 / commits / c246dea13

add data collection plugin and module to all charts

Costa Tsaousis (ktsaou) committed Oct 14, 2017 at 17:14 UTC c246dea131ea99382b6e86c6f33f91b4705c6142
49 files changed +2507 -405
src/backends.c
+5 -5
@@ -615,18 +615,18 @@ void *backends_main(void *ptr) {
615 chart_backend_reconnects = 0,
616 chart_backend_latency = 0;
617
618 - RRDSET *chart_metrics = rrdset_create_localhost("netdata", "backend_metrics", NULL, "backend", NULL, "Netdata Buffered Metrics", "metrics", 130600, backend_update_every, RRDSET_TYPE_LINE);
618 + RRDSET *chart_metrics = rrdset_create_localhost("netdata", "backend_metrics", NULL, "backend", NULL, "Netdata Buffered Metrics", "metrics", "backends", NULL, 130600, backend_update_every, RRDSET_TYPE_LINE);
619 rrddim_add(chart_metrics, "buffered", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
620 rrddim_add(chart_metrics, "lost", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
621 rrddim_add(chart_metrics, "sent", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
622
623 - RRDSET *chart_bytes = rrdset_create_localhost("netdata", "backend_bytes", NULL, "backend", NULL, "Netdata Backend Data Size", "KB", 130610, backend_update_every, RRDSET_TYPE_AREA);
623 + RRDSET *chart_bytes = rrdset_create_localhost("netdata", "backend_bytes", NULL, "backend", NULL, "Netdata Backend Data Size", "KB", "backends", NULL, 130610, backend_update_every, RRDSET_TYPE_AREA);
624 rrddim_add(chart_bytes, "buffered", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
625 rrddim_add(chart_bytes, "lost", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
626 rrddim_add(chart_bytes, "sent", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
627 rrddim_add(chart_bytes, "received", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
628
629 - RRDSET *chart_ops = rrdset_create_localhost("netdata", "backend_ops", NULL, "backend", NULL, "Netdata Backend Operations", "operations", 130630, backend_update_every, RRDSET_TYPE_LINE);
629 + RRDSET *chart_ops = rrdset_create_localhost("netdata", "backend_ops", NULL, "backend", NULL, "Netdata Backend Operations", "operations", "backends", NULL, 130630, backend_update_every, RRDSET_TYPE_LINE);
630 rrddim_add(chart_ops, "write", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
631 rrddim_add(chart_ops, "discard", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
632 rrddim_add(chart_ops, "reconnect", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -640,11 +640,11 @@ void *backends_main(void *ptr) {
640 *
641 * issue #1432 and https://www.softlab.ntua.gr/facilities/documentation/unix/unix-socket-faq/unix-socket-faq-2.html
642 *
643 - RRDSET *chart_latency = rrdset_create_localhost("netdata", "backend_latency", NULL, "backend", NULL, "Netdata Backend Latency", "ms", 130620, backend_update_every, RRDSET_TYPE_AREA);
643 + RRDSET *chart_latency = rrdset_create_localhost("netdata", "backend_latency", NULL, "backend", NULL, "Netdata Backend Latency", "ms", "backends", NULL, 130620, backend_update_every, RRDSET_TYPE_AREA);
644 rrddim_add(chart_latency, "latency", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
645 */
646
647 - RRDSET *chart_rusage = rrdset_create_localhost("netdata", "backend_thread_cpu", NULL, "backend", NULL, "NetData Backend Thread CPU usage", "milliseconds/s", 130630, backend_update_every, RRDSET_TYPE_STACKED);
647 + RRDSET *chart_rusage = rrdset_create_localhost("netdata", "backend_thread_cpu", NULL, "backend", NULL, "NetData Backend Thread CPU usage", "milliseconds/s", "backends", NULL, 130630, backend_update_every, RRDSET_TYPE_STACKED);
648 rrddim_add(chart_rusage, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
649 rrddim_add(chart_rusage, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
650
src/freebsd_devstat.c
+18
@@ -327,6 +327,8 @@ int do_kern_devstat(int update_every, usec_t dt) {
327 "disk.io",
328 "Disk I/O Bandwidth",
329 "kilobytes/s",
330 + "freebsd",
331 + "devstat",
332 2000,
333 update_every,
334 RRDSET_TYPE_AREA
@@ -356,6 +358,8 @@ int do_kern_devstat(int update_every, usec_t dt) {
358 "disk.ops",
359 "Disk Completed I/O Operations",
360 "operations/s",
361 + "freebsd",
362 + "devstat",
363 2001,
364 update_every,
365 RRDSET_TYPE_LINE
@@ -386,6 +390,8 @@ int do_kern_devstat(int update_every, usec_t dt) {
390 "disk.qops",
391 "Disk Current I/O Operations",
392 "operations",
393 + "freebsd",
394 + "devstat",
395 2002,
396 update_every,
397 RRDSET_TYPE_LINE
@@ -413,6 +419,8 @@ int do_kern_devstat(int update_every, usec_t dt) {
419 "disk.util",
420 "Disk Utilization Time",
421 "% of time working",
422 + "freebsd",
423 + "devstat",
424 2004,
425 update_every,
426 RRDSET_TYPE_AREA
@@ -441,6 +449,8 @@ int do_kern_devstat(int update_every, usec_t dt) {
449 "disk.iotime",
450 "Disk Total I/O Time",
451 "milliseconds/s",
452 + "freebsd",
453 + "devstat",
454 2022,
455 update_every,
456 RRDSET_TYPE_LINE
@@ -478,6 +488,8 @@ int do_kern_devstat(int update_every, usec_t dt) {
488 "disk.await",
489 "Average Completed I/O Operation Time",
490 "ms per operation",
491 + "freebsd",
492 + "devstat",
493 2005,
494 update_every,
495 RRDSET_TYPE_LINE
@@ -521,6 +533,8 @@ int do_kern_devstat(int update_every, usec_t dt) {
533 "disk.avgsz",
534 "Average Completed I/O Operation Bandwidth",
535 "kilobytes per operation",
536 + "freebsd",
537 + "devstat",
538 2006,
539 update_every,
540 RRDSET_TYPE_AREA
@@ -564,6 +578,8 @@ int do_kern_devstat(int update_every, usec_t dt) {
578 "disk.svctm",
579 "Average Service Time",
580 "ms per operation",
581 + "freebsd",
582 + "devstat",
583 2007,
584 update_every,
585 RRDSET_TYPE_LINE
@@ -613,6 +629,8 @@ int do_kern_devstat(int update_every, usec_t dt) {
629 NULL,
630 "Disk I/O",
631 "kilobytes/s",
632 + "freebsd",
633 + "devstat",
634 150,
635 update_every,
636 RRDSET_TYPE_AREA
src/freebsd_getifaddrs.c
+14
@@ -228,6 +228,8 @@ int do_getifaddrs(int update_every, usec_t dt) {
228 NULL,
229 "IPv4 Bandwidth",
230 "kilobits/s",
231 + "freebsd",
232 + "getifaddrs",
233 500,
234 update_every,
235 RRDSET_TYPE_AREA
@@ -265,6 +267,8 @@ int do_getifaddrs(int update_every, usec_t dt) {
267 NULL,
268 "IPv6 Bandwidth",
269 "kilobits/s",
270 + "freebsd",
271 + "getifaddrs",
272 500,
273 update_every,
274 RRDSET_TYPE_AREA
@@ -333,6 +337,8 @@ int do_getifaddrs(int update_every, usec_t dt) {
337 "net.net",
338 "Bandwidth",
339 "kilobits/s",
340 + "freebsd",
341 + "getifaddrs",
342 7000,
343 update_every,
344 RRDSET_TYPE_AREA
@@ -360,6 +366,8 @@ int do_getifaddrs(int update_every, usec_t dt) {
366 "net.packets",
367 "Packets",
368 "packets/s",
369 + "freebsd",
370 + "getifaddrs",
371 7001,
372 update_every,
373 RRDSET_TYPE_LINE
@@ -397,6 +405,8 @@ int do_getifaddrs(int update_every, usec_t dt) {
405 "net.errors",
406 "Interface Errors",
407 "errors/s",
408 + "freebsd",
409 + "getifaddrs",
410 7002,
411 update_every,
412 RRDSET_TYPE_LINE
@@ -429,6 +439,8 @@ int do_getifaddrs(int update_every, usec_t dt) {
439 "net.drops",
440 "Interface Drops",
441 "drops/s",
442 + "freebsd",
443 + "getifaddrs",
444 7003,
445 update_every,
446 RRDSET_TYPE_LINE
@@ -462,6 +474,8 @@ int do_getifaddrs(int update_every, usec_t dt) {
474 "net.events",
475 "Network Interface Events",
476 "events/s",
477 + "freebsd",
478 + "getifaddrs",
479 7006,
480 update_every,
481 RRDSET_TYPE_LINE
src/freebsd_getmntinfo.c
+4
@@ -223,6 +223,8 @@ int do_getmntinfo(int update_every, usec_t dt) {
223 "disk.space",
224 title,
225 "GB",
226 + "freebsd",
227 + "getmntinfo",
228 2023,
229 update_every,
230 RRDSET_TYPE_STACKED
@@ -260,6 +262,8 @@ int do_getmntinfo(int update_every, usec_t dt) {
262 "disk.inodes",
263 title,
264 "Inodes",
265 + "freebsd",
266 + "getmntinfo",
267 2024,
268 update_every,
269 RRDSET_TYPE_STACKED
src/freebsd_kstat_zfs.c
+2 -2
@@ -205,8 +205,8 @@ int do_kstat_zfs_misc_arcstats(int update_every, usec_t dt) {
205 // missing mib: GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.arc_need_free", mibs.arc_need_free, arcstats.arc_need_free);
206 // missing mib: GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.arc_sys_free", mibs.arc_sys_free, arcstats.arc_sys_free);
207
208 - generate_charts_arcstats(update_every);
209 - generate_charts_arc_summary(update_every);
208 + generate_charts_arcstats("freebsd", update_every);
209 + generate_charts_arc_summary("freebsd", update_every);
210
211 return 0;
212 }
\ No newline at end of file
src/freebsd_sysctl.c
+150 -17
@@ -140,6 +140,8 @@ int do_vm_loadavg(int update_every, usec_t dt){
140 NULL,
141 "System Load Average",
142 "load",
143 + "freebsd",
144 + "vm.loadavg",
145 100,
146 (update_every < MIN_LOADAVG_UPDATE_EVERY) ?
147 MIN_LOADAVG_UPDATE_EVERY : update_every, RRDSET_TYPE_LINE
@@ -206,6 +208,8 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
208 NULL,
209 "System Active Processes",
210 "processes",
211 + "freebsd",
212 + "vm.vmtotal",
213 750,
214 update_every,
215 RRDSET_TYPE_LINE
@@ -232,6 +236,8 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
236 NULL,
237 "System Processes",
238 "processes",
239 + "freebsd",
240 + "vm.vmtotal",
241 600,
242 update_every,
243 RRDSET_TYPE_LINE
@@ -261,6 +267,8 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
267 NULL,
268 "Committed (Allocated) Memory",
269 "MB",
270 + "freebsd",
271 + "vm.vmtotal",
272 5000,
273 update_every,
274 RRDSET_TYPE_AREA
@@ -317,6 +325,8 @@ int do_kern_cp_time(int update_every, usec_t dt) {
325 "system.cpu",
326 "Total CPU utilization",
327 "percentage",
328 + "freebsd",
329 + "kern.cp_time",
330 100, update_every,
331 RRDSET_TYPE_STACKED
332 );
@@ -395,6 +405,8 @@ int do_kern_cp_times(int update_every, usec_t dt) {
405 "cpu.cpu",
406 "Core utilization",
407 "percentage",
408 + "freebsd",
409 + "kern.cp_times",
410 1000,
411 update_every,
412 RRDSET_TYPE_STACKED
@@ -475,12 +487,15 @@ int do_dev_cpu_temperature(int update_every, usec_t dt) {
487 "temperature",
488 "cpu.temperatute",
489 "Core temperature",
478 - "degree",
490 + "Celsius",
491 + "freebsd",
492 + "dev.cpu.temperature",
493 1050,
494 update_every,
495 RRDSET_TYPE_LINE
496 );
483 - } else rrdset_next(st);
497 + }
498 + else rrdset_next(st);
499
500 for (i = 0; i < number_of_cpus; i++) {
501 if (unlikely(!rd_pcpu_temperature[i])) {
@@ -525,6 +540,8 @@ int do_dev_cpu_0_freq(int update_every, usec_t dt) {
540 NULL,
541 "Current CPU Scaling Frequency",
542 "MHz",
543 + "freebsd",
544 + "dev.cpu.0.freq",
545 5003,
546 update_every,
547 RRDSET_TYPE_LINE
@@ -586,6 +603,8 @@ int do_hw_intcnt(int update_every, usec_t dt) {
603 NULL,
604 "Total Hardware Interrupts",
605 "interrupts/s",
606 + "freebsd",
607 + "hw.intrcnt",
608 900,
609 update_every,
610 RRDSET_TYPE_LINE
@@ -629,6 +648,8 @@ int do_hw_intcnt(int update_every, usec_t dt) {
648 NULL,
649 "System interrupts",
650 "interrupts/s",
651 + "freebsd",
652 + "hw.intrcnt",
653 1000,
654 update_every,
655 RRDSET_TYPE_STACKED
@@ -682,6 +703,8 @@ int do_vm_stats_sys_v_intr(int update_every, usec_t dt) {
703 NULL,
704 "Device Interrupts",
705 "interrupts/s",
706 + "freebsd",
707 + "vm.stats.sys.v_intr",
708 1000,
709 update_every,
710 RRDSET_TYPE_LINE
@@ -725,6 +748,8 @@ int do_vm_stats_sys_v_soft(int update_every, usec_t dt) {
748 NULL,
749 "Software Interrupts",
750 "interrupts/s",
751 + "freebsd",
752 + "vm.stats.sys.v_soft",
753 1100,
754 update_every,
755 RRDSET_TYPE_LINE
@@ -768,6 +793,8 @@ int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) {
793 NULL,
794 "CPU Context Switches",
795 "context switches/s",
796 + "freebsd",
797 + "vm.stats.sys.v_swtch",
798 800,
799 update_every,
800 RRDSET_TYPE_LINE
@@ -811,6 +838,8 @@ int do_vm_stats_sys_v_forks(int update_every, usec_t dt) {
838 NULL,
839 "Started Processes",
840 "processes/s",
841 + "freebsd",
842 + "vm.stats.sys.v_swtch",
843 700,
844 update_every,
845 RRDSET_TYPE_LINE
@@ -885,6 +914,8 @@ int do_vm_swap_info(int update_every, usec_t dt) {
914 NULL,
915 "System Swap",
916 "MB",
917 + "freebsd",
918 + "vm.swap_info",
919 201,
920 update_every,
921 RRDSET_TYPE_STACKED
@@ -943,6 +974,8 @@ int do_system_ram(int update_every, usec_t dt) {
974 NULL,
975 "System RAM",
976 "MB",
977 + "freebsd",
978 + "System.ram",
979 200,
980 update_every,
981 RRDSET_TYPE_STACKED
@@ -1001,6 +1034,8 @@ int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) {
1034 NULL,
1035 "Swap I/O",
1036 "kilobytes/s",
1037 + "freebsd",
1038 + "vm.stats.vm.v_swappgs",
1039 250,
1040 update_every,
1041 RRDSET_TYPE_AREA
@@ -1052,6 +1087,8 @@ int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) {
1087 NULL,
1088 "Memory Page Faults",
1089 "page faults/s",
1090 + "freebsd",
1091 + "vm.stats.vm.v_pgfaults",
1092 500,
1093 update_every,
1094 RRDSET_TYPE_LINE
@@ -1131,6 +1168,8 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
1168 NULL,
1169 "IPC Semaphores",
1170 "semaphores",
1171 + "freebsd",
1172 + "kern.ipc.sem",
1173 1000,
1174 update_every,
1175 RRDSET_TYPE_AREA
@@ -1153,6 +1192,8 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
1192 NULL,
1193 "IPC Semaphore Arrays",
1194 "arrays",
1195 + "freebsd",
1196 + "kern.ipc.sem",
1197 1000,
1198 update_every,
1199 RRDSET_TYPE_AREA
@@ -1224,6 +1265,8 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
1265 NULL,
1266 "IPC Shared Memory Segments",
1267 "segments",
1268 + "freebsd",
1269 + "kern.ipc.shm",
1270 1000,
1271 update_every,
1272 RRDSET_TYPE_AREA
@@ -1246,6 +1289,8 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
1289 NULL,
1290 "IPC Shared Memory Segments Size",
1291 "kilobytes",
1292 + "freebsd",
1293 + "kern.ipc.shm",
1294 1000,
1295 update_every,
1296 RRDSET_TYPE_AREA
@@ -1323,6 +1368,8 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1368 NULL,
1369 "Number of IPC Message Queues",
1370 "queues",
1371 + "freebsd",
1372 + "kern.ipc.msq",
1373 990,
1374 update_every,
1375 RRDSET_TYPE_AREA
@@ -1345,6 +1392,8 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1392 NULL,
1393 "Number of Messages in IPC Message Queues",
1394 "messages",
1395 + "freebsd",
1396 + "kern.ipc.msq",
1397 1000,
1398 update_every,
1399 RRDSET_TYPE_AREA
@@ -1367,6 +1416,8 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
1416 NULL,
1417 "Size of IPC Message Queues",
1418 "bytes",
1419 + "freebsd",
1420 + "kern.ipc.msq",
1421 1100,
1422 update_every,
1423 RRDSET_TYPE_LINE
@@ -1408,6 +1459,8 @@ int do_uptime(int update_every, usec_t dt) {
1459 NULL,
1460 "System Uptime",
1461 "seconds",
1462 + "freebsd",
1463 + "uptime",
1464 1000,
1465 update_every,
1466 RRDSET_TYPE_LINE
@@ -1533,6 +1586,8 @@ int do_net_isr(int update_every, usec_t dt) {
1586 NULL,
1587 "System softnet_stat",
1588 "events/s",
1589 + "freebsd",
1590 + "net.isr",
1591 955,
1592 update_every,
1593 RRDSET_TYPE_LINE
@@ -1583,6 +1638,8 @@ int do_net_isr(int update_every, usec_t dt) {
1638 NULL,
1639 "Per CPU netisr statistics",
1640 "events/s",
1641 + "freebsd",
1642 + "net.isr",
1643 1101 + i,
1644 update_every,
1645 RRDSET_TYPE_LINE
@@ -1642,6 +1699,8 @@ int do_net_inet_tcp_states(int update_every, usec_t dt) {
1699 NULL,
1700 "IPv4 TCP Connections",
1701 "active connections",
1702 + "freebsd",
1703 + "net.inet.tcp.states",
1704 2500,
1705 update_every,
1706 RRDSET_TYPE_LINE
@@ -1717,6 +1776,8 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1776 NULL,
1777 "IPv4 TCP Packets",
1778 "packets/s",
1779 + "freebsd",
1780 + "net.inet.tcp.stats",
1781 2600,
1782 update_every,
1783 RRDSET_TYPE_LINE
@@ -1746,6 +1807,8 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1807 NULL,
1808 "IPv4 TCP Errors",
1809 "packets/s",
1810 + "freebsd",
1811 + "net.inet.tcp.stats",
1812 2700,
1813 update_every,
1814 RRDSET_TYPE_LINE
@@ -1785,6 +1848,8 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1848 NULL,
1849 "IPv4 TCP Handshake Issues",
1850 "events/s",
1851 + "freebsd",
1852 + "net.inet.tcp.stats",
1853 2900,
1854 update_every,
1855 RRDSET_TYPE_LINE
@@ -1823,6 +1888,8 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1888 NULL,
1889 "TCP Connection Aborts",
1890 "connections/s",
1891 + "freebsd",
1892 + "net.inet.tcp.stats",
1893 3010,
1894 update_every,
1895 RRDSET_TYPE_LINE
@@ -1860,6 +1927,8 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1927 NULL,
1928 "TCP Out-Of-Order Queue",
1929 "packets/s",
1930 + "freebsd",
1931 + "net.inet.tcp.stats",
1932 3050,
1933 update_every,
1934 RRDSET_TYPE_LINE
@@ -1889,6 +1958,8 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1958 NULL,
1959 "TCP SYN Cookies",
1960 "packets/s",
1961 + "freebsd",
1962 + "net.inet.tcp.stats",
1963 3100,
1964 update_every,
1965 RRDSET_TYPE_LINE
@@ -1922,6 +1993,8 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
1993 NULL,
1994 "IPv4 ECN Statistics",
1995 "packets/s",
1996 + "freebsd",
1997 + "net.inet.tcp.stats",
1998 8700,
1999 update_every,
2000 RRDSET_TYPE_LINE
@@ -1993,6 +2066,8 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
2066 NULL,
2067 "IPv4 UDP Packets",
2068 "packets/s",
2069 + "freebsd",
2070 + "net.inet.udp.stats",
2071 2601,
2072 update_every,
2073 RRDSET_TYPE_LINE
@@ -2023,6 +2098,8 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
2098 NULL,
2099 "IPv4 UDP Errors",
2100 "events/s",
2101 + "freebsd",
2102 + "net.inet.udp.stats",
2103 2701,
2104 update_every,
2105 RRDSET_TYPE_LINE
@@ -2099,16 +2176,19 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2176 static RRDDIM *rd_in = NULL, *rd_out = NULL;
2177
2178 if (unlikely(!st)) {
2102 - st = rrdset_create_localhost("ipv4",
2103 - "icmp",
2104 - NULL,
2105 - "icmp",
2106 - NULL,
2107 - "IPv4 ICMP Packets",
2108 - "packets/s",
2109 - 2602,
2110 - update_every,
2111 - RRDSET_TYPE_LINE
2179 + st = rrdset_create_localhost(
2180 + "ipv4"
2181 + , "icmp"
2182 + , NULL
2183 + , "icmp"
2184 + , NULL
2185 + , "IPv4 ICMP Packets"
2186 + , "packets/s"
2187 + , "freebsd"
2188 + , "net.inet.icmp.stats"
2189 + , 2602
2190 + , update_every
2191 + , RRDSET_TYPE_LINE
2192 );
2193
2194 rd_in = rrddim_add(st, "InMsgs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -2129,9 +2209,20 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2209 static RRDDIM *rd_in = NULL, *rd_out = NULL, *rd_in_csum = NULL;
2210
2211 if (unlikely(!st)) {
2132 - st = rrdset_create_localhost("ipv4", "icmp_errors", NULL, "icmp", NULL, "IPv4 ICMP Errors",
2133 - "packets/s",
2134 - 2603, update_every, RRDSET_TYPE_LINE);
2212 + st = rrdset_create_localhost(
2213 + "ipv4"
2214 + , "icmp_errors"
2215 + , NULL
2216 + , "icmp"
2217 + , NULL
2218 + , "IPv4 ICMP Errors"
2219 + , "packets/s"
2220 + , "freebsd"
2221 + , "net.inet.icmp.stats"
2222 + , 2603
2223 + , update_every
2224 + , RRDSET_TYPE_LINE
2225 + );
2226
2227 rd_in = rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2228 rd_out = rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -2154,8 +2245,20 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
2245 static RRDDIM *rd_in_reps = NULL, *rd_out_reps = NULL, *rd_in = NULL, *rd_out = NULL;
2246
2247 if (unlikely(!st)) {
2157 - st = rrdset_create_localhost("ipv4", "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messages",
2158 - "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
2248 + st = rrdset_create_localhost(
2249 + "ipv4"
2250 + , "icmpmsg"
2251 + , NULL
2252 + , "icmp"
2253 + , NULL
2254 + , "IPv4 ICMP Messages"
2255 + , "packets/s"
2256 + , "freebsd"
2257 + , "net.inet.icmp.stats"
2258 + , 2604
2259 + , update_every
2260 + , RRDSET_TYPE_LINE
2261 + );
2262
2263 rd_in_reps = rrddim_add(st, "InEchoReps", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2264 rd_out_reps = rrddim_add(st, "OutEchoReps", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -2227,6 +2330,8 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2330 NULL,
2331 "IPv4 Packets",
2332 "packets/s",
2333 + "freebsd",
2334 + "net.inet.ip.stats",
2335 3000,
2336 update_every,
2337 RRDSET_TYPE_LINE
@@ -2260,6 +2365,8 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2365 NULL,
2366 "IPv4 Fragments Sent",
2367 "packets/s",
2368 + "freebsd",
2369 + "net.inet.ip.stats",
2370 3010,
2371 update_every,
2372 RRDSET_TYPE_LINE
@@ -2293,6 +2400,8 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2400 NULL,
2401 "IPv4 Fragments Reassembly",
2402 "packets/s",
2403 + "freebsd",
2404 + "net.inet.ip.stats",
2405 3011,
2406 update_every,
2407 RRDSET_TYPE_LINE
@@ -2328,6 +2437,8 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
2437 NULL,
2438 "IPv4 Errors",
2439 "packets/s",
2440 + "freebsd",
2441 + "net.inet.ip.stats",
2442 3002,
2443 update_every,
2444 RRDSET_TYPE_LINE
@@ -2416,6 +2527,8 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2527 NULL,
2528 "IPv6 Packets",
2529 "packets/s",
2530 + "freebsd",
2531 + "net.inet6.ip6.stats",
2532 3000,
2533 update_every,
2534 RRDSET_TYPE_LINE
@@ -2453,6 +2566,8 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2566 NULL,
2567 "IPv6 Fragments Sent",
2568 "packets/s",
2569 + "freebsd",
2570 + "net.inet6.ip6.stats",
2571 3010,
2572 update_every,
2573 RRDSET_TYPE_LINE
@@ -2490,6 +2605,8 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2605 NULL,
2606 "IPv6 Fragments Reassembly",
2607 "packets/s",
2608 + "freebsd",
2609 + "net.inet6.ip6.stats",
2610 3011,
2611 update_every,
2612 RRDSET_TYPE_LINE
@@ -2538,6 +2655,8 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2655 NULL,
2656 "IPv6 Errors",
2657 "packets/s",
2658 + "freebsd",
2659 + "net.inet6.ip6.stats",
2660 3002,
2661 update_every,
2662 RRDSET_TYPE_LINE
@@ -2649,6 +2768,8 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2768 NULL,
2769 "IPv6 ICMP Messages",
2770 "messages/s",
2771 + "freebsd",
2772 + "net.inet6.icmp6.stats",
2773 10000,
2774 update_every,
2775 RRDSET_TYPE_LINE
@@ -2681,6 +2802,8 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2802 NULL,
2803 "IPv6 ICMP Redirects",
2804 "redirects/s",
2805 + "freebsd",
2806 + "net.inet6.icmp6.stats",
2807 10050,
2808 update_every,
2809 RRDSET_TYPE_LINE
@@ -2725,6 +2848,8 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2848 NULL,
2849 "IPv6 ICMP Errors",
2850 "errors/s",
2851 + "freebsd",
2852 + "net.inet6.icmp6.stats",
2853 10100,
2854 update_every,
2855 RRDSET_TYPE_LINE
@@ -2777,6 +2902,8 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2902 NULL,
2903 "IPv6 ICMP Echo",
2904 "messages/s",
2905 + "freebsd",
2906 + "net.inet6.icmp6.stats",
2907 10200,
2908 update_every,
2909 RRDSET_TYPE_LINE
@@ -2817,6 +2944,8 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2944 NULL,
2945 "IPv6 Router Messages",
2946 "messages/s",
2947 + "freebsd",
2948 + "net.inet6.icmp6.stats",
2949 10400,
2950 update_every,
2951 RRDSET_TYPE_LINE
@@ -2857,6 +2986,8 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
2986 NULL,
2987 "IPv6 Neighbor Messages",
2988 "messages/s",
2989 + "freebsd",
2990 + "net.inet6.icmp6.stats",
2991 10500,
2992 update_every,
2993 RRDSET_TYPE_LINE
@@ -2904,6 +3035,8 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
3035 NULL,
3036 "IPv6 ICMP Types",
3037 "messages/s",
3038 + "freebsd",
3039 + "net.inet6.icmp6.stats",
3040 10700,
3041 update_every,
3042 RRDSET_TYPE_LINE
src/global_statistics.c
+98 -17
@@ -138,9 +138,20 @@ void global_statistics_charts(void) {
138 #else
139 if (!stcpu_thread) stcpu_thread = rrdset_find_localhost("netdata.plugin_proc_cpu");
140 if (!stcpu_thread) {
141 - stcpu_thread = rrdset_create_localhost("netdata", "plugin_proc_cpu", NULL, "proc", NULL
142 - , "NetData Proc Plugin CPU usage", "milliseconds/s", 132000
143 - , localhost->rrd_update_every, RRDSET_TYPE_STACKED);
141 + stcpu_thread = rrdset_create_localhost(
142 + "netdata"
143 + , "plugin_proc_cpu"
144 + , NULL
145 + , "proc"
146 + , NULL
147 + , "NetData Proc Plugin CPU usage"
148 + , "milliseconds/s"
149 + , "netdata"
150 + , "stats"
151 + , 132000
152 + , localhost->rrd_update_every
153 + , RRDSET_TYPE_STACKED
154 + );
155 #endif
156
157 rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
@@ -155,8 +166,20 @@ void global_statistics_charts(void) {
166
167 if (!stcpu) stcpu = rrdset_find_localhost("netdata.server_cpu");
168 if (!stcpu) {
158 - stcpu = rrdset_create_localhost("netdata", "server_cpu", NULL, "netdata", NULL, "NetData CPU usage"
159 - , "milliseconds/s", 130000, localhost->rrd_update_every, RRDSET_TYPE_STACKED);
169 + stcpu = rrdset_create_localhost(
170 + "netdata"
171 + , "server_cpu"
172 + , NULL
173 + , "netdata"
174 + , NULL
175 + , "NetData CPU usage"
176 + , "milliseconds/s"
177 + , "netdata"
178 + , "stats"
179 + , 130000
180 + , localhost->rrd_update_every
181 + , RRDSET_TYPE_STACKED
182 + );
183
184 rrddim_add(stcpu, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
185 rrddim_add(stcpu, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
@@ -170,8 +193,20 @@ void global_statistics_charts(void) {
193
194 if (!stclients) stclients = rrdset_find_localhost("netdata.clients");
195 if (!stclients) {
173 - stclients = rrdset_create_localhost("netdata", "clients", NULL, "netdata", NULL, "NetData Web Clients"
174 - , "connected clients", 130200, localhost->rrd_update_every, RRDSET_TYPE_LINE);
196 + stclients = rrdset_create_localhost(
197 + "netdata"
198 + , "clients"
199 + , NULL
200 + , "netdata"
201 + , NULL
202 + , "NetData Web Clients"
203 + , "connected clients"
204 + , "netdata"
205 + , "stats"
206 + , 130200
207 + , localhost->rrd_update_every
208 + , RRDSET_TYPE_LINE
209 + );
210
211 rrddim_add(stclients, "clients", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
212 } else rrdset_next(stclients);
@@ -183,8 +218,20 @@ void global_statistics_charts(void) {
218
219 if (!streqs) streqs = rrdset_find_localhost("netdata.requests");
220 if (!streqs) {
186 - streqs = rrdset_create_localhost("netdata", "requests", NULL, "netdata", NULL, "NetData Web Requests"
187 - , "requests/s", 130300, localhost->rrd_update_every, RRDSET_TYPE_LINE);
221 + streqs = rrdset_create_localhost(
222 + "netdata"
223 + , "requests"
224 + , NULL
225 + , "netdata"
226 + , NULL
227 + , "NetData Web Requests"
228 + , "requests/s"
229 + , "netdata"
230 + , "stats"
231 + , 130300
232 + , localhost->rrd_update_every
233 + , RRDSET_TYPE_LINE
234 + );
235
236 rrddim_add(streqs, "requests", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
237 } else rrdset_next(streqs);
@@ -196,8 +243,20 @@ void global_statistics_charts(void) {
243
244 if (!stbytes) stbytes = rrdset_find_localhost("netdata.net");
245 if (!stbytes) {
199 - stbytes = rrdset_create_localhost("netdata", "net", NULL, "netdata", NULL, "NetData Network Traffic"
200 - , "kilobits/s", 130000, localhost->rrd_update_every, RRDSET_TYPE_AREA);
246 + stbytes = rrdset_create_localhost(
247 + "netdata"
248 + , "net"
249 + , NULL
250 + , "netdata"
251 + , NULL
252 + , "NetData Network Traffic"
253 + , "kilobits/s"
254 + , "netdata"
255 + , "stats"
256 + , 130000
257 + , localhost->rrd_update_every
258 + , RRDSET_TYPE_AREA
259 + );
260
261 rrddim_add(stbytes, "in", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
262 rrddim_add(stbytes, "out", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
@@ -211,9 +270,20 @@ void global_statistics_charts(void) {
270
271 if (!stduration) stduration = rrdset_find_localhost("netdata.response_time");
272 if (!stduration) {
214 - stduration = rrdset_create_localhost("netdata", "response_time", NULL, "netdata", NULL
215 - , "NetData API Response Time", "ms/request", 130400, localhost->rrd_update_every
216 - , RRDSET_TYPE_LINE);
273 + stduration = rrdset_create_localhost(
274 + "netdata"
275 + , "response_time"
276 + , NULL
277 + , "netdata"
278 + , NULL
279 + , "NetData API Response Time"
280 + , "ms/request"
281 + , "netdata"
282 + , "stats"
283 + , 130400
284 + , localhost->rrd_update_every
285 + , RRDSET_TYPE_LINE
286 + );
287
288 rrddim_add(stduration, "average", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
289 rrddim_add(stduration, "max", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
@@ -243,9 +313,20 @@ void global_statistics_charts(void) {
313
314 if (!stcompression) stcompression = rrdset_find_localhost("netdata.compression_ratio");
315 if (!stcompression) {
246 - stcompression = rrdset_create_localhost("netdata", "compression_ratio", NULL, "netdata", NULL
247 - , "NetData API Responses Compression Savings Ratio", "percentage"
248 - , 130500, localhost->rrd_update_every, RRDSET_TYPE_LINE);
316 + stcompression = rrdset_create_localhost(
317 + "netdata"
318 + , "compression_ratio"
319 + , NULL
320 + , "netdata"
321 + , NULL
322 + , "NetData API Responses Compression Savings Ratio"
323 + , "percentage"
324 + , "netdata"
325 + , "stats"
326 + , 130500
327 + , localhost->rrd_update_every
328 + , RRDSET_TYPE_LINE
329 + );
330
331 rrddim_add(stcompression, "savings", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
332 } else rrdset_next(stcompression);
src/ipc.c
+28 -6
@@ -193,17 +193,39 @@ int do_ipc(int update_every, usec_t dt) {
193 // create the charts
194 semaphores = rrdset_find_localhost("system.ipc_semaphores");
195 if(!semaphores) {
196 - semaphores = rrdset_create_localhost("system", "ipc_semaphores", NULL, "ipc semaphores", NULL
197 - , "IPC Semaphores", "semaphores", 1000, localhost->rrd_update_every
198 - , RRDSET_TYPE_AREA);
196 + semaphores = rrdset_create_localhost(
197 + "system"
198 + , "ipc_semaphores"
199 + , NULL
200 + , "ipc semaphores"
201 + , NULL
202 + , "IPC Semaphores"
203 + , "semaphores"
204 + , "linux"
205 + , "ipc"
206 + , 1000
207 + , localhost->rrd_update_every
208 + , RRDSET_TYPE_AREA
209 + );
210 rrddim_add(semaphores, "semaphores", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
211 }
212
213 arrays = rrdset_find_localhost("system.ipc_semaphore_arrays");
214 if(!arrays) {
204 - arrays = rrdset_create_localhost("system", "ipc_semaphore_arrays", NULL, "ipc semaphores", NULL
205 - , "IPC Semaphore Arrays", "arrays", 1000, localhost->rrd_update_every
206 - , RRDSET_TYPE_AREA);
215 + arrays = rrdset_create_localhost(
216 + "system"
217 + , "ipc_semaphore_arrays"
218 + , NULL
219 + , "ipc semaphores"
220 + , NULL
221 + , "IPC Semaphore Arrays"
222 + , "arrays"
223 + , "linux"
224 + , "ipc"
225 + , 1000
226 + , localhost->rrd_update_every
227 + , RRDSET_TYPE_AREA
228 + );
229 rrddim_add(arrays, "arrays", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
230 }
231 }
src/macos_fw.c
+211 -43
@@ -138,9 +138,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
138
139 st = rrdset_find_bytype_localhost("disk", diskstat.name);
140 if (unlikely(!st)) {
141 - st = rrdset_create_localhost("disk", diskstat.name, NULL, diskstat.name, "disk.io"
142 - , "Disk I/O Bandwidth", "kilobytes/s", 2000, update_every
143 - , RRDSET_TYPE_AREA);
141 + st = rrdset_create_localhost(
142 + "disk"
143 + , diskstat.name
144 + , NULL
145 + , diskstat.name
146 + , "disk.io"
147 + , "Disk I/O Bandwidth"
148 + , "kilobytes/s"
149 + , "macos"
150 + , "iokit"
151 + , 2000
152 + , update_every
153 + , RRDSET_TYPE_AREA
154 + );
155
156 rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
157 rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -165,9 +176,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
176
177 st = rrdset_find_bytype_localhost("disk_ops", diskstat.name);
178 if (unlikely(!st)) {
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);
179 + st = rrdset_create_localhost(
180 + "disk_ops"
181 + , diskstat.name
182 + , NULL
183 + , diskstat.name
184 + , "disk.ops"
185 + , "Disk Completed I/O Operations"
186 + , "operations/s"
187 + , "macos"
188 + , "iokit"
189 + , 2001
190 + , update_every
191 + , RRDSET_TYPE_LINE
192 + );
193 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
194
195 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -193,9 +215,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
215
216 st = rrdset_find_bytype_localhost("disk_util", diskstat.name);
217 if (unlikely(!st)) {
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);
218 + st = rrdset_create_localhost(
219 + "disk_util"
220 + , diskstat.name
221 + , NULL
222 + , diskstat.name
223 + , "disk.util"
224 + , "Disk Utilization Time"
225 + , "% of time working"
226 + , "macos"
227 + , "iokit"
228 + , 2004
229 + , update_every
230 + , RRDSET_TYPE_AREA
231 + );
232 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
233
234 rrddim_add(st, "utilization", NULL, 1, 10000000, RRD_ALGORITHM_INCREMENTAL);
@@ -220,9 +253,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
253
254 st = rrdset_find_bytype_localhost("disk_iotime", diskstat.name);
255 if (unlikely(!st)) {
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);
256 + st = rrdset_create_localhost(
257 + "disk_iotime"
258 + , diskstat.name
259 + , NULL
260 + , diskstat.name
261 + , "disk.iotime"
262 + , "Disk Total I/O Time"
263 + , "milliseconds/s"
264 + , "macos"
265 + , "iokit"
266 + , 2022
267 + , update_every
268 + , RRDSET_TYPE_LINE
269 + );
270 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
271
272 rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_INCREMENTAL);
@@ -246,9 +290,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
290
291 st = rrdset_find_bytype_localhost("disk_await", diskstat.name);
292 if (unlikely(!st)) {
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);
293 + st = rrdset_create_localhost(
294 + "disk_await"
295 + , diskstat.name
296 + , NULL
297 + , diskstat.name
298 + , "disk.await"
299 + , "Average Completed I/O Operation Time"
300 + , "ms per operation"
301 + , "macos"
302 + , "iokit"
303 + , 2005
304 + , update_every
305 + , RRDSET_TYPE_LINE
306 + );
307 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
308
309 rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
@@ -266,10 +321,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
321
322 st = rrdset_find_bytype_localhost("disk_avgsz", diskstat.name);
323 if (unlikely(!st)) {
269 - st = rrdset_create_localhost("disk_avgsz", diskstat.name, NULL, diskstat.name, "disk.avgsz"
270 - , "Average Completed I/O Operation Bandwidth"
271 - , "kilobytes per operation", 2006, update_every
272 - , RRDSET_TYPE_AREA);
324 + st = rrdset_create_localhost(
325 + "disk_avgsz"
326 + , diskstat.name
327 + , NULL
328 + , diskstat.name
329 + , "disk.avgsz"
330 + , "Average Completed I/O Operation Bandwidth"
331 + , "kilobytes per operation"
332 + , "macos"
333 + , "iokit"
334 + , 2006
335 + , update_every
336 + , RRDSET_TYPE_AREA
337 + );
338 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
339
340 rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -287,9 +352,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
352
353 st = rrdset_find_bytype_localhost("disk_svctm", diskstat.name);
354 if (unlikely(!st)) {
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);
355 + st = rrdset_create_localhost(
356 + "disk_svctm"
357 + , diskstat.name
358 + , NULL
359 + , diskstat.name
360 + , "disk.svctm"
361 + , "Average Service Time"
362 + , "ms per operation"
363 + , "macos"
364 + , "iokit"
365 + , 2007
366 + , update_every
367 + , RRDSET_TYPE_LINE
368 + );
369 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
370
371 rrddim_add(st, "svctm", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
@@ -318,8 +394,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
394 if (likely(do_io)) {
395 st = rrdset_find_bytype_localhost("system", "io");
396 if (unlikely(!st)) {
321 - st = rrdset_create_localhost("system", "io", NULL, "disk", NULL, "Disk I/O", "kilobytes/s", 150
322 - , update_every, RRDSET_TYPE_AREA);
397 + st = rrdset_create_localhost(
398 + "system"
399 + , "io"
400 + , NULL
401 + , "disk"
402 + , NULL
403 + , "Disk I/O"
404 + , "kilobytes/s"
405 + , "macos"
406 + , "iokit"
407 + , 150
408 + , update_every
409 + , RRDSET_TYPE_AREA
410 + );
411 rrddim_add(st, "in", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
412 rrddim_add(st, "out", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
413 }
@@ -359,14 +447,24 @@ int do_macos_iokit(int update_every, usec_t dt) {
447 st = rrdset_find_bytype_localhost("disk_space", mntbuf[i].f_mntonname);
448 if (unlikely(!st)) {
449 snprintfz(title, 4096, "Disk Space Usage for %s [%s]", mntbuf[i].f_mntonname, mntbuf[i].f_mntfromname);
362 - st = rrdset_create_localhost("disk_space", mntbuf[i].f_mntonname, NULL, mntbuf[i].f_mntonname
363 - , "disk.space", title, "GB", 2023, update_every
364 - , RRDSET_TYPE_STACKED);
450 + st = rrdset_create_localhost(
451 + "disk_space"
452 + , mntbuf[i].f_mntonname
453 + , NULL
454 + , mntbuf[i].f_mntonname
455 + , "disk.space"
456 + , title
457 + , "GB"
458 + , "macos"
459 + , "iokit"
460 + , 2023
461 + , update_every
462 + , RRDSET_TYPE_STACKED
463 + );
464
465 rrddim_add(st, "avail", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
466 rrddim_add(st, "used", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
368 - rrddim_add(st, "reserved_for_root", "reserved for root", mntbuf[i].f_bsize, GIGA_FACTOR,
369 - RRD_ALGORITHM_ABSOLUTE);
467 + rrddim_add(st, "reserved_for_root", "reserved for root", mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
468 } else
469 rrdset_next(st);
470
@@ -382,9 +480,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
480 st = rrdset_find_bytype_localhost("disk_inodes", mntbuf[i].f_mntonname);
481 if (unlikely(!st)) {
482 snprintfz(title, 4096, "Disk Files (inodes) Usage for %s [%s]", mntbuf[i].f_mntonname, mntbuf[i].f_mntfromname);
385 - st = rrdset_create_localhost("disk_inodes", mntbuf[i].f_mntonname, NULL, mntbuf[i].f_mntonname
386 - , "disk.inodes", title, "Inodes", 2024, update_every
387 - , RRDSET_TYPE_STACKED);
483 + st = rrdset_create_localhost(
484 + "disk_inodes"
485 + , mntbuf[i].f_mntonname
486 + , NULL
487 + , mntbuf[i].f_mntonname
488 + , "disk.inodes"
489 + , title
490 + , "Inodes"
491 + , "macos"
492 + , "iokit"
493 + , 2024
494 + , update_every
495 + , RRDSET_TYPE_STACKED
496 + );
497
498 rrddim_add(st, "avail", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
499 rrddim_add(st, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -417,8 +526,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
526
527 st = rrdset_find_bytype_localhost("net", ifa->ifa_name);
528 if (unlikely(!st)) {
420 - st = rrdset_create_localhost("net", ifa->ifa_name, NULL, ifa->ifa_name, "net.net", "Bandwidth"
421 - , "kilobits/s", 7000, update_every, RRDSET_TYPE_AREA);
529 + st = rrdset_create_localhost(
530 + "net"
531 + , ifa->ifa_name
532 + , NULL
533 + , ifa->ifa_name
534 + , "net.net"
535 + , "Bandwidth"
536 + , "kilobits/s"
537 + , "macos"
538 + , "iokit"
539 + , 7000
540 + , update_every
541 + , RRDSET_TYPE_AREA
542 + );
543
544 rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
545 rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
@@ -433,8 +554,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
554
555 st = rrdset_find_bytype_localhost("net_packets", ifa->ifa_name);
556 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);
557 + st = rrdset_create_localhost(
558 + "net_packets"
559 + , ifa->ifa_name
560 + , NULL
561 + , ifa->ifa_name
562 + , "net.packets"
563 + , "Packets"
564 + , "packets/s"
565 + , "macos"
566 + , "iokit"
567 + , 7001
568 + , update_every
569 + , RRDSET_TYPE_LINE
570 + );
571 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
572
573 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -454,8 +587,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
587
588 st = rrdset_find_bytype_localhost("net_errors", ifa->ifa_name);
589 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);
590 + st = rrdset_create_localhost(
591 + "net_errors"
592 + , ifa->ifa_name
593 + , NULL
594 + , ifa->ifa_name
595 + , "net.errors"
596 + , "Interface Errors"
597 + , "errors/s"
598 + , "macos"
599 + , "iokit"
600 + , 7002
601 + , update_every
602 + , RRDSET_TYPE_LINE
603 + );
604 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
605
606 rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -471,8 +616,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
616
617 st = rrdset_find_bytype_localhost("net_drops", ifa->ifa_name);
618 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);
619 + st = rrdset_create_localhost(
620 + "net_drops"
621 + , ifa->ifa_name
622 + , NULL
623 + , ifa->ifa_name
624 + , "net.drops"
625 + , "Interface Drops"
626 + , "drops/s"
627 + , "macos"
628 + , "iokit"
629 + , 7003
630 + , update_every
631 + , RRDSET_TYPE_LINE
632 + );
633 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
634
635 rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -486,9 +643,20 @@ int do_macos_iokit(int update_every, usec_t dt) {
643
644 st = rrdset_find_bytype_localhost("net_events", ifa->ifa_name);
645 if (unlikely(!st)) {
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);
646 + st = rrdset_create_localhost(
647 + "net_events"
648 + , ifa->ifa_name
649 + , NULL
650 + , ifa->ifa_name
651 + , "net.events"
652 + , "Network Interface Events"
653 + , "events/s"
654 + , "macos"
655 + , "iokit"
656 + , 7006
657 + , update_every
658 + , RRDSET_TYPE_LINE
659 + );
660 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
661
662 rrddim_add(st, "frames", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/macos_mach_smi.c
+42 -6
@@ -54,8 +54,20 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
54
55 st = rrdset_find_bytype_localhost("system", "cpu");
56 if (unlikely(!st)) {
57 - st = rrdset_create_localhost("system", "cpu", NULL, "cpu", "system.cpu", "Total CPU utilization"
58 - , "percentage", 100, update_every, RRDSET_TYPE_STACKED);
57 + st = rrdset_create_localhost(
58 + "system"
59 + , "cpu"
60 + , NULL
61 + , "cpu"
62 + , "system.cpu"
63 + , "Total CPU utilization"
64 + , "percentage"
65 + , "macos"
66 + , "mach_smi"
67 + , 100
68 + , update_every
69 + , RRDSET_TYPE_STACKED
70 + );
71
72 rrddim_add(st, "user", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
73 rrddim_add(st, "nice", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
@@ -96,8 +108,20 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
108 if (likely(do_ram)) {
109 st = rrdset_find_localhost("system.ram");
110 if (unlikely(!st)) {
99 - st = rrdset_create_localhost("system", "ram", NULL, "ram", NULL, "System RAM", "MB", 200
100 - , update_every, RRDSET_TYPE_STACKED);
111 + st = rrdset_create_localhost(
112 + "system"
113 + , "ram"
114 + , NULL
115 + , "ram"
116 + , NULL
117 + , "System RAM"
118 + , "MB"
119 + , "macos"
120 + , "mach_smi"
121 + , 200
122 + , update_every
123 + , RRDSET_TYPE_STACKED
124 + );
125
126 rrddim_add(st, "active", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
127 rrddim_add(st, "wired", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
@@ -150,8 +174,20 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
174 if (likely(do_pgfaults)) {
175 st = rrdset_find_localhost("mem.pgfaults");
176 if (unlikely(!st)) {
153 - st = rrdset_create_localhost("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults"
154 - , "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
177 + st = rrdset_create_localhost(
178 + "mem"
179 + , "pgfaults"
180 + , NULL
181 + , "system"
182 + , NULL
183 + , "Memory Page Faults"
184 + , "page faults/s"
185 + , "macos"
186 + , "mach_smi"
187 + , 500
188 + , update_every
189 + , RRDSET_TYPE_LINE
190 + );
191 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
192
193 rrddim_add(st, "memory", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/macos_sysctl.c
+420 -61
@@ -230,9 +230,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
230
231 st = rrdset_find_bytype_localhost("system", "load");
232 if (unlikely(!st)) {
233 - st = rrdset_create_localhost("system", "load", NULL, "load", NULL, "System Load Average", "load"
234 - , 100, (update_every < MIN_LOADAVG_UPDATE_EVERY)
235 - ? MIN_LOADAVG_UPDATE_EVERY : update_every, RRDSET_TYPE_LINE);
233 + st = rrdset_create_localhost(
234 + "system"
235 + , "load"
236 + , NULL
237 + , "load"
238 + , NULL
239 + , "System Load Average"
240 + , "load"
241 + , "macos"
242 + , "sysctl"
243 + , 100
244 + , (update_every < MIN_LOADAVG_UPDATE_EVERY) ? MIN_LOADAVG_UPDATE_EVERY : update_every
245 + , RRDSET_TYPE_LINE
246 + );
247 rrddim_add(st, "load1", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
248 rrddim_add(st, "load5", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
249 rrddim_add(st, "load15", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
@@ -259,8 +270,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
270 } else {
271 st = rrdset_find_localhost("system.swap");
272 if (unlikely(!st)) {
262 - st = rrdset_create_localhost("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201
263 - , update_every, RRDSET_TYPE_STACKED);
273 + st = rrdset_create_localhost(
274 + "system"
275 + , "swap"
276 + , NULL
277 + , "swap"
278 + , NULL
279 + , "System Swap"
280 + , "MB"
281 + , "macos"
282 + , "sysctl"
283 + , 201
284 + , update_every
285 + , RRDSET_TYPE_STACKED
286 + );
287 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
288
289 rrddim_add(st, "free", NULL, 1, 1048576, RRD_ALGORITHM_ABSOLUTE);
@@ -309,8 +332,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
332 }
333 st = rrdset_find_localhost("system.ipv4");
334 if (unlikely(!st)) {
312 - st = rrdset_create_localhost("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s"
313 - , 500, update_every, RRDSET_TYPE_AREA);
335 + st = rrdset_create_localhost(
336 + "system"
337 + , "ipv4"
338 + , NULL
339 + , "network"
340 + , NULL
341 + , "IPv4 Bandwidth"
342 + , "kilobits/s"
343 + , "macos"
344 + , "sysctl"
345 + , 500
346 + , update_every
347 + , RRDSET_TYPE_AREA
348 + );
349
350 rrddim_add(st, "InOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
351 rrddim_add(st, "OutOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
@@ -347,8 +382,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
382 if (likely(do_tcp_packets)) {
383 st = rrdset_find_localhost("ipv4.tcppackets");
384 if (unlikely(!st)) {
350 - st = rrdset_create_localhost("ipv4", "tcppackets", NULL, "tcp", NULL, "IPv4 TCP Packets"
351 - , "packets/s", 2600, update_every, RRDSET_TYPE_LINE);
385 + st = rrdset_create_localhost(
386 + "ipv4"
387 + , "tcppackets"
388 + , NULL
389 + , "tcp"
390 + , NULL
391 + , "IPv4 TCP Packets"
392 + , "packets/s"
393 + , "macos"
394 + , "sysctl"
395 + , 2600
396 + , update_every
397 + , RRDSET_TYPE_LINE
398 + );
399
400 rrddim_add(st, "InSegs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
401 rrddim_add(st, "OutSegs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -365,8 +412,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
412 if (likely(do_tcp_errors)) {
413 st = rrdset_find_localhost("ipv4.tcperrors");
414 if (unlikely(!st)) {
368 - st = rrdset_create_localhost("ipv4", "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors", "packets/s"
369 - , 2700, update_every, RRDSET_TYPE_LINE);
415 + st = rrdset_create_localhost(
416 + "ipv4"
417 + , "tcperrors"
418 + , NULL
419 + , "tcp"
420 + , NULL
421 + , "IPv4 TCP Errors"
422 + , "packets/s"
423 + , "macos"
424 + , "sysctl"
425 + , 2700
426 + , update_every
427 + , RRDSET_TYPE_LINE
428 + );
429 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
430
431 rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -386,8 +445,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
445 if (likely(do_tcp_handshake)) {
446 st = rrdset_find_localhost("ipv4.tcphandshake");
447 if (unlikely(!st)) {
389 - st = rrdset_create_localhost("ipv4", "tcphandshake", NULL, "tcp", NULL, "IPv4 TCP Handshake Issues"
390 - , "events/s", 2900, update_every, RRDSET_TYPE_LINE);
448 + st = rrdset_create_localhost(
449 + "ipv4"
450 + , "tcphandshake"
451 + , NULL
452 + , "tcp"
453 + , NULL
454 + , "IPv4 TCP Handshake Issues"
455 + , "events/s"
456 + , "macos"
457 + , "sysctl"
458 + , 2900
459 + , update_every
460 + , RRDSET_TYPE_LINE
461 + );
462 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
463
464 rrddim_add(st, "EstabResets", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -410,8 +481,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
481 do_tcpext_connaborts = CONFIG_BOOLEAN_YES;
482 st = rrdset_find_localhost("ipv4.tcpconnaborts");
483 if (unlikely(!st)) {
413 - st = rrdset_create_localhost("ipv4", "tcpconnaborts", NULL, "tcp", NULL, "TCP Connection Aborts"
414 - , "connections/s", 3010, update_every, RRDSET_TYPE_LINE);
484 + st = rrdset_create_localhost(
485 + "ipv4"
486 + , "tcpconnaborts"
487 + , NULL
488 + , "tcp"
489 + , NULL
490 + , "TCP Connection Aborts"
491 + , "connections/s"
492 + , "macos"
493 + , "sysctl"
494 + , 3010
495 + , update_every
496 + , RRDSET_TYPE_LINE
497 + );
498
499 rrddim_add(st, "TCPAbortOnData", "baddata", 1, 1, RRD_ALGORITHM_INCREMENTAL);
500 rrddim_add(st, "TCPAbortOnClose", "userclosed", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -433,8 +516,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
516 do_tcpext_ofo = CONFIG_BOOLEAN_YES;
517 st = rrdset_find_localhost("ipv4.tcpofo");
518 if (unlikely(!st)) {
436 - st = rrdset_create_localhost("ipv4", "tcpofo", NULL, "tcp", NULL, "TCP Out-Of-Order Queue"
437 - , "packets/s", 3050, update_every, RRDSET_TYPE_LINE);
519 + st = rrdset_create_localhost(
520 + "ipv4"
521 + , "tcpofo"
522 + , NULL
523 + , "tcp"
524 + , NULL
525 + , "TCP Out-Of-Order Queue"
526 + , "packets/s"
527 + , "macos"
528 + , "sysctl"
529 + , 3050
530 + , update_every
531 + , RRDSET_TYPE_LINE
532 + );
533
534 rrddim_add(st, "TCPOFOQueue", "inqueue", 1, 1, RRD_ALGORITHM_INCREMENTAL);
535 }
@@ -451,8 +546,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
546
547 st = rrdset_find_localhost("ipv4.tcpsyncookies");
548 if (unlikely(!st)) {
454 - st = rrdset_create_localhost("ipv4", "tcpsyncookies", NULL, "tcp", NULL, "TCP SYN Cookies"
455 - , "packets/s", 3100, update_every, RRDSET_TYPE_LINE);
549 + st = rrdset_create_localhost(
550 + "ipv4"
551 + , "tcpsyncookies"
552 + , NULL
553 + , "tcp"
554 + , NULL
555 + , "TCP SYN Cookies"
556 + , "packets/s"
557 + , "macos"
558 + , "sysctl"
559 + , 3100
560 + , update_every
561 + , RRDSET_TYPE_LINE
562 + );
563
564 rrddim_add(st, "SyncookiesRecv", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
565 rrddim_add(st, "SyncookiesSent", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -505,8 +612,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
612 if (likely(do_udp_packets)) {
613 st = rrdset_find_localhost("ipv4.udppackets");
614 if (unlikely(!st)) {
508 - st = rrdset_create_localhost("ipv4", "udppackets", NULL, "udp", NULL, "IPv4 UDP Packets"
509 - , "packets/s", 2601, update_every, RRDSET_TYPE_LINE);
615 + st = rrdset_create_localhost(
616 + "ipv4"
617 + , "udppackets"
618 + , NULL
619 + , "udp"
620 + , NULL
621 + , "IPv4 UDP Packets"
622 + , "packets/s"
623 + , "macos"
624 + , "sysctl"
625 + , 2601
626 + , update_every
627 + , RRDSET_TYPE_LINE
628 + );
629
630 rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
631 rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -523,8 +642,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
642 if (likely(do_udp_errors)) {
643 st = rrdset_find_localhost("ipv4.udperrors");
644 if (unlikely(!st)) {
526 - st = rrdset_create_localhost("ipv4", "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s"
527 - , 2701, update_every, RRDSET_TYPE_LINE);
645 + st = rrdset_create_localhost(
646 + "ipv4"
647 + , "udperrors"
648 + , NULL
649 + , "udp"
650 + , NULL
651 + , "IPv4 UDP Errors"
652 + , "events/s"
653 + , "macos"
654 + , "sysctl"
655 + , 2701
656 + , update_every
657 + , RRDSET_TYPE_LINE
658 + );
659 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
660
661 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -572,8 +703,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
703 if (likely(do_icmp_packets)) {
704 st = rrdset_find_localhost("ipv4.icmp");
705 if (unlikely(!st)) {
575 - st = rrdset_create_localhost("ipv4", "icmp", NULL, "icmp", NULL, "IPv4 ICMP Packets", "packets/s"
576 - , 2602, update_every, RRDSET_TYPE_LINE);
706 + st = rrdset_create_localhost(
707 + "ipv4"
708 + , "icmp"
709 + , NULL
710 + , "icmp"
711 + , NULL
712 + , "IPv4 ICMP Packets"
713 + , "packets/s"
714 + , "macos"
715 + , "sysctl"
716 + , 2602
717 + , update_every
718 + , RRDSET_TYPE_LINE
719 + );
720
721 rrddim_add(st, "InMsgs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
722 rrddim_add(st, "OutMsgs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -589,8 +732,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
732
733 st = rrdset_find_localhost("ipv4.icmp_errors");
734 if (unlikely(!st)) {
592 - st = rrdset_create_localhost("ipv4", "icmp_errors", NULL, "icmp", NULL, "IPv4 ICMP Errors"
593 - , "packets/s", 2603, update_every, RRDSET_TYPE_LINE);
735 + st = rrdset_create_localhost(
736 + "ipv4"
737 + , "icmp_errors"
738 + , NULL
739 + , "icmp"
740 + , NULL
741 + , "IPv4 ICMP Errors"
742 + , "packets/s"
743 + , "macos"
744 + , "sysctl"
745 + , 2603
746 + , update_every
747 + , RRDSET_TYPE_LINE
748 + );
749
750 rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
751 rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -610,8 +765,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
765 if (likely(do_icmpmsg)) {
766 st = rrdset_find_localhost("ipv4.icmpmsg");
767 if (unlikely(!st)) {
613 - st = rrdset_create_localhost("ipv4", "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messages"
614 - , "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
768 + st = rrdset_create_localhost(
769 + "ipv4"
770 + , "icmpmsg"
771 + , NULL
772 + , "icmp"
773 + , NULL
774 + , "IPv4 ICMP Messages"
775 + , "packets/s"
776 + , "macos"
777 + , "sysctl"
778 + , 2604
779 + , update_every
780 + , RRDSET_TYPE_LINE
781 + );
782
783 rrddim_add(st, "InEchoReps", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
784 rrddim_add(st, "OutEchoReps", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -647,8 +814,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
814 if (likely(do_ip_packets)) {
815 st = rrdset_find_localhost("ipv4.packets");
816 if (unlikely(!st)) {
650 - st = rrdset_create_localhost("ipv4", "packets", NULL, "packets", NULL, "IPv4 Packets", "packets/s"
651 - , 3000, update_every, RRDSET_TYPE_LINE);
817 + st = rrdset_create_localhost(
818 + "ipv4"
819 + , "packets"
820 + , NULL
821 + , "packets"
822 + , NULL
823 + , "IPv4 Packets"
824 + , "packets/s"
825 + , "macos"
826 + , "sysctl"
827 + , 3000
828 + , update_every
829 + , RRDSET_TYPE_LINE
830 + );
831
832 rrddim_add(st, "InReceives", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
833 rrddim_add(st, "OutRequests", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -669,8 +848,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
848 if (likely(do_ip_fragsout)) {
849 st = rrdset_find_localhost("ipv4.fragsout");
850 if (unlikely(!st)) {
672 - st = rrdset_create_localhost("ipv4", "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent"
673 - , "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
851 + st = rrdset_create_localhost(
852 + "ipv4"
853 + , "fragsout"
854 + , NULL
855 + , "fragments"
856 + , NULL
857 + , "IPv4 Fragments Sent"
858 + , "packets/s"
859 + , "macos"
860 + , "sysctl"
861 + , 3010
862 + , update_every
863 + , RRDSET_TYPE_LINE
864 + );
865 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
866
867 rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -690,8 +881,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
881 if (likely(do_ip_fragsin)) {
882 st = rrdset_find_localhost("ipv4.fragsin");
883 if (unlikely(!st)) {
693 - st = rrdset_create_localhost("ipv4", "fragsin", NULL, "fragments", NULL, "IPv4 Fragments Reassembly"
694 - , "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
884 + st = rrdset_create_localhost(
885 + "ipv4"
886 + , "fragsin"
887 + , NULL
888 + , "fragments"
889 + , NULL
890 + , "IPv4 Fragments Reassembly"
891 + , "packets/s"
892 + , "macos"
893 + , "sysctl"
894 + , 3011
895 + , update_every
896 + , RRDSET_TYPE_LINE
897 + );
898 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
899
900 rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -711,8 +914,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
914 if (likely(do_ip_errors)) {
915 st = rrdset_find_localhost("ipv4.errors");
916 if (unlikely(!st)) {
714 - st = rrdset_create_localhost("ipv4", "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s"
715 - , 3002, update_every, RRDSET_TYPE_LINE);
917 + st = rrdset_create_localhost(
918 + "ipv4"
919 + , "errors"
920 + , NULL
921 + , "errors"
922 + , NULL
923 + , "IPv4 Errors"
924 + , "packets/s"
925 + , "macos"
926 + , "sysctl"
927 + , 3002
928 + , update_every
929 + , RRDSET_TYPE_LINE
930 + );
931 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
932
933 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -756,8 +971,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
971 do_ip6_packets = CONFIG_BOOLEAN_YES;
972 st = rrdset_find_localhost("ipv6.packets");
973 if (unlikely(!st)) {
759 - st = rrdset_create_localhost("ipv6", "packets", NULL, "packets", NULL, "IPv6 Packets", "packets/s"
760 - , 3000, update_every, RRDSET_TYPE_LINE);
974 + st = rrdset_create_localhost(
975 + "ipv6"
976 + , "packets"
977 + , NULL
978 + , "packets"
979 + , NULL
980 + , "IPv6 Packets"
981 + , "packets/s"
982 + , "macos"
983 + , "sysctl"
984 + , 3000
985 + , update_every
986 + , RRDSET_TYPE_LINE
987 + );
988
989 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
990 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -781,8 +1008,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1008 do_ip6_fragsout = CONFIG_BOOLEAN_YES;
1009 st = rrdset_find_localhost("ipv6.fragsout");
1010 if (unlikely(!st)) {
784 - st = rrdset_create_localhost("ipv6", "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent"
785 - , "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
1011 + st = rrdset_create_localhost(
1012 + "ipv6"
1013 + , "fragsout"
1014 + , NULL
1015 + , "fragments"
1016 + , NULL
1017 + , "IPv6 Fragments Sent"
1018 + , "packets/s"
1019 + , "macos"
1020 + , "sysctl"
1021 + , 3010
1022 + , update_every
1023 + , RRDSET_TYPE_LINE
1024 + );
1025 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1026
1027 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -805,8 +1044,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1044 do_ip6_fragsin = CONFIG_BOOLEAN_YES;
1045 st = rrdset_find_localhost("ipv6.fragsin");
1046 if (unlikely(!st)) {
808 - st = rrdset_create_localhost("ipv6", "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly"
809 - , "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
1047 + st = rrdset_create_localhost(
1048 + "ipv6"
1049 + , "fragsin"
1050 + , NULL
1051 + , "fragments"
1052 + , NULL
1053 + , "IPv6 Fragments Reassembly"
1054 + , "packets/s"
1055 + , "macos"
1056 + , "sysctl"
1057 + , 3011
1058 + , update_every
1059 + , RRDSET_TYPE_LINE
1060 + );
1061 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1062
1063 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -838,8 +1089,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1089 do_ip6_errors = CONFIG_BOOLEAN_YES;
1090 st = rrdset_find_localhost("ipv6.errors");
1091 if (unlikely(!st)) {
841 - st = rrdset_create_localhost("ipv6", "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s"
842 - , 3002, update_every, RRDSET_TYPE_LINE);
1092 + st = rrdset_create_localhost(
1093 + "ipv6"
1094 + , "errors"
1095 + , NULL
1096 + , "errors"
1097 + , NULL
1098 + , "IPv6 Errors"
1099 + , "packets/s"
1100 + , "macos"
1101 + , "sysctl"
1102 + , 3002
1103 + , update_every
1104 + , RRDSET_TYPE_LINE
1105 + );
1106 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
1107
1108 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -885,8 +1148,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1148 do_icmp6 = CONFIG_BOOLEAN_YES;
1149 st = rrdset_find_localhost("ipv6.icmp");
1150 if (unlikely(!st)) {
888 - st = rrdset_create_localhost("ipv6", "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages", "messages/s"
889 - , 10000, update_every, RRDSET_TYPE_LINE);
1151 + st = rrdset_create_localhost(
1152 + "ipv6"
1153 + , "icmp"
1154 + , NULL
1155 + , "icmp"
1156 + , NULL
1157 + , "IPv6 ICMP Messages"
1158 + , "messages/s"
1159 + , "macos"
1160 + , "sysctl"
1161 + , 10000
1162 + , update_every
1163 + , RRDSET_TYPE_LINE
1164 + );
1165
1166 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1167 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -904,8 +1179,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1179 do_icmp6_redir = CONFIG_BOOLEAN_YES;
1180 st = rrdset_find_localhost("ipv6.icmpredir");
1181 if (unlikely(!st)) {
907 - st = rrdset_create_localhost("ipv6", "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects"
908 - , "redirects/s", 10050, update_every, RRDSET_TYPE_LINE);
1182 + st = rrdset_create_localhost(
1183 + "ipv6"
1184 + , "icmpredir"
1185 + , NULL
1186 + , "icmp"
1187 + , NULL
1188 + , "IPv6 ICMP Redirects"
1189 + , "redirects/s"
1190 + , "macos"
1191 + , "sysctl"
1192 + , 10050
1193 + , update_every
1194 + , RRDSET_TYPE_LINE
1195 + );
1196
1197 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1198 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -934,8 +1221,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1221 do_icmp6_errors = CONFIG_BOOLEAN_YES;
1222 st = rrdset_find_localhost("ipv6.icmperrors");
1223 if (unlikely(!st)) {
937 - st = rrdset_create_localhost("ipv6", "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors"
938 - , "errors/s", 10100, update_every, RRDSET_TYPE_LINE);
1224 + st = rrdset_create_localhost(
1225 + "ipv6"
1226 + , "icmperrors"
1227 + , NULL
1228 + , "icmp"
1229 + , NULL
1230 + , "IPv6 ICMP Errors"
1231 + , "errors/s"
1232 + , "macos"
1233 + , "sysctl"
1234 + , 10100
1235 + , update_every
1236 + , RRDSET_TYPE_LINE
1237 + );
1238
1239 rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1240 rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -974,8 +1273,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1273 do_icmp6_echos = CONFIG_BOOLEAN_YES;
1274 st = rrdset_find_localhost("ipv6.icmpechos");
1275 if (unlikely(!st)) {
977 - st = rrdset_create_localhost("ipv6", "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo", "messages/s"
978 - , 10200, update_every, RRDSET_TYPE_LINE);
1276 + st = rrdset_create_localhost(
1277 + "ipv6"
1278 + , "icmpechos"
1279 + , NULL
1280 + , "icmp"
1281 + , NULL
1282 + , "IPv6 ICMP Echo"
1283 + , "messages/s"
1284 + , "macos"
1285 + , "sysctl"
1286 + , 10200
1287 + , update_every
1288 + , RRDSET_TYPE_LINE
1289 + );
1290
1291 rrddim_add(st, "InEchos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1292 rrddim_add(st, "OutEchos", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1001,8 +1312,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1312 do_icmp6_router = CONFIG_BOOLEAN_YES;
1313 st = rrdset_find_localhost("ipv6.icmprouter");
1314 if (unlikely(!st)) {
1004 - st = rrdset_create_localhost("ipv6", "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages"
1005 - , "messages/s", 10400, update_every, RRDSET_TYPE_LINE);
1315 + st = rrdset_create_localhost(
1316 + "ipv6"
1317 + , "icmprouter"
1318 + , NULL
1319 + , "icmp"
1320 + , NULL
1321 + , "IPv6 Router Messages"
1322 + , "messages/s"
1323 + , "macos"
1324 + , "sysctl"
1325 + , 10400
1326 + , update_every
1327 + , RRDSET_TYPE_LINE
1328 + );
1329
1330 rrddim_add(st, "InSolicits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1331 rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1028,8 +1351,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1351 do_icmp6_neighbor = CONFIG_BOOLEAN_YES;
1352 st = rrdset_find_localhost("ipv6.icmpneighbor");
1353 if (unlikely(!st)) {
1031 - st = rrdset_create_localhost("ipv6", "icmpneighbor", NULL, "icmp", NULL, "IPv6 Neighbor Messages"
1032 - , "messages/s", 10500, update_every, RRDSET_TYPE_LINE);
1354 + st = rrdset_create_localhost(
1355 + "ipv6"
1356 + , "icmpneighbor"
1357 + , NULL
1358 + , "icmp"
1359 + , NULL
1360 + , "IPv6 Neighbor Messages"
1361 + , "messages/s"
1362 + , "macos"
1363 + , "sysctl"
1364 + , 10500
1365 + , update_every
1366 + , RRDSET_TYPE_LINE
1367 + );
1368
1369 rrddim_add(st, "InSolicits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1370 rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1061,8 +1396,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1396 do_icmp6_types = CONFIG_BOOLEAN_YES;
1397 st = rrdset_find_localhost("ipv6.icmptypes");
1398 if (unlikely(!st)) {
1064 - st = rrdset_create_localhost("ipv6", "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types"
1065 - , "messages/s", 10700, update_every, RRDSET_TYPE_LINE);
1399 + st = rrdset_create_localhost(
1400 + "ipv6"
1401 + , "icmptypes"
1402 + , NULL
1403 + , "icmp"
1404 + , NULL
1405 + , "IPv6 ICMP Types"
1406 + , "messages/s"
1407 + , "macos"
1408 + , "sysctl"
1409 + , 10700
1410 + , update_every
1411 + , RRDSET_TYPE_LINE
1412 + );
1413
1414 rrddim_add(st, "InType1", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1415 rrddim_add(st, "InType128", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1103,8 +1450,20 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1450 st = rrdset_find_localhost("system.uptime");
1451
1452 if(unlikely(!st)) {
1106 - st = rrdset_create_localhost("system", "uptime", NULL, "uptime", NULL, "System Uptime", "seconds", 1000
1107 - , update_every, RRDSET_TYPE_LINE);
1453 + st = rrdset_create_localhost(
1454 + "system"
1455 + , "uptime"
1456 + , NULL
1457 + , "uptime"
1458 + , NULL
1459 + , "System Uptime"
1460 + , "seconds"
1461 + , "macos"
1462 + , "sysctl"
1463 + , 1000
1464 + , update_every
1465 + , RRDSET_TYPE_LINE
1466 + );
1467 rrddim_add(st, "uptime", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1468 }
1469 else rrdset_next(st);
src/plugin_checks.c
+43 -6
@@ -16,18 +16,55 @@ void *checks_main(void *ptr) {
16
17 RRDSET *check1, *check2, *check3, *apps_cpu = NULL;
18
19 - check1 = rrdset_create_localhost("netdata", "check1", NULL, "netdata", NULL, "Caller gives microseconds"
20 - , "a million !", 99999, localhost->rrd_update_every, RRDSET_TYPE_LINE);
19 + check1 = rrdset_create_localhost(
20 + "netdata"
21 + , "check1"
22 + , NULL
23 + , "netdata"
24 + , NULL
25 + , "Caller gives microseconds"
26 + , "a million !"
27 + , "netdata"
28 + , "checks"
29 + , 99999
30 + , localhost->rrd_update_every
31 + , RRDSET_TYPE_LINE
32 + );
33 +
34 rrddim_add(check1, "absolute", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
35 rrddim_add(check1, "incremental", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
36
24 - check2 = rrdset_create_localhost("netdata", "check2", NULL, "netdata", NULL, "Netdata calcs microseconds"
25 - , "a million !", 99999, localhost->rrd_update_every, RRDSET_TYPE_LINE);
37 + check2 = rrdset_create_localhost(
38 + "netdata"
39 + , "check2"
40 + , NULL
41 + , "netdata"
42 + , NULL
43 + , "Netdata calcs microseconds"
44 + , "a million !"
45 + , "netdata"
46 + , "checks"
47 + , 99999
48 + , localhost->rrd_update_every
49 + , RRDSET_TYPE_LINE
50 + );
51 rrddim_add(check2, "absolute", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
52 rrddim_add(check2, "incremental", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
53
29 - check3 = rrdset_create_localhost("netdata", "checkdt", NULL, "netdata", NULL, "Clock difference"
30 - , "microseconds diff", 99999, localhost->rrd_update_every, RRDSET_TYPE_LINE);
54 + check3 = rrdset_create_localhost(
55 + "netdata"
56 + , "checkdt"
57 + , NULL
58 + , "netdata"
59 + , NULL
60 + , "Clock difference"
61 + , "microseconds diff"
62 + , "netdata"
63 + , "checks"
64 + , 99999
65 + , localhost->rrd_update_every
66 + , RRDSET_TYPE_LINE
67 + );
68 rrddim_add(check3, "caller", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
69 rrddim_add(check3, "netdata", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
70 rrddim_add(check3, "apps.plugin", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
src/plugin_freebsd.c
+14 -3
@@ -128,9 +128,20 @@ void *freebsd_main(void *ptr) {
128 st = rrdset_find_bytype_localhost("netdata", "plugin_freebsd_modules");
129
130 if(!st) {
131 - st = rrdset_create_localhost("netdata", "plugin_freebsd_modules", NULL, "freebsd", NULL
132 - , "NetData FreeBSD Plugin Modules Durations", "milliseconds/run", 132001
133 - , localhost->rrd_update_every, RRDSET_TYPE_STACKED);
131 + st = rrdset_create_localhost(
132 + "netdata"
133 + , "plugin_freebsd_modules"
134 + , NULL
135 + , "freebsd"
136 + , NULL
137 + , "NetData FreeBSD Plugin Modules Durations"
138 + , "milliseconds/run"
139 + , "netdata"
140 + , "stats"
141 + , 132001
142 + , localhost->rrd_update_every
143 + , RRDSET_TYPE_STACKED
144 + );
145
146 for(i = 0 ; freebsd_modules[i].name ;i++) {
147 struct freebsd_module *pm = &freebsd_modules[i];
src/plugin_idlejitter.c
+2
@@ -27,6 +27,8 @@ void *cpuidlejitter_main(void *ptr) {
27 , NULL
28 , "CPU Idle Jitter"
29 , "microseconds lost/s"
30 + , "idlejitter"
31 + , NULL
32 , 9999
33 , localhost->rrd_update_every
34 , RRDSET_TYPE_AREA
src/plugin_proc.c
+14 -3
@@ -118,9 +118,20 @@ void *proc_main(void *ptr) {
118 st = rrdset_find_bytype_localhost("netdata", "plugin_proc_modules");
119
120 if(!st) {
121 - st = rrdset_create_localhost("netdata", "plugin_proc_modules", NULL, "proc", NULL
122 - , "NetData Proc Plugin Modules Durations", "milliseconds/run", 132001
123 - , localhost->rrd_update_every, RRDSET_TYPE_STACKED);
121 + st = rrdset_create_localhost(
122 + "netdata"
123 + , "plugin_proc_modules"
124 + , NULL
125 + , "proc"
126 + , NULL
127 + , "NetData Proc Plugin Modules Durations"
128 + , "milliseconds/run"
129 + , "netdata"
130 + , "stats"
131 + , 132001
132 + , localhost->rrd_update_every
133 + , RRDSET_TYPE_STACKED
134 + );
135
136 for(i = 0 ; proc_modules[i].name ;i++) {
137 struct proc_module *pm = &proc_modules[i];
src/plugin_proc_diskspace.c
+8
@@ -257,6 +257,8 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
257 , "disk.space"
258 , title
259 , "GB"
260 + , "diskspace"
261 + , NULL
262 , 2023
263 , update_every
264 , RRDSET_TYPE_STACKED
@@ -295,6 +297,8 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
297 , "disk.inodes"
298 , title
299 , "Inodes"
300 + , "diskspace"
301 + , NULL
302 , 2024
303 , update_every
304 , RRDSET_TYPE_STACKED
@@ -401,6 +405,8 @@ void *proc_diskspace_main(void *ptr) {
405 , NULL
406 , "NetData Disk Space Plugin CPU usage"
407 , "milliseconds/s"
408 + , "diskspace"
409 + , NULL
410 , 132020
411 , update_every
412 , RRDSET_TYPE_STACKED
@@ -429,6 +435,8 @@ void *proc_diskspace_main(void *ptr) {
435 , NULL
436 , "NetData Disk Space Plugin Duration"
437 , "milliseconds/run"
438 + , "diskspace"
439 + , NULL
440 , 132021
441 , update_every
442 , RRDSET_TYPE_AREA
src/plugin_tc.c
+98 -26
@@ -374,11 +374,20 @@ static inline void tc_device_commit(struct tc_device *d) {
374 d->enabled_bytes = CONFIG_BOOLEAN_YES;
375
376 if(unlikely(!d->st_bytes))
377 - d->st_bytes = rrdset_create_localhost(RRD_TYPE_TC, d->id, d->name ? d->name : d->id
378 - , d->family ? d->family : d->id, RRD_TYPE_TC ".qos", "Class Usage"
379 - , "kilobits/s", 7000, localhost->rrd_update_every
380 - , d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE
381 - : RRDSET_TYPE_STACKED);
377 + d->st_bytes = rrdset_create_localhost(
378 + RRD_TYPE_TC
379 + , d->id
380 + , d->name ? d->name : d->id
381 + , d->family ? d->family : d->id
382 + , RRD_TYPE_TC ".qos"
383 + , "Class Usage"
384 + , "kilobits/s"
385 + , "tc"
386 + , NULL
387 + , 7000
388 + , localhost->rrd_update_every
389 + , d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE : RRDSET_TYPE_STACKED
390 + );
391
392 else {
393 rrdset_next(d->st_bytes);
@@ -413,10 +422,20 @@ static inline void tc_device_commit(struct tc_device *d) {
422 snprintfz(id, RRD_ID_LENGTH_MAX, "%s_packets", d->id);
423 snprintfz(name, RRD_ID_LENGTH_MAX, "%s_packets", d->name?d->name:d->id);
424
416 - d->st_packets = rrdset_create_localhost(RRD_TYPE_TC, id, name, d->family ? d->family : d->id
417 - , RRD_TYPE_TC ".qos_packets", "Class Packets", "packets/s", 7010
418 - , localhost->rrd_update_every, d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE
419 - : RRDSET_TYPE_STACKED);
425 + d->st_packets = rrdset_create_localhost(
426 + RRD_TYPE_TC
427 + , id
428 + , name
429 + , d->family ? d->family : d->id
430 + , RRD_TYPE_TC ".qos_packets"
431 + , "Class Packets"
432 + , "packets/s"
433 + , "tc"
434 + , NULL
435 + , 7010
436 + , localhost->rrd_update_every
437 + , d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE : RRDSET_TYPE_STACKED
438 + );
439 }
440 else {
441 rrdset_next(d->st_packets);
@@ -456,11 +475,20 @@ static inline void tc_device_commit(struct tc_device *d) {
475 snprintfz(id, RRD_ID_LENGTH_MAX, "%s_dropped", d->id);
476 snprintfz(name, RRD_ID_LENGTH_MAX, "%s_dropped", d->name?d->name:d->id);
477
459 - d->st_dropped = rrdset_create_localhost(RRD_TYPE_TC, id, name, d->family ? d->family : d->id
460 - , RRD_TYPE_TC ".qos_dropped", "Class Dropped Packets", "packets/s"
461 - , 7020, localhost->rrd_update_every
462 - , d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE
463 - : RRDSET_TYPE_STACKED);
478 + d->st_dropped = rrdset_create_localhost(
479 + RRD_TYPE_TC
480 + , id
481 + , name
482 + , d->family ? d->family : d->id
483 + , RRD_TYPE_TC ".qos_dropped"
484 + , "Class Dropped Packets"
485 + , "packets/s"
486 + , "tc"
487 + , NULL
488 + , 7020
489 + , localhost->rrd_update_every
490 + , d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE : RRDSET_TYPE_STACKED
491 + );
492 }
493 else {
494 rrdset_next(d->st_dropped);
@@ -500,9 +528,20 @@ static inline void tc_device_commit(struct tc_device *d) {
528 snprintfz(id, RRD_ID_LENGTH_MAX, "%s_tokens", d->id);
529 snprintfz(name, RRD_ID_LENGTH_MAX, "%s_tokens", d->name?d->name:d->id);
530
503 - d->st_tokens = rrdset_create_localhost(RRD_TYPE_TC, id, name, d->family ? d->family : d->id
504 - , RRD_TYPE_TC ".qos_tokens", "Class Tokens", "tokens", 7030
505 - , localhost->rrd_update_every, RRDSET_TYPE_LINE);
531 + d->st_tokens = rrdset_create_localhost(
532 + RRD_TYPE_TC
533 + , id
534 + , name
535 + , d->family ? d->family : d->id
536 + , RRD_TYPE_TC ".qos_tokens"
537 + , "Class Tokens"
538 + , "tokens"
539 + , "tc"
540 + , NULL
541 + , 7030
542 + , localhost->rrd_update_every
543 + , RRDSET_TYPE_LINE
544 + );
545 }
546 else {
547 rrdset_next(d->st_tokens);
@@ -543,9 +582,20 @@ static inline void tc_device_commit(struct tc_device *d) {
582 snprintfz(id, RRD_ID_LENGTH_MAX, "%s_ctokens", d->id);
583 snprintfz(name, RRD_ID_LENGTH_MAX, "%s_ctokens", d->name?d->name:d->id);
584
546 - d->st_ctokens = rrdset_create_localhost(RRD_TYPE_TC, id, name, d->family ? d->family : d->id
547 - , RRD_TYPE_TC ".qos_ctokens", "Class cTokens", "ctokens", 7040
548 - , localhost->rrd_update_every, RRDSET_TYPE_LINE);
585 + d->st_ctokens = rrdset_create_localhost(
586 + RRD_TYPE_TC
587 + , id
588 + , name
589 + , d->family ? d->family : d->id
590 + , RRD_TYPE_TC ".qos_ctokens"
591 + , "Class cTokens"
592 + , "ctokens"
593 + , "tc"
594 + , NULL
595 + , 7040
596 + , localhost->rrd_update_every
597 + , RRDSET_TYPE_LINE
598 + );
599 }
600 else {
601 debug(D_TC_LOOP, "TC: Updating _ctokens chart for device '%s'", d->name?d->name:d->id);
@@ -991,9 +1041,20 @@ void *tc_main(void *ptr) {
1041
1042 if(unlikely(!stcpu)) stcpu = rrdset_find_localhost("netdata.plugin_tc_cpu");
1043 if(unlikely(!stcpu)) {
994 - stcpu = rrdset_create_localhost("netdata", "plugin_tc_cpu", NULL, "tc.helper", NULL
995 - , "NetData TC CPU usage", "milliseconds/s", 135000, localhost->rrd_update_every
996 - , RRDSET_TYPE_STACKED);
1044 + stcpu = rrdset_create_localhost(
1045 + "netdata"
1046 + , "plugin_tc_cpu"
1047 + , NULL
1048 + , "tc.helper"
1049 + , NULL
1050 + , "NetData TC CPU usage"
1051 + , "milliseconds/s"
1052 + , "tc"
1053 + , NULL
1054 + , 135000
1055 + , localhost->rrd_update_every
1056 + , RRDSET_TYPE_STACKED
1057 + );
1058 rrddim_add(stcpu, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
1059 rrddim_add(stcpu, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
1060 }
@@ -1005,9 +1066,20 @@ void *tc_main(void *ptr) {
1066
1067 if(unlikely(!sttime)) sttime = rrdset_find_localhost("netdata.plugin_tc_time");
1068 if(unlikely(!sttime)) {
1008 - sttime = rrdset_create_localhost("netdata", "plugin_tc_time", NULL, "tc.helper", NULL
1009 - , "NetData TC script execution", "milliseconds/run", 135001
1010 - , localhost->rrd_update_every, RRDSET_TYPE_AREA);
1069 + sttime = rrdset_create_localhost(
1070 + "netdata"
1071 + , "plugin_tc_time"
1072 + , NULL
1073 + , "tc.helper"
1074 + , NULL
1075 + , "NetData TC script execution"
1076 + , "milliseconds/run"
1077 + , "tc"
1078 + , NULL
1079 + , 135001
1080 + , localhost->rrd_update_every
1081 + , RRDSET_TYPE_AREA
1082 + );
1083 rrddim_add(sttime, "run_time", "run time", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1084 }
1085 else rrdset_next(sttime);
src/plugins_d.c
+17 -1
@@ -229,6 +229,8 @@ inline size_t pluginsd_process(RRDHOST *host, struct plugind *cd, FILE *fp, int
229 char *priority_s = words[8];
230 char *update_every_s = words[9];
231 char *options = words[10];
232 + char *plugin = words[11];
233 + char *module = words[12];
234
235 // parse the id from type
236 char *id = NULL;
@@ -287,7 +289,21 @@ inline size_t pluginsd_process(RRDHOST *host, struct plugind *cd, FILE *fp, int
289 , update_every
290 );
291
290 - st = rrdset_create(host, type, id, name, family, context, title, units, priority, update_every, chart_type);
292 + st = rrdset_create(
293 + host
294 + , type
295 + , id
296 + , name
297 + , family
298 + , context
299 + , title
300 + , units
301 + , (plugin && *plugin)?plugin:cd->filename
302 + , module
303 + , priority
304 + , update_every
305 + , chart_type
306 + );
307 cd->update_every = update_every;
308 }
309 else debug(D_PLUGINSD, "PLUGINSD: Chart '%s' already exists. Not adding it again.", st->id);
src/proc_diskstats.c
+20
@@ -518,6 +518,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
518 , "disk.io"
519 , "Disk I/O Bandwidth"
520 , "kilobytes/s"
521 + , "proc"
522 + , "diskstats"
523 , 2000
524 , update_every
525 , RRDSET_TYPE_AREA
@@ -547,6 +549,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
549 , "disk.ops"
550 , "Disk Completed I/O Operations"
551 , "operations/s"
552 + , "proc"
553 + , "diskstats"
554 , 2001
555 , update_every
556 , RRDSET_TYPE_LINE
@@ -578,6 +582,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
582 , "disk.qops"
583 , "Disk Current I/O Operations"
584 , "operations"
585 + , "proc"
586 + , "diskstats"
587 , 2002
588 , update_every
589 , RRDSET_TYPE_LINE
@@ -607,6 +613,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
613 , "disk.backlog"
614 , "Disk Backlog"
615 , "backlog (ms)"
616 + , "proc"
617 + , "diskstats"
618 , 2003
619 , update_every
620 , RRDSET_TYPE_AREA
@@ -636,6 +644,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
644 , "disk.util"
645 , "Disk Utilization Time"
646 , "% of time working"
647 + , "proc"
648 + , "diskstats"
649 , 2004
650 , update_every
651 , RRDSET_TYPE_AREA
@@ -665,6 +675,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
675 , "disk.mops"
676 , "Disk Merged Operations"
677 , "merged operations/s"
678 + , "proc"
679 + , "diskstats"
680 , 2021
681 , update_every
682 , RRDSET_TYPE_LINE
@@ -696,6 +708,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
708 , "disk.iotime"
709 , "Disk Total I/O Time"
710 , "milliseconds/s"
711 + , "proc"
712 + , "diskstats"
713 , 2022
714 , update_every
715 , RRDSET_TYPE_LINE
@@ -730,6 +744,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
744 , "disk.await"
745 , "Average Completed I/O Operation Time"
746 , "ms per operation"
747 + , "proc"
748 + , "diskstats"
749 , 2005
750 , update_every
751 , RRDSET_TYPE_LINE
@@ -759,6 +775,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
775 , "disk.avgsz"
776 , "Average Completed I/O Operation Bandwidth"
777 , "kilobytes per operation"
778 + , "proc"
779 + , "diskstats"
780 , 2006
781 , update_every
782 , RRDSET_TYPE_AREA
@@ -788,6 +806,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
806 , "disk.svctm"
807 , "Average Service Time"
808 , "ms per operation"
809 + , "proc"
810 + , "diskstats"
811 , 2007
812 , update_every
813 , RRDSET_TYPE_LINE
src/proc_interrupts.c
+4
@@ -154,6 +154,8 @@ int do_proc_interrupts(int update_every, usec_t dt) {
154 , NULL
155 , "System interrupts"
156 , "interrupts/s"
157 + , "proc"
158 + , "interrupts"
159 , 1000
160 , update_every
161 , RRDSET_TYPE_STACKED
@@ -217,6 +219,8 @@ int do_proc_interrupts(int update_every, usec_t dt) {
219 , "cpu.interrupts"
220 , title
221 , "interrupts/s"
222 + , "proc"
223 + , "interrupts"
224 , 1100 + c
225 , update_every
226 , RRDSET_TYPE_STACKED
src/proc_loadavg.c
+4
@@ -60,6 +60,8 @@ int do_proc_loadavg(int update_every, usec_t dt) {
60 , NULL
61 , "System Load Average"
62 , "load"
63 + , "proc"
64 + , "loadavg"
65 , 100
66 , (update_every < MIN_LOADAVG_UPDATE_EVERY) ? MIN_LOADAVG_UPDATE_EVERY : update_every
67 , RRDSET_TYPE_LINE
@@ -98,6 +100,8 @@ int do_proc_loadavg(int update_every, usec_t dt) {
100 , NULL
101 , "System Active Processes"
102 , "processes"
103 + , "proc"
104 + , "loadavg"
105 , 750
106 , update_every
107 , RRDSET_TYPE_LINE
src/proc_meminfo.c
+14
@@ -150,6 +150,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
150 , NULL
151 , "System RAM"
152 , "MB"
153 + , "proc"
154 + , "meminfo"
155 , 200
156 , update_every
157 , RRDSET_TYPE_STACKED
@@ -189,6 +191,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
191 , NULL
192 , "System Swap"
193 , "MB"
194 + , "proc"
195 + , "meminfo"
196 , 201
197 , update_every
198 , RRDSET_TYPE_STACKED
@@ -224,6 +228,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
228 , NULL
229 , "Corrupted Memory, detected by ECC"
230 , "MB"
231 + , "proc"
232 + , "meminfo"
233 , 9000
234 , update_every
235 , RRDSET_TYPE_LINE
@@ -255,6 +261,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
261 , NULL
262 , "Committed (Allocated) Memory"
263 , "MB"
264 + , "proc"
265 + , "meminfo"
266 , 5000
267 , update_every
268 , RRDSET_TYPE_AREA
@@ -286,6 +294,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
294 , NULL
295 , "Writeback Memory"
296 , "MB"
297 + , "proc"
298 + , "meminfo"
299 , 4000
300 , update_every
301 , RRDSET_TYPE_LINE
@@ -324,6 +334,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
334 , NULL
335 , "Memory Used by Kernel"
336 , "MB"
337 + , "proc"
338 + , "meminfo"
339 , 6000
340 , update_every
341 , RRDSET_TYPE_STACKED
@@ -361,6 +373,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
373 , NULL
374 , "Reclaimable Kernel Memory"
375 , "MB"
376 + , "proc"
377 + , "meminfo"
378 , 6500
379 , update_every
380 , RRDSET_TYPE_STACKED
src/proc_net_dev.c
+14
@@ -551,6 +551,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
551 , "net.net"
552 , "Bandwidth"
553 , "kilobits/s"
554 + , "proc"
555 + , "net/dev"
556 , d->priority
557 , update_every
558 , RRDSET_TYPE_AREA
@@ -590,6 +592,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
592 , "net.packets"
593 , "Packets"
594 , "packets/s"
595 + , "proc"
596 + , "net/dev"
597 , d->priority + 1
598 , update_every
599 , RRDSET_TYPE_LINE
@@ -633,6 +637,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
637 , "net.errors"
638 , "Interface Errors"
639 , "errors/s"
640 + , "proc"
641 + , "net/dev"
642 , d->priority + 2
643 , update_every
644 , RRDSET_TYPE_LINE
@@ -674,6 +680,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
680 , "net.drops"
681 , "Interface Drops"
682 , "drops/s"
683 + , "proc"
684 + , "net/dev"
685 , d->priority + 3
686 , update_every
687 , RRDSET_TYPE_LINE
@@ -715,6 +723,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
723 , "net.fifo"
724 , "Interface FIFO Buffer Errors"
725 , "errors"
726 + , "proc"
727 + , "net/dev"
728 , d->priority + 4
729 , update_every
730 , RRDSET_TYPE_LINE
@@ -756,6 +766,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
766 , "net.compressed"
767 , "Compressed Packets"
768 , "packets/s"
769 + , "proc"
770 + , "net/dev"
771 , d->priority + 5
772 , update_every
773 , RRDSET_TYPE_LINE
@@ -797,6 +809,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
809 , "net.events"
810 , "Network Interface Events"
811 , "events/s"
812 + , "proc"
813 + , "net/dev"
814 , d->priority + 6
815 , update_every
816 , RRDSET_TYPE_LINE
src/proc_net_ip_vs_stats.c
+42 -7
@@ -42,9 +42,20 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
42 if(do_sockets) {
43 st = rrdset_find_localhost(RRD_TYPE_NET_IPVS ".sockets");
44 if(!st) {
45 - st = rrdset_create_localhost(RRD_TYPE_NET_IPVS, "sockets", NULL, RRD_TYPE_NET_IPVS, NULL
46 - , "IPVS New Connections", "connections/s", 3101, update_every
47 - , RRDSET_TYPE_LINE);
45 + st = rrdset_create_localhost(
46 + RRD_TYPE_NET_IPVS
47 + , "sockets"
48 + , NULL
49 + , RRD_TYPE_NET_IPVS
50 + , NULL
51 + , "IPVS New Connections"
52 + , "connections/s"
53 + , "proc"
54 + , "net/ip_vs_stats"
55 + , 3101
56 + , update_every
57 + , RRDSET_TYPE_LINE
58 + );
59
60 rrddim_add(st, "connections", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
61 }
@@ -59,8 +70,20 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
70 if(do_packets) {
71 st = rrdset_find_localhost(RRD_TYPE_NET_IPVS ".packets");
72 if(!st) {
62 - st = rrdset_create_localhost(RRD_TYPE_NET_IPVS, "packets", NULL, RRD_TYPE_NET_IPVS, NULL, "IPVS Packets"
63 - , "packets/s", 3102, update_every, RRDSET_TYPE_LINE);
73 + st = rrdset_create_localhost(
74 + RRD_TYPE_NET_IPVS
75 + , "packets"
76 + , NULL
77 + , RRD_TYPE_NET_IPVS
78 + , NULL
79 + , "IPVS Packets"
80 + , "packets/s"
81 + , "proc"
82 + , "net/ip_vs_stats"
83 + , 3102
84 + , update_every
85 + , RRDSET_TYPE_LINE
86 + );
87
88 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
89 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -77,8 +100,20 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
100 if(do_bandwidth) {
101 st = rrdset_find_localhost(RRD_TYPE_NET_IPVS ".net");
102 if(!st) {
80 - st = rrdset_create_localhost(RRD_TYPE_NET_IPVS, "net", NULL, RRD_TYPE_NET_IPVS, NULL, "IPVS Bandwidth"
81 - , "kilobits/s", 3100, update_every, RRDSET_TYPE_AREA);
103 + st = rrdset_create_localhost(
104 + RRD_TYPE_NET_IPVS
105 + , "net"
106 + , NULL
107 + , RRD_TYPE_NET_IPVS
108 + , NULL
109 + , "IPVS Bandwidth"
110 + , "kilobits/s"
111 + , "proc"
112 + , "net/ip_vs_stats"
113 + , 3100
114 + , update_every
115 + , RRDSET_TYPE_AREA
116 + );
117
118 rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
119 rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_netstat.c
+26
@@ -260,6 +260,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
260 , NULL
261 , "IPv4 Bandwidth"
262 , "kilobits/s"
263 + , "proc"
264 + , "net/netstat"
265 , 500
266 , update_every
267 , RRDSET_TYPE_AREA
@@ -293,6 +295,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
295 , NULL
296 , "IPv4 Input Errors"
297 , "packets/s"
298 + , "proc"
299 + , "net/netstat"
300 , 4000
301 , update_every
302 , RRDSET_TYPE_LINE
@@ -330,6 +334,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
334 , NULL
335 , "IPv4 Multicast Bandwidth"
336 , "kilobits/s"
337 + , "proc"
338 + , "net/netstat"
339 , 9000
340 , update_every
341 , RRDSET_TYPE_AREA
@@ -366,6 +372,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
372 , NULL
373 , "IPv4 Broadcast Bandwidth"
374 , "kilobits/s"
375 + , "proc"
376 + , "net/netstat"
377 , 8000
378 , update_every
379 , RRDSET_TYPE_AREA
@@ -402,6 +410,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
410 , NULL
411 , "IPv4 Multicast Packets"
412 , "packets/s"
413 + , "proc"
414 + , "net/netstat"
415 , 8600
416 , update_every
417 , RRDSET_TYPE_LINE
@@ -437,6 +447,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
447 , NULL
448 , "IPv4 Broadcast Packets"
449 , "packets/s"
450 + , "proc"
451 + , "net/netstat"
452 , 8500
453 , update_every
454 , RRDSET_TYPE_LINE
@@ -473,6 +485,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
485 , NULL
486 , "IPv4 ECN Statistics"
487 , "packets/s"
488 + , "proc"
489 + , "net/netstat"
490 , 8700
491 , update_every
492 , RRDSET_TYPE_LINE
@@ -523,6 +537,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
537 , NULL
538 , "TCP Memory Pressures"
539 , "events/s"
540 + , "proc"
541 + , "net/netstat"
542 , 3000
543 , update_every
544 , RRDSET_TYPE_LINE
@@ -555,6 +571,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
571 , NULL
572 , "TCP Connection Aborts"
573 , "connections/s"
574 + , "proc"
575 + , "net/netstat"
576 , 3010
577 , update_every
578 , RRDSET_TYPE_LINE
@@ -597,6 +615,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
615 , NULL
616 , "TCP Reordered Packets by Detection Method"
617 , "packets/s"
618 + , "proc"
619 + , "net/netstat"
620 , 3020
621 , update_every
622 , RRDSET_TYPE_LINE
@@ -636,6 +656,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
656 , NULL
657 , "TCP Out-Of-Order Queue"
658 , "packets/s"
659 + , "proc"
660 + , "net/netstat"
661 , 3050
662 , update_every
663 , RRDSET_TYPE_LINE
@@ -675,6 +697,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
697 , NULL
698 , "TCP SYN Cookies"
699 , "packets/s"
700 + , "proc"
701 + , "net/netstat"
702 , 3100
703 , update_every
704 , RRDSET_TYPE_LINE
@@ -712,6 +736,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
736 , NULL
737 , "TCP Listen Socket Issues"
738 , "packets/s"
739 + , "proc"
740 + , "net/netstat"
741 , 3015
742 , update_every
743 , RRDSET_TYPE_LINE
src/proc_net_rpc_nfs.c
+71 -10
@@ -271,8 +271,21 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
271 if(do_net == 2) {
272 st = rrdset_find_bytype_localhost("nfs", "net");
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);
274 + st = rrdset_create_localhost(
275 + "nfs"
276 + , "net"
277 + , NULL
278 + , "network"
279 + , NULL
280 + , "NFS Client Network"
281 + , "operations/s"
282 + , "proc"
283 + , "net/rpc/nfs"
284 + , 5007
285 + , update_every
286 + , RRDSET_TYPE_STACKED
287 + );
288 +
289 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
290
291 rrddim_add(st, "udp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -294,8 +307,20 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
307 if(do_rpc == 2) {
308 st = rrdset_find_bytype_localhost("nfs", "rpc");
309 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);
310 + st = rrdset_create_localhost(
311 + "nfs"
312 + , "rpc"
313 + , NULL
314 + , "rpc"
315 + , NULL
316 + , "NFS Client Remote Procedure Calls Statistics"
317 + , "calls/s"
318 + , "proc"
319 + , "net/rpc/nfs"
320 + , 5008
321 + , update_every
322 + , RRDSET_TYPE_LINE
323 + );
324 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
325
326 rrddim_add(st, "calls", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -316,8 +341,20 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
341 unsigned int i;
342 st = rrdset_find_bytype_localhost("nfs", "proc2");
343 if(!st) {
319 - st = rrdset_create_localhost("nfs", "proc2", NULL, "nfsv2rpc", NULL, "NFS v2 Client Remote Procedure Calls"
320 - , "calls/s", 5009, update_every, RRDSET_TYPE_STACKED);
344 + st = rrdset_create_localhost(
345 + "nfs"
346 + , "proc2"
347 + , NULL
348 + , "nfsv2rpc"
349 + , NULL
350 + , "NFS v2 Client Remote Procedure Calls"
351 + , "calls/s"
352 + , "proc"
353 + , "net/rpc/nfs"
354 + , 5009
355 + , update_every
356 + , RRDSET_TYPE_STACKED
357 + );
358
359 for(i = 0; nfs_proc2_values[i].present ; i++)
360 rrddim_add(st, nfs_proc2_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -336,8 +373,20 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
373 unsigned int i;
374 st = rrdset_find_bytype_localhost("nfs", "proc3");
375 if(!st) {
339 - st = rrdset_create_localhost("nfs", "proc3", NULL, "nfsv3rpc", NULL, "NFS v3 Client Remote Procedure Calls"
340 - , "calls/s", 5010, update_every, RRDSET_TYPE_STACKED);
376 + st = rrdset_create_localhost(
377 + "nfs"
378 + , "proc3"
379 + , NULL
380 + , "nfsv3rpc"
381 + , NULL
382 + , "NFS v3 Client Remote Procedure Calls"
383 + , "calls/s"
384 + , "proc"
385 + , "net/rpc/nfs"
386 + , 5010
387 + , update_every
388 + , RRDSET_TYPE_STACKED
389 + );
390
391 for(i = 0; nfs_proc3_values[i].present ; i++)
392 rrddim_add(st, nfs_proc3_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -356,8 +405,20 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
405 unsigned int i;
406 st = rrdset_find_bytype_localhost("nfs", "proc4");
407 if(!st) {
359 - st = rrdset_create_localhost("nfs", "proc4", NULL, "nfsv4rpc", NULL, "NFS v4 Client Remote Procedure Calls"
360 - , "calls/s", 5011, update_every, RRDSET_TYPE_STACKED);
408 + st = rrdset_create_localhost(
409 + "nfs"
410 + , "proc4"
411 + , NULL
412 + , "nfsv4rpc"
413 + , NULL
414 + , "NFS v4 Client Remote Procedure Calls"
415 + , "calls/s"
416 + , "proc"
417 + , "net/rpc/nfs"
418 + , 5011
419 + , update_every
420 + , RRDSET_TYPE_STACKED
421 + );
422
423 for(i = 0; nfs_proc4_values[i].present ; i++)
424 rrddim_add(st, nfs_proc4_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_rpc_nfsd.c
+182 -29
@@ -494,8 +494,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
494 if(do_rc == 2) {
495 st = rrdset_find_bytype_localhost("nfsd", "readcache");
496 if(!st) {
497 - st = rrdset_create_localhost("nfsd", "readcache", NULL, "cache", NULL, "NFS Server Read Cache", "reads/s"
498 - , 5000, update_every, RRDSET_TYPE_STACKED);
497 + st = rrdset_create_localhost(
498 + "nfsd"
499 + , "readcache"
500 + , NULL
501 + , "cache"
502 + , NULL
503 + , "NFS Server Read Cache"
504 + , "reads/s"
505 + , "proc"
506 + , "net/rpc/nfsd"
507 + , 5000
508 + , update_every
509 + , RRDSET_TYPE_STACKED
510 + );
511
512 rrddim_add(st, "hits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
513 rrddim_add(st, "misses", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -514,8 +526,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
526 if(do_fh == 2) {
527 st = rrdset_find_bytype_localhost("nfsd", "filehandles");
528 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);
529 + st = rrdset_create_localhost(
530 + "nfsd"
531 + , "filehandles"
532 + , NULL
533 + , "filehandles"
534 + , NULL
535 + , "NFS Server File Handles"
536 + , "handles/s"
537 + , "proc"
538 + , "net/rpc/nfsd"
539 + , 5001
540 + , update_every
541 + , RRDSET_TYPE_LINE
542 + );
543 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
544
545 rrddim_add(st, "stale", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -539,8 +563,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
563 if(do_io == 2) {
564 st = rrdset_find_bytype_localhost("nfsd", "io");
565 if(!st) {
542 - st = rrdset_create_localhost("nfsd", "io", NULL, "io", NULL, "NFS Server I/O", "kilobytes/s", 5002
543 - , update_every, RRDSET_TYPE_AREA);
566 + st = rrdset_create_localhost(
567 + "nfsd"
568 + , "io"
569 + , NULL
570 + , "io"
571 + , NULL
572 + , "NFS Server I/O"
573 + , "kilobytes/s"
574 + , "proc"
575 + , "net/rpc/nfsd"
576 + , 5002
577 + , update_every
578 + , RRDSET_TYPE_AREA
579 + );
580
581 rrddim_add(st, "read", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
582 rrddim_add(st, "write", NULL, -1, 1000, RRD_ALGORITHM_INCREMENTAL);
@@ -557,8 +593,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
593 if(do_th == 2) {
594 st = rrdset_find_bytype_localhost("nfsd", "threads");
595 if(!st) {
560 - st = rrdset_create_localhost("nfsd", "threads", NULL, "threads", NULL, "NFS Server Threads", "threads", 5003
561 - , update_every, RRDSET_TYPE_LINE);
596 + st = rrdset_create_localhost(
597 + "nfsd"
598 + , "threads"
599 + , NULL
600 + , "threads"
601 + , NULL
602 + , "NFS Server Threads"
603 + , "threads"
604 + , "proc"
605 + , "net/rpc/nfsd"
606 + , 5003
607 + , update_every
608 + , RRDSET_TYPE_LINE
609 + );
610
611 rrddim_add(st, "threads", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
612 }
@@ -569,9 +617,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
617
618 st = rrdset_find_bytype_localhost("nfsd", "threads_fullcnt");
619 if(!st) {
572 - st = rrdset_create_localhost("nfsd", "threads_fullcnt", NULL, "threads", NULL
573 - , "NFS Server Threads Full Count", "ops/s", 5004, update_every
574 - , RRDSET_TYPE_LINE);
620 + st = rrdset_create_localhost(
621 + "nfsd"
622 + , "threads_fullcnt"
623 + , NULL
624 + , "threads"
625 + , NULL
626 + , "NFS Server Threads Full Count"
627 + , "ops/s"
628 + , "proc"
629 + , "net/rpc/nfsd"
630 + , 5004
631 + , update_every
632 + , RRDSET_TYPE_LINE
633 + );
634
635 rrddim_add(st, "full_count", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
636 }
@@ -582,9 +641,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
641
642 st = rrdset_find_bytype_localhost("nfsd", "threads_histogram");
643 if(!st) {
585 - st = rrdset_create_localhost("nfsd", "threads_histogram", NULL, "threads", NULL
586 - , "NFS Server Threads Usage Histogram", "percentage", 5005, update_every
587 - , RRDSET_TYPE_LINE);
644 + st = rrdset_create_localhost(
645 + "nfsd"
646 + , "threads_histogram"
647 + , NULL
648 + , "threads"
649 + , NULL
650 + , "NFS Server Threads Usage Histogram"
651 + , "percentage"
652 + , "proc"
653 + , "net/rpc/nfsd"
654 + , 5005
655 + , update_every
656 + , RRDSET_TYPE_LINE
657 + );
658
659 rrddim_add(st, "0%-10%", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
660 rrddim_add(st, "10%-20%", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
@@ -617,8 +687,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
687 if(do_ra == 2) {
688 st = rrdset_find_bytype_localhost("nfsd", "readahead");
689 if(!st) {
620 - st = rrdset_create_localhost("nfsd", "readahead", NULL, "readahead", NULL, "NFS Server Read Ahead Depth"
621 - , "percentage", 5005, update_every, RRDSET_TYPE_STACKED);
690 + st = rrdset_create_localhost(
691 + "nfsd"
692 + , "readahead"
693 + , NULL
694 + , "readahead"
695 + , NULL
696 + , "NFS Server Read Ahead Depth"
697 + , "percentage"
698 + , "proc"
699 + , "net/rpc/nfsd"
700 + , 5005
701 + , update_every
702 + , RRDSET_TYPE_STACKED
703 + );
704
705 rrddim_add(st, "10%", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
706 rrddim_add(st, "20%", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
@@ -656,8 +738,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
738 if(do_net == 2) {
739 st = rrdset_find_bytype_localhost("nfsd", "net");
740 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);
741 + st = rrdset_create_localhost(
742 + "nfsd"
743 + , "net"
744 + , NULL
745 + , "network"
746 + , NULL
747 + , "NFS Server Network Statistics"
748 + , "packets/s"
749 + , "proc"
750 + , "net/rpc/nfsd"
751 + , 5007
752 + , update_every
753 + , RRDSET_TYPE_STACKED
754 + );
755 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
756
757 rrddim_add(st, "udp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -679,9 +773,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
773 if(do_rpc == 2) {
774 st = rrdset_find_bytype_localhost("nfsd", "rpc");
775 if(!st) {
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);
776 + st = rrdset_create_localhost(
777 + "nfsd"
778 + , "rpc"
779 + , NULL
780 + , "rpc"
781 + , NULL
782 + , "NFS Server Remote Procedure Calls Statistics"
783 + , "calls/s"
784 + , "proc"
785 + , "net/rpc/nfsd"
786 + , 5008
787 + , update_every
788 + , RRDSET_TYPE_LINE
789 + );
790 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
791
792 rrddim_add(st, "calls", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -705,8 +810,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
810 unsigned int i;
811 st = rrdset_find_bytype_localhost("nfsd", "proc2");
812 if(!st) {
708 - st = rrdset_create_localhost("nfsd", "proc2", NULL, "nfsv2rpc", NULL, "NFS v2 Server Remote Procedure Calls"
709 - , "calls/s", 5009, update_every, RRDSET_TYPE_STACKED);
813 + st = rrdset_create_localhost(
814 + "nfsd"
815 + , "proc2"
816 + , NULL
817 + , "nfsv2rpc"
818 + , NULL
819 + , "NFS v2 Server Remote Procedure Calls"
820 + , "calls/s"
821 + , "proc"
822 + , "net/rpc/nfsd"
823 + , 5009
824 + , update_every
825 + , RRDSET_TYPE_STACKED
826 + );
827
828 for(i = 0; nfsd_proc2_values[i].present ; i++)
829 rrddim_add(st, nfsd_proc2_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -725,8 +842,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
842 unsigned int i;
843 st = rrdset_find_bytype_localhost("nfsd", "proc3");
844 if(!st) {
728 - st = rrdset_create_localhost("nfsd", "proc3", NULL, "nfsv3rpc", NULL, "NFS v3 Server Remote Procedure Calls"
729 - , "calls/s", 5010, update_every, RRDSET_TYPE_STACKED);
845 + st = rrdset_create_localhost(
846 + "nfsd"
847 + , "proc3"
848 + , NULL
849 + , "nfsv3rpc"
850 + , NULL
851 + , "NFS v3 Server Remote Procedure Calls"
852 + , "calls/s"
853 + , "proc"
854 + , "net/rpc/nfsd"
855 + , 5010
856 + , update_every
857 + , RRDSET_TYPE_STACKED
858 + );
859
860 for(i = 0; nfsd_proc3_values[i].present ; i++)
861 rrddim_add(st, nfsd_proc3_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -745,8 +874,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
874 unsigned int i;
875 st = rrdset_find_bytype_localhost("nfsd", "proc4");
876 if(!st) {
748 - st = rrdset_create_localhost("nfsd", "proc4", NULL, "nfsv4rpc", NULL, "NFS v4 Server Remote Procedure Calls"
749 - , "calls/s", 5011, update_every, RRDSET_TYPE_STACKED);
877 + st = rrdset_create_localhost(
878 + "nfsd"
879 + , "proc4"
880 + , NULL
881 + , "nfsv4rpc"
882 + , NULL
883 + , "NFS v4 Server Remote Procedure Calls"
884 + , "calls/s"
885 + , "proc"
886 + , "net/rpc/nfsd"
887 + , 5011
888 + , update_every
889 + , RRDSET_TYPE_STACKED
890 + );
891
892 for(i = 0; nfsd_proc4_values[i].present ; i++)
893 rrddim_add(st, nfsd_proc4_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -765,8 +906,20 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
906 unsigned int i;
907 st = rrdset_find_bytype_localhost("nfsd", "proc4ops");
908 if(!st) {
768 - st = rrdset_create_localhost("nfsd", "proc4ops", NULL, "nfsv2ops", NULL, "NFS v4 Server Operations"
769 - , "operations/s", 5012, update_every, RRDSET_TYPE_STACKED);
909 + st = rrdset_create_localhost(
910 + "nfsd"
911 + , "proc4ops"
912 + , NULL
913 + , "nfsv2ops"
914 + , NULL
915 + , "NFS v4 Server Operations"
916 + , "operations/s"
917 + , "proc"
918 + , "net/rpc/nfsd"
919 + , 5012
920 + , update_every
921 + , RRDSET_TYPE_STACKED
922 + );
923
924 for(i = 0; nfsd4_ops_values[i].present ; i++)
925 rrddim_add(st, nfsd4_ops_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_snmp.c
+197 -33
@@ -394,8 +394,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
394 if(do_ip_packets) {
395 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".packets");
396 if(!st) {
397 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "packets", NULL, "packets", NULL, "IPv4 Packets"
398 - , "packets/s", 3000, update_every, RRDSET_TYPE_LINE);
397 + st = rrdset_create_localhost(
398 + RRD_TYPE_NET_SNMP
399 + , "packets"
400 + , NULL
401 + , "packets"
402 + , NULL
403 + , "IPv4 Packets"
404 + , "packets/s"
405 + , "proc"
406 + , "net/snmp"
407 + , 3000
408 + , update_every
409 + , RRDSET_TYPE_LINE
410 + );
411
412 rrddim_add(st, "InReceives", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
413 rrddim_add(st, "OutRequests", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -416,9 +428,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
428 if(do_ip_fragsout) {
429 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".fragsout");
430 if(!st) {
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);
431 + st = rrdset_create_localhost(
432 + RRD_TYPE_NET_SNMP
433 + , "fragsout"
434 + , NULL
435 + , "fragments"
436 + , NULL
437 + , "IPv4 Fragments Sent"
438 + , "packets/s"
439 + , "proc"
440 + , "net/snmp"
441 + , 3010
442 + , update_every
443 + , RRDSET_TYPE_LINE
444 + );
445 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
446
447 rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -438,9 +461,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
461 if(do_ip_fragsin) {
462 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".fragsin");
463 if(!st) {
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);
464 + st = rrdset_create_localhost(
465 + RRD_TYPE_NET_SNMP
466 + , "fragsin"
467 + , NULL
468 + , "fragments"
469 + , NULL
470 + , "IPv4 Fragments Reassembly"
471 + , "packets/s"
472 + , "proc"
473 + , "net/snmp"
474 + , 3011
475 + , update_every
476 + , RRDSET_TYPE_LINE
477 + );
478 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
479
480 rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -460,8 +494,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
494 if(do_ip_errors) {
495 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".errors");
496 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);
497 + st = rrdset_create_localhost(
498 + RRD_TYPE_NET_SNMP
499 + , "errors"
500 + , NULL
501 + , "errors"
502 + , NULL
503 + , "IPv4 Errors"
504 + , "packets/s"
505 + , "proc"
506 + , "net/snmp"
507 + , 3002
508 + , update_every
509 + , RRDSET_TYPE_LINE
510 + );
511 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
512
513 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -505,8 +551,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
551 if(do_icmp_packets) {
552 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".icmp");
553 if(!st) {
508 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "icmp", NULL, "icmp", NULL, "IPv4 ICMP Packets"
509 - , "packets/s", 2602, update_every, RRDSET_TYPE_LINE);
554 + st = rrdset_create_localhost(
555 + RRD_TYPE_NET_SNMP
556 + , "icmp"
557 + , NULL
558 + , "icmp"
559 + , NULL
560 + , "IPv4 ICMP Packets"
561 + , "packets/s"
562 + , "proc"
563 + , "net/snmp"
564 + , 2602
565 + , update_every
566 + , RRDSET_TYPE_LINE
567 + );
568
569 rrddim_add(st, "InMsgs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
570 rrddim_add(st, "OutMsgs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -520,9 +578,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
578
579 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".icmp_errors");
580 if(!st) {
523 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "icmp_errors", NULL, "icmp", NULL
524 - , "IPv4 ICMP Errors", "packets/s", 2603, update_every
525 - , RRDSET_TYPE_LINE);
581 + st = rrdset_create_localhost(
582 + RRD_TYPE_NET_SNMP
583 + , "icmp_errors"
584 + , NULL
585 + , "icmp"
586 + , NULL
587 + , "IPv4 ICMP Errors"
588 + , "packets/s"
589 + , "proc"
590 + , "net/snmp"
591 + , 2603
592 + , update_every
593 + , RRDSET_TYPE_LINE
594 + );
595
596 rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
597 rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -554,8 +623,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
623
624 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".icmpmsg");
625 if(!st) {
557 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messages"
558 - , "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
626 + st = rrdset_create_localhost(
627 + RRD_TYPE_NET_SNMP
628 + , "icmpmsg"
629 + , NULL
630 + , "icmp"
631 + , NULL
632 + , "IPv4 ICMP Messages"
633 + , "packets/s"
634 + , "proc"
635 + , "net/snmp"
636 + , 2604
637 + , update_every
638 + , RRDSET_TYPE_LINE
639 + );
640
641 for(i = 0; icmpmsg_data[i].name ;i++)
642 rrddim_add(st, icmpmsg_data[i].name, icmpmsg_data[i].label, icmpmsg_data[i].multiplier, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -590,8 +671,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
671 if(do_tcp_sockets) {
672 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".tcpsock");
673 if(!st) {
593 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "tcpsock", NULL, "tcp", NULL, "IPv4 TCP Connections"
594 - , "active connections", 2500, update_every, RRDSET_TYPE_LINE);
674 + st = rrdset_create_localhost(
675 + RRD_TYPE_NET_SNMP
676 + , "tcpsock"
677 + , NULL
678 + , "tcp"
679 + , NULL
680 + , "IPv4 TCP Connections"
681 + , "active connections"
682 + , "proc"
683 + , "net/snmp"
684 + , 2500
685 + , update_every
686 + , RRDSET_TYPE_LINE
687 + );
688
689 rrddim_add(st, "CurrEstab", "connections", 1, 1, RRD_ALGORITHM_ABSOLUTE);
690 }
@@ -606,8 +699,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
699 if(do_tcp_packets) {
700 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".tcppackets");
701 if(!st) {
609 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "tcppackets", NULL, "tcp", NULL, "IPv4 TCP Packets"
610 - , "packets/s", 2600, update_every, RRDSET_TYPE_LINE);
702 + st = rrdset_create_localhost(
703 + RRD_TYPE_NET_SNMP
704 + , "tcppackets"
705 + , NULL
706 + , "tcp"
707 + , NULL
708 + , "IPv4 TCP Packets"
709 + , "packets/s"
710 + , "proc"
711 + , "net/snmp"
712 + , 2600
713 + , update_every
714 + , RRDSET_TYPE_LINE
715 + );
716
717 rrddim_add(st, "InSegs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
718 rrddim_add(st, "OutSegs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -624,8 +729,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
729 if(do_tcp_errors) {
730 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".tcperrors");
731 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);
732 + st = rrdset_create_localhost(
733 + RRD_TYPE_NET_SNMP
734 + , "tcperrors"
735 + , NULL
736 + , "tcp"
737 + , NULL
738 + , "IPv4 TCP Errors"
739 + , "packets/s"
740 + , "proc"
741 + , "net/snmp"
742 + , 2700
743 + , update_every
744 + , RRDSET_TYPE_LINE
745 + );
746 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
747
748 rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -653,6 +770,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
770 , NULL
771 , "IPv4 TCP Handshake Issues"
772 , "events/s"
773 + , "proc"
774 + , "net/snmp"
775 , 2900
776 , update_every
777 , RRDSET_TYPE_LINE
@@ -699,8 +818,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
818 if(do_udp_packets) {
819 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".udppackets");
820 if(!st) {
702 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "udppackets", NULL, "udp", NULL, "IPv4 UDP Packets"
703 - , "packets/s", 2601, update_every, RRDSET_TYPE_LINE);
821 + st = rrdset_create_localhost(
822 + RRD_TYPE_NET_SNMP
823 + , "udppackets"
824 + , NULL
825 + , "udp"
826 + , NULL
827 + , "IPv4 UDP Packets"
828 + , "packets/s"
829 + , "proc"
830 + , "net/snmp"
831 + , 2601
832 + , update_every
833 + , RRDSET_TYPE_LINE
834 + );
835
836 rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
837 rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -717,8 +848,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
848 if(do_udp_errors) {
849 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".udperrors");
850 if(!st) {
720 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors"
721 - , "events/s", 2701, update_every, RRDSET_TYPE_LINE);
851 + st = rrdset_create_localhost(
852 + RRD_TYPE_NET_SNMP
853 + , "udperrors"
854 + , NULL
855 + , "udp"
856 + , NULL
857 + , "IPv4 UDP Errors"
858 + , "events/s"
859 + , "proc"
860 + , "net/snmp"
861 + , 2701
862 + , update_every
863 + , RRDSET_TYPE_LINE
864 + );
865 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
866
867 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -760,9 +903,20 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
903 if(do_udplite_packets) {
904 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".udplite");
905 if(!st) {
763 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "udplite", NULL, "udplite", NULL
764 - , "IPv4 UDPLite Packets", "packets/s", 2603, update_every
765 - , RRDSET_TYPE_LINE);
906 + st = rrdset_create_localhost(
907 + RRD_TYPE_NET_SNMP
908 + , "udplite"
909 + , NULL
910 + , "udplite"
911 + , NULL
912 + , "IPv4 UDPLite Packets"
913 + , "packets/s"
914 + , "proc"
915 + , "net/snmp"
916 + , 2603
917 + , update_every
918 + , RRDSET_TYPE_LINE
919 + );
920
921 rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
922 rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -775,9 +929,19 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
929
930 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".udplite_errors");
931 if(!st) {
778 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "udplite_errors", NULL, "udplite", NULL
779 - , "IPv4 UDPLite Errors", "packets/s", 2604, update_every
780 - , RRDSET_TYPE_LINE);
932 + st = rrdset_create_localhost(
933 + RRD_TYPE_NET_SNMP
934 + , "udplite_errors"
935 + , NULL
936 + , "udplite"
937 + , NULL
938 + , "IPv4 UDPLite Errors"
939 + , "packets/s"
940 + , "proc"
941 + , "net/snmp"
942 + , 2604
943 + , update_every
944 + , RRDSET_TYPE_LINE);
945
946 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
947 rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_snmp6.c
+306 -49
@@ -280,8 +280,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
280 do_bandwidth = CONFIG_BOOLEAN_YES;
281 st = rrdset_find_localhost("system.ipv6");
282 if(unlikely(!st)) {
283 - st = rrdset_create_localhost("system", "ipv6", NULL, "network", NULL, "IPv6 Bandwidth", "kilobits/s", 500
284 - , update_every, RRDSET_TYPE_AREA);
283 + st = rrdset_create_localhost(
284 + "system"
285 + , "ipv6"
286 + , NULL
287 + , "network"
288 + , NULL
289 + , "IPv6 Bandwidth"
290 + , "kilobits/s"
291 + , "proc"
292 + , "net/snmp6"
293 + , 500
294 + , update_every
295 + , RRDSET_TYPE_AREA
296 + );
297
298 rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
299 rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
@@ -299,8 +311,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
311 do_ip_packets = CONFIG_BOOLEAN_YES;
312 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".packets");
313 if(unlikely(!st)) {
302 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "packets", NULL, "packets", NULL, "IPv6 Packets"
303 - , "packets/s", 3000, update_every, RRDSET_TYPE_LINE);
314 + st = rrdset_create_localhost(
315 + RRD_TYPE_NET_SNMP6
316 + , "packets"
317 + , NULL
318 + , "packets"
319 + , NULL
320 + , "IPv6 Packets"
321 + , "packets/s"
322 + , "proc"
323 + , "net/snmp6"
324 + , 3000
325 + , update_every
326 + , RRDSET_TYPE_LINE
327 + );
328
329 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
330 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -322,8 +346,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
346 do_ip_fragsout = CONFIG_BOOLEAN_YES;
347 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".fragsout");
348 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);
349 + st = rrdset_create_localhost(
350 + RRD_TYPE_NET_SNMP6
351 + , "fragsout"
352 + , NULL
353 + , "fragments"
354 + , NULL
355 + , "IPv6 Fragments Sent"
356 + , "packets/s"
357 + , "proc"
358 + , "net/snmp6"
359 + , 3010
360 + , update_every
361 + , RRDSET_TYPE_LINE
362 + );
363 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
364
365 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -350,9 +386,19 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
386 do_ip_fragsin = CONFIG_BOOLEAN_YES;
387 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".fragsin");
388 if(unlikely(!st)) {
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);
389 + st = rrdset_create_localhost(
390 + RRD_TYPE_NET_SNMP6
391 + , "fragsin"
392 + , NULL
393 + , "fragments"
394 + , NULL
395 + , "IPv6 Fragments Reassembly"
396 + , "packets/s"
397 + , "proc"
398 + , "net/snmp6"
399 + , 3011
400 + , update_every
401 + , RRDSET_TYPE_LINE);
402 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
403
404 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -385,8 +431,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
431 do_ip_errors = CONFIG_BOOLEAN_YES;
432 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".errors");
433 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);
434 + st = rrdset_create_localhost(
435 + RRD_TYPE_NET_SNMP6
436 + , "errors"
437 + , NULL
438 + , "errors"
439 + , NULL
440 + , "IPv6 Errors"
441 + , "packets/s"
442 + , "proc"
443 + , "net/snmp6"
444 + , 3002
445 + , update_every
446 + , RRDSET_TYPE_LINE
447 + );
448 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
449
450 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -423,8 +481,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
481 do_udp_packets = CONFIG_BOOLEAN_YES;
482 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udppackets");
483 if(unlikely(!st)) {
426 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "udppackets", NULL, "udp", NULL, "IPv6 UDP Packets"
427 - , "packets/s", 3601, update_every, RRDSET_TYPE_LINE);
484 + st = rrdset_create_localhost(
485 + RRD_TYPE_NET_SNMP6
486 + , "udppackets"
487 + , NULL
488 + , "udp"
489 + , NULL
490 + , "IPv6 UDP Packets"
491 + , "packets/s"
492 + , "proc"
493 + , "net/snmp6"
494 + , 3601
495 + , update_every
496 + , RRDSET_TYPE_LINE
497 + );
498
499 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
500 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -450,8 +520,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
520 do_udp_errors = CONFIG_BOOLEAN_YES;
521 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udperrors");
522 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);
523 + st = rrdset_create_localhost(
524 + RRD_TYPE_NET_SNMP6
525 + , "udperrors"
526 + , NULL
527 + , "udp"
528 + , NULL
529 + , "IPv6 UDP Errors"
530 + , "events/s"
531 + , "proc"
532 + , "net/snmp6"
533 + , 3701
534 + , update_every
535 + , RRDSET_TYPE_LINE
536 + );
537 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
538
539 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -478,8 +560,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
560 do_udplite_packets = CONFIG_BOOLEAN_YES;
561 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udplitepackets");
562 if(unlikely(!st)) {
481 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "udplitepackets", NULL, "udplite", NULL
482 - , "IPv6 UDPlite Packets", "packets/s", 3601, update_every, RRDSET_TYPE_LINE);
563 + st = rrdset_create_localhost(
564 + RRD_TYPE_NET_SNMP6
565 + , "udplitepackets"
566 + , NULL
567 + , "udplite"
568 + , NULL
569 + , "IPv6 UDPlite Packets"
570 + , "packets/s"
571 + , "proc"
572 + , "net/snmp6"
573 + , 3601
574 + , update_every
575 + , RRDSET_TYPE_LINE
576 + );
577
578 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
579 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -505,8 +599,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
599 do_udplite_errors = CONFIG_BOOLEAN_YES;
600 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udpliteerrors");
601 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);
602 + st = rrdset_create_localhost(
603 + RRD_TYPE_NET_SNMP6
604 + , "udpliteerrors"
605 + , NULL
606 + , "udplite"
607 + , NULL
608 + , "IPv6 UDP Lite Errors"
609 + , "events/s"
610 + , "proc"
611 + , "net/snmp6"
612 + , 3701
613 + , update_every
614 + , RRDSET_TYPE_LINE
615 + );
616 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
617
618 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -531,9 +637,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
637 do_mcast = CONFIG_BOOLEAN_YES;
638 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".mcast");
639 if(unlikely(!st)) {
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);
640 + st = rrdset_create_localhost(
641 + RRD_TYPE_NET_SNMP6
642 + , "mcast"
643 + , NULL
644 + , "multicast"
645 + , NULL
646 + , "IPv6 Multicast Bandwidth"
647 + , "kilobits/s"
648 + , "proc"
649 + , "net/snmp6"
650 + , 9000
651 + , update_every
652 + , RRDSET_TYPE_AREA
653 + );
654 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
655
656 rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
@@ -552,9 +669,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
669 do_bcast = CONFIG_BOOLEAN_YES;
670 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".bcast");
671 if(unlikely(!st)) {
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);
672 + st = rrdset_create_localhost(
673 + RRD_TYPE_NET_SNMP6
674 + , "bcast"
675 + , NULL
676 + , "broadcast"
677 + , NULL
678 + , "IPv6 Broadcast Bandwidth"
679 + , "kilobits/s"
680 + , "proc"
681 + , "net/snmp6"
682 + , 8000
683 + , update_every
684 + , RRDSET_TYPE_AREA
685 + );
686 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
687
688 rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
@@ -573,8 +701,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
701 do_mcast_p = CONFIG_BOOLEAN_YES;
702 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".mcastpkts");
703 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);
704 + st = rrdset_create_localhost(
705 + RRD_TYPE_NET_SNMP6
706 + , "mcastpkts"
707 + , NULL
708 + , "multicast"
709 + , NULL
710 + , "IPv6 Multicast Packets"
711 + , "packets/s"
712 + , "proc"
713 + , "net/snmp6"
714 + , 9500
715 + , update_every
716 + , RRDSET_TYPE_LINE
717 + );
718 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
719
720 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -593,8 +733,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
733 do_icmp = CONFIG_BOOLEAN_YES;
734 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmp");
735 if(unlikely(!st)) {
596 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages"
597 - , "messages/s", 10000, update_every, RRDSET_TYPE_LINE);
736 + st = rrdset_create_localhost(
737 + RRD_TYPE_NET_SNMP6
738 + , "icmp"
739 + , NULL
740 + , "icmp"
741 + , NULL
742 + , "IPv6 ICMP Messages"
743 + , "messages/s"
744 + , "proc"
745 + , "net/snmp6"
746 + , 10000
747 + , update_every
748 + , RRDSET_TYPE_LINE
749 + );
750
751 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
752 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -612,8 +764,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
764 do_icmp_redir = CONFIG_BOOLEAN_YES;
765 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpredir");
766 if(unlikely(!st)) {
615 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects"
616 - , "redirects/s", 10050, update_every, RRDSET_TYPE_LINE);
767 + st = rrdset_create_localhost(
768 + RRD_TYPE_NET_SNMP6
769 + , "icmpredir"
770 + , NULL
771 + , "icmp"
772 + , NULL
773 + , "IPv6 ICMP Redirects"
774 + , "redirects/s"
775 + , "proc"
776 + , "net/snmp6"
777 + , 10050
778 + , update_every
779 + , RRDSET_TYPE_LINE
780 + );
781
782 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
783 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -644,8 +808,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
808 do_icmp_errors = CONFIG_BOOLEAN_YES;
809 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmperrors");
810 if(unlikely(!st)) {
647 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors"
648 - , "errors/s", 10100, update_every, RRDSET_TYPE_LINE);
811 + st = rrdset_create_localhost(
812 + RRD_TYPE_NET_SNMP6
813 + , "icmperrors"
814 + , NULL
815 + , "icmp"
816 + , NULL
817 + , "IPv6 ICMP Errors"
818 + , "errors/s"
819 + , "proc"
820 + , "net/snmp6"
821 + , 10100
822 + , update_every
823 + , RRDSET_TYPE_LINE
824 + );
825
826 rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
827 rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -688,8 +864,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
864 do_icmp_echos = CONFIG_BOOLEAN_YES;
865 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpechos");
866 if(unlikely(!st)) {
691 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo"
692 - , "messages/s", 10200, update_every, RRDSET_TYPE_LINE);
867 + st = rrdset_create_localhost(
868 + RRD_TYPE_NET_SNMP6
869 + , "icmpechos"
870 + , NULL
871 + , "icmp"
872 + , NULL
873 + , "IPv6 ICMP Echo"
874 + , "messages/s"
875 + , "proc"
876 + , "net/snmp6"
877 + , 10200
878 + , update_every
879 + , RRDSET_TYPE_LINE
880 + );
881
882 rrddim_add(st, "InEchos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
883 rrddim_add(st, "OutEchos", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -719,9 +907,19 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
907 do_icmp_groupmemb = CONFIG_BOOLEAN_YES;
908 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".groupmemb");
909 if(unlikely(!st)) {
722 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "groupmemb", NULL, "icmp", NULL
723 - , "IPv6 ICMP Group Membership", "messages/s", 10300, update_every
724 - , RRDSET_TYPE_LINE);
910 + st = rrdset_create_localhost(
911 + RRD_TYPE_NET_SNMP6
912 + , "groupmemb"
913 + , NULL
914 + , "icmp"
915 + , NULL
916 + , "IPv6 ICMP Group Membership"
917 + , "messages/s"
918 + , "proc"
919 + , "net/snmp6"
920 + , 10300
921 + , update_every
922 + , RRDSET_TYPE_LINE);
923
924 rrddim_add(st, "InQueries", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
925 rrddim_add(st, "OutQueries", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -753,8 +951,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
951 do_icmp_router = CONFIG_BOOLEAN_YES;
952 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmprouter");
953 if(unlikely(!st)) {
756 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages"
757 - , "messages/s", 10400, update_every, RRDSET_TYPE_LINE);
954 + st = rrdset_create_localhost(
955 + RRD_TYPE_NET_SNMP6
956 + , "icmprouter"
957 + , NULL
958 + , "icmp"
959 + , NULL
960 + , "IPv6 Router Messages"
961 + , "messages/s"
962 + , "proc"
963 + , "net/snmp6"
964 + , 10400
965 + , update_every
966 + , RRDSET_TYPE_LINE
967 + );
968
969 rrddim_add(st, "InSolicits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
970 rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -782,9 +992,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
992 do_icmp_neighbor = CONFIG_BOOLEAN_YES;
993 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpneighbor");
994 if(unlikely(!st)) {
785 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmpneighbor", NULL, "icmp", NULL
786 - , "IPv6 Neighbor Messages", "messages/s", 10500, update_every
787 - , RRDSET_TYPE_LINE);
995 + st = rrdset_create_localhost(
996 + RRD_TYPE_NET_SNMP6
997 + , "icmpneighbor"
998 + , NULL
999 + , "icmp"
1000 + , NULL
1001 + , "IPv6 Neighbor Messages"
1002 + , "messages/s"
1003 + , "proc"
1004 + , "net/snmp6"
1005 + , 10500
1006 + , update_every
1007 + , RRDSET_TYPE_LINE
1008 + );
1009
1010 rrddim_add(st, "InSolicits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1011 rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -806,8 +1027,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
1027 do_icmp_mldv2 = CONFIG_BOOLEAN_YES;
1028 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpmldv2");
1029 if(unlikely(!st)) {
809 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmpmldv2", NULL, "icmp", NULL, "IPv6 ICMP MLDv2 Reports"
810 - , "reports/s", 10600, update_every, RRDSET_TYPE_LINE);
1030 + st = rrdset_create_localhost(
1031 + RRD_TYPE_NET_SNMP6
1032 + , "icmpmldv2"
1033 + , NULL
1034 + , "icmp"
1035 + , NULL
1036 + , "IPv6 ICMP MLDv2 Reports"
1037 + , "reports/s"
1038 + , "proc"
1039 + , "net/snmp6"
1040 + , 10600
1041 + , update_every
1042 + , RRDSET_TYPE_LINE
1043 + );
1044
1045 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1046 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -837,8 +1070,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
1070 do_icmp_types = CONFIG_BOOLEAN_YES;
1071 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmptypes");
1072 if(unlikely(!st)) {
840 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types"
841 - , "messages/s", 10700, update_every, RRDSET_TYPE_LINE);
1073 + st = rrdset_create_localhost(
1074 + RRD_TYPE_NET_SNMP6
1075 + , "icmptypes"
1076 + , NULL
1077 + , "icmp"
1078 + , NULL
1079 + , "IPv6 ICMP Types"
1080 + , "messages/s"
1081 + , "proc"
1082 + , "net/snmp6"
1083 + , 10700
1084 + , update_every
1085 + , RRDSET_TYPE_LINE
1086 + );
1087
1088 rrddim_add(st, "InType1", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1089 rrddim_add(st, "InType128", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -878,8 +1123,20 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
1123 do_ect = CONFIG_BOOLEAN_YES;
1124 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".ect");
1125 if(unlikely(!st)) {
881 - st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "ect", NULL, "packets", NULL, "IPv6 ECT Packets"
882 - , "packets/s", 10800, update_every, RRDSET_TYPE_LINE);
1126 + st = rrdset_create_localhost(
1127 + RRD_TYPE_NET_SNMP6
1128 + , "ect"
1129 + , NULL
1130 + , "packets"
1131 + , NULL
1132 + , "IPv6 ECT Packets"
1133 + , "packets/s"
1134 + , "proc"
1135 + , "net/snmp6"
1136 + , 10800
1137 + , update_every
1138 + , RRDSET_TYPE_LINE
1139 + );
1140
1141 rrddim_add(st, "InNoECTPkts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1142 rrddim_add(st, "InECT1Pkts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_softnet_stat.c
+28 -4
@@ -79,8 +79,20 @@ int do_proc_net_softnet_stat(int update_every, usec_t dt) {
79
80 st = rrdset_find_bytype_localhost("system", "softnet_stat");
81 if(unlikely(!st)) {
82 - st = rrdset_create_localhost("system", "softnet_stat", NULL, "softnet_stat", "system.softnet_stat", "System softnet_stat"
83 - , "events/s", 955, update_every, RRDSET_TYPE_LINE);
82 + st = rrdset_create_localhost(
83 + "system"
84 + , "softnet_stat"
85 + , NULL
86 + , "softnet_stat"
87 + , "system.softnet_stat"
88 + , "System softnet_stat"
89 + , "events/s"
90 + , "proc"
91 + , "net/softnet_stat"
92 + , 955
93 + , update_every
94 + , RRDSET_TYPE_LINE
95 + );
96 for(w = 0; w < allocated_columns ;w++)
97 if(unlikely(softnet_column_name(w)))
98 rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -103,8 +115,20 @@ int do_proc_net_softnet_stat(int update_every, usec_t dt) {
115 char title[100+1];
116 snprintfz(title, 100, "CPU%zu softnet_stat", l);
117
106 - st = rrdset_create_localhost("cpu", id, NULL, "softnet_stat", "cpu.softnet_stat", title, "events/s", 4101 + l
107 - , update_every, RRDSET_TYPE_LINE);
118 + st = rrdset_create_localhost(
119 + "cpu"
120 + , id
121 + , NULL
122 + , "softnet_stat"
123 + , "cpu.softnet_stat"
124 + , title
125 + , "events/s"
126 + , "proc"
127 + , "net/softnet_stat"
128 + , 4101 + l
129 + , update_every
130 + , RRDSET_TYPE_LINE
131 + );
132 for(w = 0; w < allocated_columns ;w++)
133 if(unlikely(softnet_column_name(w)))
134 rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_stat_conntrack.c
+84 -18
@@ -132,9 +132,20 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
132 if(do_sockets) {
133 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_sockets");
134 if(unlikely(!st)) {
135 - st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_sockets", NULL
136 - , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Connections"
137 - , "active connections", 3000, update_every, RRDSET_TYPE_LINE);
135 + st = rrdset_create_localhost(
136 + RRD_TYPE_NET_STAT_NETFILTER
137 + , RRD_TYPE_NET_STAT_CONNTRACK "_sockets"
138 + , NULL
139 + , RRD_TYPE_NET_STAT_CONNTRACK
140 + , NULL
141 + , "Connection Tracker Connections"
142 + , "active connections"
143 + , "proc"
144 + , "net/stat/nf_conntrack"
145 + , 3000
146 + , update_every
147 + , RRDSET_TYPE_LINE
148 + );
149
150 rrddim_add(st, "connections", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
151 }
@@ -149,9 +160,20 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
160 if(do_new) {
161 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_new");
162 if(unlikely(!st)) {
152 - st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_new", NULL
153 - , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker New Connections"
154 - , "connections/s", 3001, update_every, RRDSET_TYPE_LINE);
163 + st = rrdset_create_localhost(
164 + RRD_TYPE_NET_STAT_NETFILTER
165 + , RRD_TYPE_NET_STAT_CONNTRACK "_new"
166 + , NULL
167 + , RRD_TYPE_NET_STAT_CONNTRACK
168 + , NULL
169 + , "Connection Tracker New Connections"
170 + , "connections/s"
171 + , "proc"
172 + , "net/stat/nf_conntrack"
173 + , 3001
174 + , update_every
175 + , RRDSET_TYPE_LINE
176 + );
177
178 rrddim_add(st, "new", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
179 rrddim_add(st, "ignore", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -170,9 +192,20 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
192 if(do_changes) {
193 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_changes");
194 if(unlikely(!st)) {
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);
195 + st = rrdset_create_localhost(
196 + RRD_TYPE_NET_STAT_NETFILTER
197 + , RRD_TYPE_NET_STAT_CONNTRACK "_changes"
198 + , NULL
199 + , RRD_TYPE_NET_STAT_CONNTRACK
200 + , NULL
201 + , "Connection Tracker Changes"
202 + , "changes/s"
203 + , "proc"
204 + , "net/stat/nf_conntrack"
205 + , 3002
206 + , update_every
207 + , RRDSET_TYPE_LINE
208 + );
209 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
210
211 rrddim_add(st, "inserted", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -192,9 +225,20 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
225 if(do_expect) {
226 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_expect");
227 if(unlikely(!st)) {
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);
228 + st = rrdset_create_localhost(
229 + RRD_TYPE_NET_STAT_NETFILTER
230 + , RRD_TYPE_NET_STAT_CONNTRACK "_expect"
231 + , NULL
232 + , RRD_TYPE_NET_STAT_CONNTRACK
233 + , NULL
234 + , "Connection Tracker Expectations"
235 + , "expectations/s"
236 + , "proc"
237 + , "net/stat/nf_conntrack"
238 + , 3003
239 + , update_every
240 + , RRDSET_TYPE_LINE
241 + );
242 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
243
244 rrddim_add(st, "created", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -214,9 +258,20 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
258 if(do_search) {
259 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_search");
260 if(unlikely(!st)) {
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);
261 + st = rrdset_create_localhost(
262 + RRD_TYPE_NET_STAT_NETFILTER
263 + , RRD_TYPE_NET_STAT_CONNTRACK "_search"
264 + , NULL
265 + , RRD_TYPE_NET_STAT_CONNTRACK
266 + , NULL
267 + , "Connection Tracker Searches"
268 + , "searches/s"
269 + , "proc"
270 + , "net/stat/nf_conntrack"
271 + , 3010
272 + , update_every
273 + , RRDSET_TYPE_LINE
274 + );
275 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
276
277 rrddim_add(st, "searched", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -236,9 +291,20 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
291 if(do_errors) {
292 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_errors");
293 if(unlikely(!st)) {
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);
294 + st = rrdset_create_localhost(
295 + RRD_TYPE_NET_STAT_NETFILTER
296 + , RRD_TYPE_NET_STAT_CONNTRACK "_errors"
297 + , NULL
298 + , RRD_TYPE_NET_STAT_CONNTRACK
299 + , NULL
300 + , "Connection Tracker Errors"
301 + , "events/s"
302 + , "proc"
303 + , "net/stat/nf_conntrack"
304 + , 3005
305 + , update_every
306 + , RRDSET_TYPE_LINE
307 + );
308 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
309
310 rrddim_add(st, "icmp_error", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_stat_synproxy.c
+56 -12
@@ -62,9 +62,20 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
62
63 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_entries");
64 if(unlikely(!st)) {
65 - st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_entries", NULL
66 - , RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY Entries Used", "entries", 3304
67 - , update_every, RRDSET_TYPE_LINE);
65 + st = rrdset_create_localhost(
66 + RRD_TYPE_NET_STAT_NETFILTER
67 + , RRD_TYPE_NET_STAT_SYNPROXY "_entries"
68 + , NULL
69 + , RRD_TYPE_NET_STAT_SYNPROXY
70 + , NULL
71 + , "SYNPROXY Entries Used"
72 + , "entries"
73 + , "proc"
74 + , "net/stat/synproxy"
75 + , 3304
76 + , update_every
77 + , RRDSET_TYPE_LINE
78 + );
79
80 rrddim_add(st, "entries", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
81 }
@@ -81,9 +92,20 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
92
93 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_syn_received");
94 if(unlikely(!st)) {
84 - st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_syn_received", NULL
85 - , RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY SYN Packets received", "SYN/s"
86 - , 3301, update_every, RRDSET_TYPE_LINE);
95 + st = rrdset_create_localhost(
96 + RRD_TYPE_NET_STAT_NETFILTER
97 + , RRD_TYPE_NET_STAT_SYNPROXY "_syn_received"
98 + , NULL
99 + , RRD_TYPE_NET_STAT_SYNPROXY
100 + , NULL
101 + , "SYNPROXY SYN Packets received"
102 + , "SYN/s"
103 + , "proc"
104 + , "net/stat/synproxy"
105 + , 3301
106 + , update_every
107 + , RRDSET_TYPE_LINE
108 + );
109
110 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
111 }
@@ -100,9 +122,20 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
122
123 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_conn_reopened");
124 if(unlikely(!st)) {
103 - st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_conn_reopened", NULL
104 - , RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY Connections Reopened"
105 - , "connections/s", 3303, update_every, RRDSET_TYPE_LINE);
125 + st = rrdset_create_localhost(
126 + RRD_TYPE_NET_STAT_NETFILTER
127 + , RRD_TYPE_NET_STAT_SYNPROXY "_conn_reopened"
128 + , NULL
129 + , RRD_TYPE_NET_STAT_SYNPROXY
130 + , NULL
131 + , "SYNPROXY Connections Reopened"
132 + , "connections/s"
133 + , "proc"
134 + , "net/stat/synproxy"
135 + , 3303
136 + , update_every
137 + , RRDSET_TYPE_LINE
138 + );
139
140 rrddim_add(st, "reopened", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
141 }
@@ -119,9 +152,20 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
152
153 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_cookies");
154 if(unlikely(!st)) {
122 - st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_cookies", NULL
123 - , RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY TCP Cookies", "cookies/s", 3302
124 - , update_every, RRDSET_TYPE_LINE);
155 + st = rrdset_create_localhost(
156 + RRD_TYPE_NET_STAT_NETFILTER
157 + , RRD_TYPE_NET_STAT_SYNPROXY "_cookies"
158 + , NULL
159 + , RRD_TYPE_NET_STAT_SYNPROXY
160 + , NULL
161 + , "SYNPROXY TCP Cookies"
162 + , "cookies/s"
163 + , "proc"
164 + , "net/stat/synproxy"
165 + , 3302
166 + , update_every
167 + , RRDSET_TYPE_LINE
168 + );
169
170 rrddim_add(st, "valid", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
171 rrddim_add(st, "invalid", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_softirqs.c
+4
@@ -136,6 +136,8 @@ int do_proc_softirqs(int update_every, usec_t dt) {
136 , NULL
137 , "System softirqs"
138 , "softirqs/s"
139 + , "proc"
140 + , "softirqs"
141 , 950
142 , update_every
143 , RRDSET_TYPE_STACKED
@@ -212,6 +214,8 @@ int do_proc_softirqs(int update_every, usec_t dt) {
214 , "cpu.softirqs"
215 , title
216 , "softirqs/s"
217 + , "proc"
218 + , "softirqs"
219 , 3000 + c
220 , update_every
221 , RRDSET_TYPE_STACKED
src/proc_spl_kstat_zfs.c
+2 -2
@@ -146,8 +146,8 @@ int do_proc_spl_kstat_zfs_arcstats(int update_every, usec_t dt) {
146 if(unlikely(l2exist == -1))
147 l2exist = 0;
148
149 - generate_charts_arcstats(update_every);
150 - generate_charts_arc_summary(update_every);
149 + generate_charts_arcstats("proc", update_every);
150 + generate_charts_arc_summary("proc", update_every);
151
152 return 0;
153 }
src/proc_stat.c
+16
@@ -287,6 +287,8 @@ int do_proc_stat(int update_every, usec_t dt) {
287 , context
288 , title
289 , "percentage"
290 + , "proc"
291 + , "stat"
292 , priority
293 , update_every
294 , RRDSET_TYPE_STACKED
@@ -337,6 +339,8 @@ int do_proc_stat(int update_every, usec_t dt) {
339 , NULL
340 , "CPU Interrupts"
341 , "interrupts/s"
342 + , "proc"
343 + , "stat"
344 , 900
345 , update_every
346 , RRDSET_TYPE_LINE
@@ -367,6 +371,8 @@ int do_proc_stat(int update_every, usec_t dt) {
371 , NULL
372 , "CPU Context Switches"
373 , "context switches/s"
374 + , "proc"
375 + , "stat"
376 , 800
377 , update_every
378 , RRDSET_TYPE_LINE
@@ -406,6 +412,8 @@ int do_proc_stat(int update_every, usec_t dt) {
412 , NULL
413 , "Started Processes"
414 , "processes/s"
415 + , "proc"
416 + , "stat"
417 , 700
418 , update_every
419 , RRDSET_TYPE_LINE
@@ -436,6 +444,8 @@ int do_proc_stat(int update_every, usec_t dt) {
444 , NULL
445 , "System Processes"
446 , "processes"
447 + , "proc"
448 + , "stat"
449 , 600
450 , update_every
451 , RRDSET_TYPE_LINE
@@ -468,6 +478,8 @@ int do_proc_stat(int update_every, usec_t dt) {
478 , "cpu.core_throttling"
479 , "Core Thermal Throttling Events"
480 , "events/s"
481 + , "proc"
482 + , "stat"
483 , 5001
484 , update_every
485 , RRDSET_TYPE_LINE
@@ -496,6 +508,8 @@ int do_proc_stat(int update_every, usec_t dt) {
508 , "cpu.package_throttling"
509 , "Package Thermal Throttling Events"
510 , "events/s"
511 + , "proc"
512 + , "stat"
513 , 5002
514 , update_every
515 , RRDSET_TYPE_LINE
@@ -524,6 +538,8 @@ int do_proc_stat(int update_every, usec_t dt) {
538 , "cpu.scaling_cur_freq"
539 , "Per CPU Core, Current CPU Scaling Frequency"
540 , "MHz"
541 + , "proc"
542 + , "stat"
543 , 5003
544 , update_every
545 , RRDSET_TYPE_LINE
src/proc_sys_kernel_random_entropy_avail.c
+2
@@ -29,6 +29,8 @@ int do_proc_sys_kernel_random_entropy_avail(int update_every, usec_t dt) {
29 , NULL
30 , "Available Entropy"
31 , "entropy"
32 + , "proc"
33 + , "sys/kernel/random/entropy_avail"
34 , 1000
35 , update_every
36 , RRDSET_TYPE_LINE
src/proc_uptime.c
+2
@@ -50,6 +50,8 @@ int do_proc_uptime(int update_every, usec_t dt) {
50 , NULL
51 , "System Uptime"
52 , "seconds"
53 + , "proc"
54 + , "uptime"
55 , 1000
56 , update_every
57 , RRDSET_TYPE_LINE
src/proc_vmstat.c
+8
@@ -102,6 +102,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
102 , NULL
103 , "Swap I/O"
104 , "kilobytes/s"
105 + , "proc"
106 + , "vmstat"
107 , 250
108 , update_every
109 , RRDSET_TYPE_AREA
@@ -132,6 +134,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
134 , NULL
135 , "Disk I/O"
136 , "kilobytes/s"
137 + , "proc"
138 + , "vmstat"
139 , 150
140 , update_every
141 , RRDSET_TYPE_AREA
@@ -162,6 +166,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
166 , NULL
167 , "Memory Page Faults"
168 , "page faults/s"
169 + , "proc"
170 + , "vmstat"
171 , 500
172 , update_every
173 , RRDSET_TYPE_LINE
@@ -205,6 +211,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
211 , NULL
212 , "NUMA events"
213 , "events/s"
214 + , "proc"
215 + , "vmstat"
216 , 800
217 , update_every
218 , RRDSET_TYPE_LINE
src/registry.c
+42 -7
@@ -325,9 +325,20 @@ void registry_statistics(void) {
325
326 if(!sts) sts = rrdset_find_localhost("netdata.registry_sessions");
327 if(!sts) {
328 - sts = rrdset_create_localhost("netdata", "registry_sessions", NULL, "registry", NULL
329 - , "NetData Registry Sessions", "session", 131000, localhost->rrd_update_every
330 - , RRDSET_TYPE_LINE);
328 + sts = rrdset_create_localhost(
329 + "netdata"
330 + , "registry_sessions"
331 + , NULL
332 + , "registry"
333 + , NULL
334 + , "NetData Registry Sessions"
335 + , "session"
336 + , "registry"
337 + , "stats"
338 + , 131000
339 + , localhost->rrd_update_every
340 + , RRDSET_TYPE_LINE
341 + );
342
343 rrddim_add(sts, "sessions", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
344 }
@@ -340,8 +351,20 @@ void registry_statistics(void) {
351
352 if(!stc) stc = rrdset_find_localhost("netdata.registry_entries");
353 if(!stc) {
343 - stc = rrdset_create_localhost("netdata", "registry_entries", NULL, "registry", NULL, "NetData Registry Entries"
344 - , "entries", 131100, localhost->rrd_update_every, RRDSET_TYPE_LINE);
354 + stc = rrdset_create_localhost(
355 + "netdata"
356 + , "registry_entries"
357 + , NULL
358 + , "registry"
359 + , NULL
360 + , "NetData Registry Entries"
361 + , "entries"
362 + , "registry"
363 + , "stats"
364 + , 131100
365 + , localhost->rrd_update_every
366 + , RRDSET_TYPE_LINE
367 + );
368
369 rrddim_add(stc, "persons", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
370 rrddim_add(stc, "machines", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -362,8 +385,20 @@ void registry_statistics(void) {
385
386 if(!stm) stm = rrdset_find_localhost("netdata.registry_mem");
387 if(!stm) {
365 - stm = rrdset_create_localhost("netdata", "registry_mem", NULL, "registry", NULL, "NetData Registry Memory", "KB"
366 - , 131300, localhost->rrd_update_every, RRDSET_TYPE_STACKED);
388 + stm = rrdset_create_localhost(
389 + "netdata"
390 + , "registry_mem"
391 + , NULL
392 + , "registry"
393 + , NULL
394 + , "NetData Registry Memory"
395 + , "KB"
396 + , "registry"
397 + , "stats"
398 + , 131300
399 + , localhost->rrd_update_every
400 + , RRDSET_TYPE_STACKED
401 + );
402
403 rrddim_add(stm, "persons", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
404 rrddim_add(stm, "machines", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
src/rrd.h
+11 -5
@@ -300,7 +300,11 @@ struct rrdset {
300
301 time_t last_accessed_time; // the last time this RRDSET has been accessed
302 time_t upstream_resync_time; // the timestamp up to which we should resync clock upstream
303 - size_t unused[8];
303 +
304 + char *plugin_name; // the name of the plugin that generated this
305 + char *module_name; // the name of the plugin module that generated this
306 +
307 + size_t unused[6];
308
309 uint32_t hash; // a simple hash on the id, to speed up searching
310 // we first compare hashes, and only if the hashes are equal we do string comparisons
@@ -590,17 +594,19 @@ extern RRDSET *rrdset_create_custom(RRDHOST *host
594 , const char *context
595 , const char *title
596 , const char *units
597 + , const char *plugin
598 + , const char *module
599 , long priority
600 , int update_every
601 , RRDSET_TYPE chart_type
602 , RRD_MEMORY_MODE memory_mode
603 , long history_entries);
604
599 -#define rrdset_create(host, type, id, name, family, context, title, units, priority, update_every, chart_type) \
600 - rrdset_create_custom(host, type, id, name, family, context, title, units, priority, update_every, chart_type, (host)->rrd_memory_mode, (host)->rrd_history_entries)
605 +#define rrdset_create(host, type, id, name, family, context, title, units, plugin, module, priority, update_every, chart_type) \
606 + rrdset_create_custom(host, type, id, name, family, context, title, units, plugin, module, priority, update_every, chart_type, (host)->rrd_memory_mode, (host)->rrd_history_entries)
607
602 -#define rrdset_create_localhost(type, id, name, family, context, title, units, priority, update_every, chart_type) \
603 - rrdset_create(localhost, type, id, name, family, context, title, units, priority, update_every, chart_type)
608 +#define rrdset_create_localhost(type, id, name, family, context, title, units, plugin, module, priority, update_every, chart_type) \
609 + rrdset_create(localhost, type, id, name, family, context, title, units, plugin, module, priority, update_every, chart_type)
610
611 extern void rrdhost_free_all(void);
612 extern void rrdhost_save_all(void);
src/rrdset.c
+9
@@ -341,6 +341,8 @@ void rrdset_free(RRDSET *st) {
341
342 // free directly allocated members
343 freez(st->config_section);
344 + freez(st->plugin_name);
345 + freez(st->module_name);
346
347 switch(st->rrd_memory_mode) {
348 case RRD_MEMORY_MODE_SAVE:
@@ -423,6 +425,8 @@ RRDSET *rrdset_create_custom(
425 , const char *context
426 , const char *title
427 , const char *units
428 + , const char *plugin
429 + , const char *module
430 , long priority
431 , int update_every
432 , RRDSET_TYPE chart_type
@@ -514,6 +518,8 @@ RRDSET *rrdset_create_custom(
518 st->units = NULL;
519 st->context = NULL;
520 st->cache_dir = NULL;
521 + st->plugin_name = NULL;
522 + st->module_name = NULL;
523 st->dimensions = NULL;
524 st->rrdfamily = NULL;
525 st->rrdhost = NULL;
@@ -571,6 +577,9 @@ RRDSET *rrdset_create_custom(
577 st->rrd_memory_mode = (memory_mode == RRD_MEMORY_MODE_NONE) ? RRD_MEMORY_MODE_NONE : RRD_MEMORY_MODE_ALLOC;
578 }
579
580 + st->plugin_name = plugin?strdup(plugin):NULL;
581 + st->module_name = module?strdup(module):NULL;
582 +
583 st->config_section = strdup(config_section);
584 st->rrdhost = host;
585 st->memsize = size;
src/statsd.c
+42 -26
@@ -1251,19 +1251,21 @@ static inline RRDSET *statsd_private_rrdset_create(
1251
1252 statsd.private_charts++;
1253 RRDSET *st = rrdset_create_custom(
1254 - localhost
1255 - , type
1256 - , id
1257 - , name
1258 - , family
1259 - , context
1260 - , title
1261 - , units
1262 - , priority
1263 - , update_every
1264 - , chart_type
1265 - , memory_mode
1266 - , history
1254 + localhost // host
1255 + , type // type
1256 + , id // id
1257 + , name // name
1258 + , family // family
1259 + , context // context
1260 + , title // title
1261 + , units // units
1262 + , "statsd" // plugin
1263 + , NULL // module
1264 + , priority // priority
1265 + , update_every // update every
1266 + , chart_type // chart type
1267 + , memory_mode // memory mode
1268 + , history // history
1269 );
1270 rrdset_flag_set(st, RRDSET_FLAG_STORE_FIRST);
1271 // rrdset_flag_set(st, RRDSET_FLAG_DEBUG);
@@ -1647,19 +1649,21 @@ static inline void statsd_update_app_chart(STATSD_APP *app, STATSD_APP_CHART *ch
1649
1650 if(!chart->st) {
1651 chart->st = rrdset_create_custom(
1650 - localhost
1651 - , app->name
1652 - , chart->id
1653 - , chart->name
1654 - , chart->family
1655 - , chart->context
1656 - , chart->title
1657 - , chart->units
1658 - , chart->priority
1659 - , statsd.update_every
1660 - , chart->chart_type
1661 - , app->rrd_memory_mode
1662 - , app->rrd_history_entries
1652 + localhost // host
1653 + , app->name // type
1654 + , chart->id // id
1655 + , chart->name // name
1656 + , chart->family // family
1657 + , chart->context // context
1658 + , chart->title // title
1659 + , chart->units // units
1660 + , "statsd" // plugin
1661 + , NULL // module
1662 + , chart->priority // priority
1663 + , statsd.update_every // update every
1664 + , chart->chart_type // chart type
1665 + , app->rrd_memory_mode // memory mode
1666 + , app->rrd_history_entries // history
1667 );
1668
1669 rrdset_flag_set(chart->st, RRDSET_FLAG_STORE_FIRST);
@@ -1874,6 +1878,8 @@ void *statsd_main(void *ptr) {
1878 , NULL
1879 , "Metrics in the netdata statsd database"
1880 , "metrics"
1881 + , "netdata"
1882 + , "stats"
1883 , 132000
1884 , statsd.update_every
1885 , RRDSET_TYPE_STACKED
@@ -1893,6 +1899,8 @@ void *statsd_main(void *ptr) {
1899 , NULL
1900 , "Events processed by the netdata statsd server"
1901 , "events/s"
1902 + , "netdata"
1903 + , "stats"
1904 , 132001
1905 , statsd.update_every
1906 , RRDSET_TYPE_STACKED
@@ -1914,6 +1922,8 @@ void *statsd_main(void *ptr) {
1922 , NULL
1923 , "Read operations made by the netdata statsd server"
1924 , "reads/s"
1925 + , "netdata"
1926 + , "stats"
1927 , 132002
1928 , statsd.update_every
1929 , RRDSET_TYPE_STACKED
@@ -1929,6 +1939,8 @@ void *statsd_main(void *ptr) {
1939 , NULL
1940 , "Bytes read by the netdata statsd server"
1941 , "kilobits/s"
1942 + , "netdata"
1943 + , "stats"
1944 , 132003
1945 , statsd.update_every
1946 , RRDSET_TYPE_STACKED
@@ -1944,6 +1956,8 @@ void *statsd_main(void *ptr) {
1956 , NULL
1957 , "Network packets processed by the netdata statsd server"
1958 , "packets/s"
1959 + , "netdata"
1960 + , "stats"
1961 , 132004
1962 , statsd.update_every
1963 , RRDSET_TYPE_STACKED
@@ -1959,6 +1973,8 @@ void *statsd_main(void *ptr) {
1973 , NULL
1974 , "Private metric charts created by the netdata statsd server"
1975 , "charts"
1976 + , "netdata"
1977 + , "stats"
1978 , 132010
1979 , statsd.update_every
1980 , RRDSET_TYPE_AREA
src/sys_devices_system_edac_mc.c
+4
@@ -140,6 +140,8 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
140 , NULL
141 , "ECC Memory Correctable Errors"
142 , "errors"
143 + , "proc"
144 + , "/sys/devices/system/edac/mc"
145 , 6600
146 , update_every
147 , RRDSET_TYPE_LINE
@@ -176,6 +178,8 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
178 , NULL
179 , "ECC Memory Uncorrectable Errors"
180 , "errors"
181 + , "proc"
182 + , "/sys/devices/system/edac/mc"
183 , 6610
184 , update_every
185 , RRDSET_TYPE_LINE
src/sys_devices_system_node.c
+2
@@ -105,6 +105,8 @@ int do_proc_sys_devices_system_node(int update_every, usec_t dt) {
105 , NULL
106 , "NUMA events"
107 , "events/s"
108 + , "proc"
109 + , "/sys/devices/system/node"
110 , 1000
111 , update_every
112 , RRDSET_TYPE_LINE
src/sys_fs_cgroup.c
+78
@@ -1447,6 +1447,8 @@ void update_systemd_services_charts(
1447 , "services.cpu"
1448 , title
1449 , "%"
1450 + , "cgroup"
1451 + , "systemd"
1452 , CHART_PRIORITY_SYSTEMD_SERVICES
1453 , update_every
1454 , RRDSET_TYPE_STACKED
@@ -1469,6 +1471,8 @@ void update_systemd_services_charts(
1471 , (cgroup_used_memory_without_cache) ? "Systemd Services Used Memory without Cache"
1472 : "Systemd Services Used Memory"
1473 , "MB"
1474 + , "cgroup"
1475 + , "systemd"
1476 , CHART_PRIORITY_SYSTEMD_SERVICES + 10
1477 , update_every
1478 , RRDSET_TYPE_STACKED
@@ -1490,6 +1494,8 @@ void update_systemd_services_charts(
1494 , "services.mem_rss"
1495 , "Systemd Services RSS Memory"
1496 , "MB"
1497 + , "cgroup"
1498 + , "systemd"
1499 , CHART_PRIORITY_SYSTEMD_SERVICES + 20
1500 , update_every
1501 , RRDSET_TYPE_STACKED
@@ -1509,6 +1515,8 @@ void update_systemd_services_charts(
1515 , "services.mem_mapped"
1516 , "Systemd Services Mapped Memory"
1517 , "MB"
1518 + , "cgroup"
1519 + , "systemd"
1520 , CHART_PRIORITY_SYSTEMD_SERVICES + 30
1521 , update_every
1522 , RRDSET_TYPE_STACKED
@@ -1528,6 +1536,8 @@ void update_systemd_services_charts(
1536 , "services.mem_cache"
1537 , "Systemd Services Cache Memory"
1538 , "MB"
1539 + , "cgroup"
1540 + , "systemd"
1541 , CHART_PRIORITY_SYSTEMD_SERVICES + 40
1542 , update_every
1543 , RRDSET_TYPE_STACKED
@@ -1547,6 +1557,8 @@ void update_systemd_services_charts(
1557 , "services.mem_writeback"
1558 , "Systemd Services Writeback Memory"
1559 , "MB"
1560 + , "cgroup"
1561 + , "systemd"
1562 , CHART_PRIORITY_SYSTEMD_SERVICES + 50
1563 , update_every
1564 , RRDSET_TYPE_STACKED
@@ -1566,6 +1578,8 @@ void update_systemd_services_charts(
1578 , "services.mem_pgfault"
1579 , "Systemd Services Memory Minor Page Faults"
1580 , "MB/s"
1581 + , "cgroup"
1582 + , "systemd"
1583 , CHART_PRIORITY_SYSTEMD_SERVICES + 60
1584 , update_every
1585 , RRDSET_TYPE_STACKED
@@ -1584,6 +1598,8 @@ void update_systemd_services_charts(
1598 , "services.mem_pgmajfault"
1599 , "Systemd Services Memory Major Page Faults"
1600 , "MB/s"
1601 + , "cgroup"
1602 + , "systemd"
1603 , CHART_PRIORITY_SYSTEMD_SERVICES + 70
1604 , update_every
1605 , RRDSET_TYPE_STACKED
@@ -1603,6 +1619,8 @@ void update_systemd_services_charts(
1619 , "services.mem_pgpgin"
1620 , "Systemd Services Memory Charging Activity"
1621 , "MB/s"
1622 + , "cgroup"
1623 + , "systemd"
1624 , CHART_PRIORITY_SYSTEMD_SERVICES + 80
1625 , update_every
1626 , RRDSET_TYPE_STACKED
@@ -1622,6 +1640,8 @@ void update_systemd_services_charts(
1640 , "services.mem_pgpgout"
1641 , "Systemd Services Memory Uncharging Activity"
1642 , "MB/s"
1643 + , "cgroup"
1644 + , "systemd"
1645 , CHART_PRIORITY_SYSTEMD_SERVICES + 90
1646 , update_every
1647 , RRDSET_TYPE_STACKED
@@ -1643,6 +1663,8 @@ void update_systemd_services_charts(
1663 , "services.mem_failcnt"
1664 , "Systemd Services Memory Limit Failures"
1665 , "MB"
1666 + , "cgroup"
1667 + , "systemd"
1668 , CHART_PRIORITY_SYSTEMD_SERVICES + 110
1669 , update_every
1670 , RRDSET_TYPE_STACKED
@@ -1664,6 +1686,8 @@ void update_systemd_services_charts(
1686 , "services.swap_usage"
1687 , "Systemd Services Swap Memory Used"
1688 , "MB"
1689 + , "cgroup"
1690 + , "systemd"
1691 , CHART_PRIORITY_SYSTEMD_SERVICES + 100
1692 , update_every
1693 , RRDSET_TYPE_STACKED
@@ -1685,6 +1709,8 @@ void update_systemd_services_charts(
1709 , "services.io_read"
1710 , "Systemd Services Disk Read Bandwidth"
1711 , "KB/s"
1712 + , "cgroup"
1713 + , "systemd"
1714 , CHART_PRIORITY_SYSTEMD_SERVICES + 120
1715 , update_every
1716 , RRDSET_TYPE_STACKED
@@ -1704,6 +1730,8 @@ void update_systemd_services_charts(
1730 , "services.io_write"
1731 , "Systemd Services Disk Write Bandwidth"
1732 , "KB/s"
1733 + , "cgroup"
1734 + , "systemd"
1735 , CHART_PRIORITY_SYSTEMD_SERVICES + 130
1736 , update_every
1737 , RRDSET_TYPE_STACKED
@@ -1725,6 +1753,8 @@ void update_systemd_services_charts(
1753 , "services.io_ops_read"
1754 , "Systemd Services Disk Read Operations"
1755 , "operations/s"
1756 + , "cgroup"
1757 + , "systemd"
1758 , CHART_PRIORITY_SYSTEMD_SERVICES + 140
1759 , update_every
1760 , RRDSET_TYPE_STACKED
@@ -1744,6 +1774,8 @@ void update_systemd_services_charts(
1774 , "services.io_ops_write"
1775 , "Systemd Services Disk Write Operations"
1776 , "operations/s"
1777 + , "cgroup"
1778 + , "systemd"
1779 , CHART_PRIORITY_SYSTEMD_SERVICES + 150
1780 , update_every
1781 , RRDSET_TYPE_STACKED
@@ -1765,6 +1797,8 @@ void update_systemd_services_charts(
1797 , "services.throttle_io_read"
1798 , "Systemd Services Throttle Disk Read Bandwidth"
1799 , "KB/s"
1800 + , "cgroup"
1801 + , "systemd"
1802 , CHART_PRIORITY_SYSTEMD_SERVICES + 160
1803 , update_every
1804 , RRDSET_TYPE_STACKED
@@ -1784,6 +1818,8 @@ void update_systemd_services_charts(
1818 , "services.throttle_io_write"
1819 , "Systemd Services Throttle Disk Write Bandwidth"
1820 , "KB/s"
1821 + , "cgroup"
1822 + , "systemd"
1823 , CHART_PRIORITY_SYSTEMD_SERVICES + 170
1824 , update_every
1825 , RRDSET_TYPE_STACKED
@@ -1805,6 +1841,8 @@ void update_systemd_services_charts(
1841 , "services.throttle_io_ops_read"
1842 , "Systemd Services Throttle Disk Read Operations"
1843 , "operations/s"
1844 + , "cgroup"
1845 + , "systemd"
1846 , CHART_PRIORITY_SYSTEMD_SERVICES + 180
1847 , update_every
1848 , RRDSET_TYPE_STACKED
@@ -1824,6 +1862,8 @@ void update_systemd_services_charts(
1862 , "services.throttle_io_ops_write"
1863 , "Systemd Services Throttle Disk Write Operations"
1864 , "operations/s"
1865 + , "cgroup"
1866 + , "systemd"
1867 , CHART_PRIORITY_SYSTEMD_SERVICES + 190
1868 , update_every
1869 , RRDSET_TYPE_STACKED
@@ -1845,6 +1885,8 @@ void update_systemd_services_charts(
1885 , "services.queued_io_ops_read"
1886 , "Systemd Services Queued Disk Read Operations"
1887 , "operations/s"
1888 + , "cgroup"
1889 + , "systemd"
1890 , CHART_PRIORITY_SYSTEMD_SERVICES + 200
1891 , update_every
1892 , RRDSET_TYPE_STACKED
@@ -1864,6 +1906,8 @@ void update_systemd_services_charts(
1906 , "services.queued_io_ops_write"
1907 , "Systemd Services Queued Disk Write Operations"
1908 , "operations/s"
1909 + , "cgroup"
1910 + , "systemd"
1911 , CHART_PRIORITY_SYSTEMD_SERVICES + 210
1912 , update_every
1913 , RRDSET_TYPE_STACKED
@@ -1885,6 +1929,8 @@ void update_systemd_services_charts(
1929 , "services.merged_io_ops_read"
1930 , "Systemd Services Merged Disk Read Operations"
1931 , "operations/s"
1932 + , "cgroup"
1933 + , "systemd"
1934 , CHART_PRIORITY_SYSTEMD_SERVICES + 220
1935 , update_every
1936 , RRDSET_TYPE_STACKED
@@ -1904,6 +1950,8 @@ void update_systemd_services_charts(
1950 , "services.merged_io_ops_write"
1951 , "Systemd Services Merged Disk Write Operations"
1952 , "operations/s"
1953 + , "cgroup"
1954 + , "systemd"
1955 , CHART_PRIORITY_SYSTEMD_SERVICES + 230
1956 , update_every
1957 , RRDSET_TYPE_STACKED
@@ -2184,6 +2232,8 @@ void update_cgroup_charts(int update_every) {
2232 , "cgroup.cpu"
2233 , title
2234 , "%"
2235 + , "cgroup"
2236 + , "default"
2237 , CHART_PRIORITY_CONTAINERS
2238 , update_every
2239 , RRDSET_TYPE_STACKED
@@ -2215,6 +2265,8 @@ void update_cgroup_charts(int update_every) {
2265 , "cgroup.cpu_per_core"
2266 , title
2267 , "%"
2268 + , "cgroup"
2269 + , "default"
2270 , CHART_PRIORITY_CONTAINERS + 100
2271 , update_every
2272 , RRDSET_TYPE_STACKED
@@ -2247,6 +2299,8 @@ void update_cgroup_charts(int update_every) {
2299 , "cgroup.mem"
2300 , title
2301 , "MB"
2302 + , "cgroup"
2303 + , "default"
2304 , CHART_PRIORITY_CONTAINERS + 210
2305 , update_every
2306 , RRDSET_TYPE_STACKED
@@ -2285,6 +2339,8 @@ void update_cgroup_charts(int update_every) {
2339 , "cgroup.writeback"
2340 , title
2341 , "MB"
2342 + , "cgroup"
2343 + , "default"
2344 , CHART_PRIORITY_CONTAINERS + 300
2345 , update_every
2346 , RRDSET_TYPE_AREA
@@ -2315,6 +2371,8 @@ void update_cgroup_charts(int update_every) {
2371 , "cgroup.mem_activity"
2372 , title
2373 , "MB/s"
2374 + , "cgroup"
2375 + , "default"
2376 , CHART_PRIORITY_CONTAINERS + 400
2377 , update_every
2378 , RRDSET_TYPE_LINE
@@ -2341,6 +2399,8 @@ void update_cgroup_charts(int update_every) {
2399 , "cgroup.pgfaults"
2400 , title
2401 , "MB/s"
2402 + , "cgroup"
2403 + , "default"
2404 , CHART_PRIORITY_CONTAINERS + 500
2405 , update_every
2406 , RRDSET_TYPE_LINE
@@ -2369,6 +2429,8 @@ void update_cgroup_charts(int update_every) {
2429 , "cgroup.mem_usage"
2430 , title
2431 , "MB"
2432 + , "cgroup"
2433 + , "default"
2434 , CHART_PRIORITY_CONTAINERS + 200
2435 , update_every
2436 , RRDSET_TYPE_STACKED
@@ -2397,6 +2459,8 @@ void update_cgroup_charts(int update_every) {
2459 , "cgroup.mem_failcnt"
2460 , title
2461 , "count"
2462 + , "cgroup"
2463 + , "default"
2464 , CHART_PRIORITY_CONTAINERS + 250
2465 , update_every
2466 , RRDSET_TYPE_LINE
@@ -2423,6 +2487,8 @@ void update_cgroup_charts(int update_every) {
2487 , "cgroup.io"
2488 , title
2489 , "KB/s"
2490 + , "cgroup"
2491 + , "default"
2492 , CHART_PRIORITY_CONTAINERS + 1200
2493 , update_every
2494 , RRDSET_TYPE_AREA
@@ -2451,6 +2517,8 @@ void update_cgroup_charts(int update_every) {
2517 , "cgroup.serviced_ops"
2518 , title
2519 , "operations/s"
2520 + , "cgroup"
2521 + , "default"
2522 , CHART_PRIORITY_CONTAINERS + 1200
2523 , update_every
2524 , RRDSET_TYPE_LINE
@@ -2479,6 +2547,8 @@ void update_cgroup_charts(int update_every) {
2547 , "cgroup.throttle_io"
2548 , title
2549 , "KB/s"
2550 + , "cgroup"
2551 + , "default"
2552 , CHART_PRIORITY_CONTAINERS + 1200
2553 , update_every
2554 , RRDSET_TYPE_AREA
@@ -2507,6 +2577,8 @@ void update_cgroup_charts(int update_every) {
2577 , "cgroup.throttle_serviced_ops"
2578 , title
2579 , "operations/s"
2580 + , "cgroup"
2581 + , "default"
2582 , CHART_PRIORITY_CONTAINERS + 1200
2583 , update_every
2584 , RRDSET_TYPE_LINE
@@ -2535,6 +2607,8 @@ void update_cgroup_charts(int update_every) {
2607 , "cgroup.queued_ops"
2608 , title
2609 , "operations"
2610 + , "cgroup"
2611 + , "default"
2612 , CHART_PRIORITY_CONTAINERS + 2000
2613 , update_every
2614 , RRDSET_TYPE_LINE
@@ -2563,6 +2637,8 @@ void update_cgroup_charts(int update_every) {
2637 , "cgroup.merged_ops"
2638 , title
2639 , "operations/s"
2640 + , "cgroup"
2641 + , "default"
2642 , CHART_PRIORITY_CONTAINERS + 2100
2643 , update_every
2644 , RRDSET_TYPE_LINE
@@ -2650,6 +2726,8 @@ void *cgroups_main(void *ptr) {
2726 , NULL
2727 , "NetData CGroups Plugin CPU usage"
2728 , "milliseconds/s"
2729 + , "cgroup"
2730 + , "stats"
2731 , 132000
2732 , cgroup_update_every
2733 , RRDSET_TYPE_STACKED
src/sys_kernel_mm_ksm.c
+6
@@ -102,6 +102,8 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
102 , NULL
103 , "Kernel Same Page Merging"
104 , "MB"
105 + , "proc"
106 + , "/sys/kernel/mm/ksm"
107 , 5000
108 , update_every
109 , RRDSET_TYPE_AREA
@@ -140,6 +142,8 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
142 , NULL
143 , "Kernel Same Page Merging Savings"
144 , "MB"
145 + , "proc"
146 + , "/sys/kernel/mm/ksm"
147 , 5001
148 , update_every
149 , RRDSET_TYPE_AREA
@@ -172,6 +176,8 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
176 , NULL
177 , "Kernel Same Page Merging Effectiveness"
178 , "percentage"
179 + , "proc"
180 + , "/sys/kernel/mm/ksm"
181 , 5002
182 , update_every
183 , RRDSET_TYPE_LINE
src/unit_test.c
+3 -3
@@ -973,7 +973,7 @@ int run_test(struct test *test)
973 snprintfz(name, 100, "unittest-%s", test->name);
974
975 // create the chart
976 - RRDSET *st = rrdset_create_localhost("netdata", name, name, "netdata", NULL, "Unit Testing", "a value", 1
976 + RRDSET *st = rrdset_create_localhost("netdata", name, name, "netdata", NULL, "Unit Testing", "a value", "unittest", NULL, 1
977 , test->update_every, RRDSET_TYPE_LINE);
978 RRDDIM *rd = rrddim_add(st, "dim1", NULL, test->multiplier, test->divisor, test->algorithm);
979
@@ -1062,7 +1062,7 @@ int run_test(struct test *test)
1062
1063 static int test_variable_renames(void) {
1064 fprintf(stderr, "Creating chart\n");
1065 - RRDSET *st = rrdset_create_localhost("chart", "ID", NULL, "family", "context", "Unit Testing", "a value", 1, 1, RRDSET_TYPE_LINE);
1065 + RRDSET *st = rrdset_create_localhost("chart", "ID", NULL, "family", "context", "Unit Testing", "a value", "unittest", NULL, 1, 1, RRDSET_TYPE_LINE);
1066 fprintf(stderr, "Created chart with id '%s', name '%s'\n", st->id, st->name);
1067
1068 fprintf(stderr, "Creating dimension DIM1\n");
@@ -1182,7 +1182,7 @@ int unit_test(long delay, long shift)
1182 int do_abst = 0;
1183 int do_absi = 0;
1184
1185 - RRDSET *st = rrdset_create_localhost("netdata", name, name, "netdata", NULL, "Unit Testing", "a value", 1, 1
1185 + RRDSET *st = rrdset_create_localhost("netdata", name, name, "netdata", NULL, "Unit Testing", "a value", "unittest", NULL, 1, 1
1186 , RRDSET_TYPE_LINE);
1187 rrdset_flag_set(st, RRDSET_FLAG_DEBUG);
1188
src/zfs_common.c
+38 -2
@@ -3,7 +3,7 @@
3
4 extern struct arcstats arcstats;
5
6 -void generate_charts_arcstats(int update_every) {
6 +void generate_charts_arcstats(const char *plugin, int update_every) {
7
8 // ARC reads
9 unsigned long long aread = arcstats.hits + arcstats.misses;
@@ -46,6 +46,8 @@ void generate_charts_arcstats(int update_every) {
46 , NULL
47 , "ZFS ARC Size"
48 , "MB"
49 + , plugin
50 + , "zfs"
51 , 2000
52 , update_every
53 , RRDSET_TYPE_AREA
@@ -82,6 +84,8 @@ void generate_charts_arcstats(int update_every) {
84 , NULL
85 , "ZFS L2 ARC Size"
86 , "MB"
87 + , plugin
88 + , "zfs"
89 , 2000
90 , update_every
91 , RRDSET_TYPE_AREA
@@ -117,6 +121,8 @@ void generate_charts_arcstats(int update_every) {
121 , NULL
122 , "ZFS Reads"
123 , "reads/s"
124 + , plugin
125 + , "zfs"
126 , 2010
127 , update_every
128 , RRDSET_TYPE_AREA
@@ -160,6 +166,8 @@ void generate_charts_arcstats(int update_every) {
166 , NULL
167 , "ZFS ARC L2 Read/Write Rate"
168 , "kilobytes/s"
169 + , plugin
170 + , "zfs"
171 , 2200
172 , update_every
173 , RRDSET_TYPE_AREA
@@ -192,6 +200,8 @@ void generate_charts_arcstats(int update_every) {
200 , NULL
201 , "ZFS ARC Hits"
202 , "percentage"
203 + , plugin
204 + , "zfs"
205 , 2020
206 , update_every
207 , RRDSET_TYPE_STACKED
@@ -224,6 +234,8 @@ void generate_charts_arcstats(int update_every) {
234 , NULL
235 , "ZFS Demand Hits"
236 , "percentage"
237 + , plugin
238 + , "zfs"
239 , 2030
240 , update_every
241 , RRDSET_TYPE_STACKED
@@ -256,6 +268,8 @@ void generate_charts_arcstats(int update_every) {
268 , NULL
269 , "ZFS Prefetch Hits"
270 , "percentage"
271 + , plugin
272 + , "zfs"
273 , 2040
274 , update_every
275 , RRDSET_TYPE_STACKED
@@ -288,6 +302,8 @@ void generate_charts_arcstats(int update_every) {
302 , NULL
303 , "ZFS Metadata Hits"
304 , "percentage"
305 + , plugin
306 + , "zfs"
307 , 2050
308 , update_every
309 , RRDSET_TYPE_STACKED
@@ -320,6 +336,8 @@ void generate_charts_arcstats(int update_every) {
336 , NULL
337 , "ZFS L2 Hits"
338 , "percentage"
339 + , plugin
340 + , "zfs"
341 , 2060
342 , update_every
343 , RRDSET_TYPE_STACKED
@@ -354,6 +372,8 @@ void generate_charts_arcstats(int update_every) {
372 , NULL
373 , "ZFS List Hits"
374 , "hits/s"
375 + , plugin
376 + , "zfs"
377 , 2100
378 , update_every
379 , RRDSET_TYPE_AREA
@@ -375,7 +395,7 @@ void generate_charts_arcstats(int update_every) {
395 }
396 }
397
378 -void generate_charts_arc_summary(int update_every) {
398 +void generate_charts_arc_summary(const char *plugin, int update_every) {
399 unsigned long long arc_accesses_total = arcstats.hits + arcstats.misses;
400 unsigned long long real_hits = arcstats.mfu_hits + arcstats.mru_hits;
401 unsigned long long real_misses = arc_accesses_total - real_hits;
@@ -411,6 +431,8 @@ void generate_charts_arc_summary(int update_every) {
431 , NULL
432 , "ZFS ARC Size Breakdown"
433 , "percentage"
434 + , plugin
435 + , "zfs"
436 , 2020
437 , update_every
438 , RRDSET_TYPE_STACKED
@@ -448,6 +470,8 @@ void generate_charts_arc_summary(int update_every) {
470 , NULL
471 , "ZFS Memory Operations"
472 , "operations/s"
473 + , plugin
474 + , "zfs"
475 , 2023
476 , update_every
477 , RRDSET_TYPE_LINE
@@ -492,6 +516,8 @@ void generate_charts_arc_summary(int update_every) {
516 , NULL
517 , "ZFS Important Operations"
518 , "operations/s"
519 + , plugin
520 + , "zfs"
521 , 2022
522 , update_every
523 , RRDSET_TYPE_LINE
@@ -528,6 +554,8 @@ void generate_charts_arc_summary(int update_every) {
554 , NULL
555 , "ZFS Actual Cache Hits"
556 , "percentage"
557 + , plugin
558 + , "zfs"
559 , 2019
560 , update_every
561 , RRDSET_TYPE_STACKED
@@ -560,6 +588,8 @@ void generate_charts_arc_summary(int update_every) {
588 , NULL
589 , "ZFS Data Demand Efficiency"
590 , "percentage"
591 + , plugin
592 + , "zfs"
593 , 2031
594 , update_every
595 , RRDSET_TYPE_STACKED
@@ -592,6 +622,8 @@ void generate_charts_arc_summary(int update_every) {
622 , NULL
623 , "ZFS Data Prefetch Efficiency"
624 , "percentage"
625 + , plugin
626 + , "zfs"
627 , 2032
628 , update_every
629 , RRDSET_TYPE_STACKED
@@ -624,6 +656,8 @@ void generate_charts_arc_summary(int update_every) {
656 , NULL
657 , "ZFS ARC Hash Elements"
658 , "elements"
659 + , plugin
660 + , "zfs"
661 , 2300
662 , update_every
663 , RRDSET_TYPE_LINE
@@ -656,6 +690,8 @@ void generate_charts_arc_summary(int update_every) {
690 , NULL
691 , "ZFS ARC Hash Chains"
692 , "chains"
693 + , plugin
694 + , "zfs"
695 , 2310
696 , update_every
697 , RRDSET_TYPE_LINE
src/zfs_common.h
+2 -2
@@ -103,7 +103,7 @@ struct arcstats {
103
104 int l2exist;
105
106 -void generate_charts_arcstats(int update_every);
107 -void generate_charts_arc_summary(int update_every);
106 +void generate_charts_arcstats(const char *plugin, int update_every);
107 +void generate_charts_arc_summary(const char *plugin, int update_every);
108
109 #endif //NETDATA_ZFS_COMMON_H