@cryptotaxi247 / netdata-1 / commits / 6c9f0d2d7

all internal plugins create chart at localhost except plugins.d that respects the host specified by the plugin

Costa Tsaousis (ktsaou) committed Feb 18, 2017 at 16:47 UTC 6c9f0d2d75ee95bcaa74eed9fd9192eb24de7120
41 files changed +1018 -659
CMakeLists.txt
+1
@@ -28,6 +28,7 @@ set(NETDATA_SOURCE_FILES
28 src/dictionary.h
29 src/eval.c
30 src/eval.h
31 + src/freebsd_sysctl.c
32 src/global_statistics.c
33 src/global_statistics.h
34 src/health.c
src/backends.c
+12 -5
@@ -239,7 +239,9 @@ void *backends_main(void *ptr) {
239
240 RRDSET *chart_metrics = rrdset_find_localhost("netdata.backend_metrics");
241 if(!chart_metrics) {
242 - chart_metrics = rrdset_create("netdata", "backend_metrics", NULL, "backend", NULL, "Netdata Buffered Metrics", "metrics", 130600, frequency, RRDSET_TYPE_LINE);
242 + chart_metrics = rrdset_create_localhost("netdata", "backend_metrics", NULL, "backend", NULL
243 + , "Netdata Buffered Metrics", "metrics", 130600, frequency
244 + , RRDSET_TYPE_LINE);
245 rrddim_add(chart_metrics, "buffered", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
246 rrddim_add(chart_metrics, "lost", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
247 rrddim_add(chart_metrics, "sent", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -247,7 +249,8 @@ void *backends_main(void *ptr) {
249
250 RRDSET *chart_bytes = rrdset_find_localhost("netdata.backend_bytes");
251 if(!chart_bytes) {
250 - chart_bytes = rrdset_create("netdata", "backend_bytes", NULL, "backend", NULL, "Netdata Backend Data Size", "KB", 130610, frequency, RRDSET_TYPE_AREA);
252 + chart_bytes = rrdset_create_localhost("netdata", "backend_bytes", NULL, "backend", NULL
253 + , "Netdata Backend Data Size", "KB", 130610, frequency, RRDSET_TYPE_AREA);
254 rrddim_add(chart_bytes, "buffered", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
255 rrddim_add(chart_bytes, "lost", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
256 rrddim_add(chart_bytes, "sent", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -256,7 +259,9 @@ void *backends_main(void *ptr) {
259
260 RRDSET *chart_ops = rrdset_find_localhost("netdata.backend_ops");
261 if(!chart_ops) {
259 - chart_ops = rrdset_create("netdata", "backend_ops", NULL, "backend", NULL, "Netdata Backend Operations", "operations", 130630, frequency, RRDSET_TYPE_LINE);
262 + chart_ops = rrdset_create_localhost("netdata", "backend_ops", NULL, "backend", NULL
263 + , "Netdata Backend Operations", "operations", 130630, frequency
264 + , RRDSET_TYPE_LINE);
265 rrddim_add(chart_ops, "write", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
266 rrddim_add(chart_ops, "discard", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
267 rrddim_add(chart_ops, "reconnect", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -273,14 +278,16 @@ void *backends_main(void *ptr) {
278 *
279 RRDSET *chart_latency = rrdset_find_localhost("netdata.backend_latency");
280 if(!chart_latency) {
276 - chart_latency = rrdset_create("netdata", "backend_latency", NULL, "backend", NULL, "Netdata Backend Latency", "ms", 130620, frequency, RRDSET_TYPE_AREA);
281 + chart_latency = rrdset_create_localhost("netdata", "backend_latency", NULL, "backend", NULL, "Netdata Backend Latency", "ms", 130620, frequency, RRDSET_TYPE_AREA);
282 rrddim_add(chart_latency, "latency", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
283 }
284 */
285
286 RRDSET *chart_rusage = rrdset_find_localhost("netdata.backend_thread_cpu");
287 if(!chart_rusage) {
283 - chart_rusage = rrdset_create("netdata", "backend_thread_cpu", NULL, "backend", NULL, "NetData Backend Thread CPU usage", "milliseconds/s", 130630, frequency, RRDSET_TYPE_STACKED);
288 + chart_rusage = rrdset_create_localhost("netdata", "backend_thread_cpu", NULL, "backend", NULL
289 + , "NetData Backend Thread CPU usage", "milliseconds/s", 130630, frequency
290 + , RRDSET_TYPE_STACKED);
291 rrddim_add(chart_rusage, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
292 rrddim_add(chart_rusage, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
293 }
src/freebsd_sysctl.c
+348 -348
@@ -285,12 +285,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
285 error("DISABLED: system.load");
286 } else {
287
288 - st = rrdset_find_bytype("system", "load");
288 + st = rrdset_find_bytype_localhost("system", "load");
289 if (unlikely(!st)) {
290 - st = rrdset_create("system", "load", NULL, "load", NULL, "System Load Average", "load", 100, (update_every < MIN_LOADAVG_UPDATE_EVERY) ? MIN_LOADAVG_UPDATE_EVERY : update_every, RRDSET_TYPE_LINE);
291 - rrddim_add(st, "load1", NULL, 1, 1000, RRDDIM_ABSOLUTE);
292 - rrddim_add(st, "load5", NULL, 1, 1000, RRDDIM_ABSOLUTE);
293 - rrddim_add(st, "load15", NULL, 1, 1000, RRDDIM_ABSOLUTE);
290 + st = rrdset_create_localhost("system", "load", NULL, "load", NULL, "System Load Average", "load", 100, (update_every < MIN_LOADAVG_UPDATE_EVERY) ? MIN_LOADAVG_UPDATE_EVERY : update_every, RRDSET_TYPE_LINE);
291 + rrddim_add(st, "load1", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
292 + rrddim_add(st, "load5", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
293 + rrddim_add(st, "load15", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
294 }
295 else rrdset_next(st);
296
@@ -318,10 +318,10 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
318 } else {
319 if (likely(do_all_processes)) {
320
321 - st = rrdset_find_bytype("system", "active_processes");
321 + st = rrdset_find_bytype_localhost("system", "active_processes");
322 if (unlikely(!st)) {
323 - st = rrdset_create("system", "active_processes", NULL, "processes", NULL, "System Active Processes", "processes", 750, update_every, RRDSET_TYPE_LINE);
324 - rrddim_add(st, "active", NULL, 1, 1, RRDDIM_ABSOLUTE);
323 + st = rrdset_create_localhost("system", "active_processes", NULL, "processes", NULL, "System Active Processes", "processes", 750, update_every, RRDSET_TYPE_LINE);
324 + rrddim_add(st, "active", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
325 }
326 else rrdset_next(st);
327
@@ -333,12 +333,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
333
334 if (likely(do_processes)) {
335
336 - st = rrdset_find_bytype("system", "processes");
336 + st = rrdset_find_bytype_localhost("system", "processes");
337 if (unlikely(!st)) {
338 - st = rrdset_create("system", "processes", NULL, "processes", NULL, "System Processes", "processes", 600, update_every, RRDSET_TYPE_LINE);
338 + st = rrdset_create_localhost("system", "processes", NULL, "processes", NULL, "System Processes", "processes", 600, update_every, RRDSET_TYPE_LINE);
339
340 - rrddim_add(st, "running", NULL, 1, 1, RRDDIM_ABSOLUTE);
341 - rrddim_add(st, "blocked", NULL, -1, 1, RRDDIM_ABSOLUTE);
340 + rrddim_add(st, "running", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
341 + rrddim_add(st, "blocked", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
342 }
343 else rrdset_next(st);
344
@@ -350,12 +350,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
350 // --------------------------------------------------------------------
351
352 if (likely(do_committed)) {
353 - st = rrdset_find("mem.committed");
353 + st = rrdset_find_localhost("mem.committed");
354 if (unlikely(!st)) {
355 - st = rrdset_create("mem", "committed", NULL, "system", NULL, "Committed (Allocated) Memory", "MB", 5000, update_every, RRDSET_TYPE_AREA);
355 + st = rrdset_create_localhost("mem", "committed", NULL, "system", NULL, "Committed (Allocated) Memory", "MB", 5000, update_every, RRDSET_TYPE_AREA);
356 st->isdetail = 1;
357
358 - rrddim_add(st, "Committed_AS", NULL, system_pagesize, MEGA_FACTOR, RRDDIM_ABSOLUTE);
358 + rrddim_add(st, "Committed_AS", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
359 }
360 else rrdset_next(st);
361
@@ -378,15 +378,15 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
378 error("DISABLED: system.cpu");
379 } else {
380
381 - st = rrdset_find_bytype("system", "cpu");
381 + st = rrdset_find_bytype_localhost("system", "cpu");
382 if (unlikely(!st)) {
383 - st = rrdset_create("system", "cpu", NULL, "cpu", "system.cpu", "Total CPU utilization", "percentage", 100, update_every, RRDSET_TYPE_STACKED);
383 + st = rrdset_create_localhost("system", "cpu", NULL, "cpu", "system.cpu", "Total CPU utilization", "percentage", 100, update_every, RRDSET_TYPE_STACKED);
384
385 - rrddim_add(st, "user", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
386 - rrddim_add(st, "nice", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
387 - rrddim_add(st, "system", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
388 - rrddim_add(st, "interrupt", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
389 - rrddim_add(st, "idle", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
385 + rrddim_add(st, "user", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
386 + rrddim_add(st, "nice", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
387 + rrddim_add(st, "system", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
388 + rrddim_add(st, "interrupt", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
389 + rrddim_add(st, "idle", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
390 rrddim_hide(st, "idle");
391 }
392 else rrdset_next(st);
@@ -420,16 +420,16 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
420 } else {
421 for (i = 0; i < ncpus; i++) {
422 snprintfz(cpuid, MAX_INT_DIGITS, "cpu%d", i);
423 - st = rrdset_find_bytype("cpu", cpuid);
423 + st = rrdset_find_bytype_localhost("cpu", cpuid);
424 if (unlikely(!st)) {
425 - st = rrdset_create("cpu", cpuid, NULL, "utilization", "cpu.cpu", "Core utilization",
425 + st = rrdset_create_localhost("cpu", cpuid, NULL, "utilization", "cpu.cpu", "Core utilization",
426 "percentage", 1000, update_every, RRDSET_TYPE_STACKED);
427
428 - rrddim_add(st, "user", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
429 - rrddim_add(st, "nice", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
430 - rrddim_add(st, "system", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
431 - rrddim_add(st, "interrupt", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
432 - rrddim_add(st, "idle", NULL, 1, 1, RRDDIM_PCENT_OVER_DIFF_TOTAL);
428 + rrddim_add(st, "user", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
429 + rrddim_add(st, "nice", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
430 + rrddim_add(st, "system", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
431 + rrddim_add(st, "interrupt", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
432 + rrddim_add(st, "idle", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
433 rrddim_hide(st, "idle");
434 } else
435 rrdset_next(st);
@@ -463,12 +463,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
463 for (i = 0; i < nintr; i++)
464 totalintr += intrcnt[i];
465
466 - st = rrdset_find_bytype("system", "intr");
466 + st = rrdset_find_bytype_localhost("system", "intr");
467 if (unlikely(!st)) {
468 - st = rrdset_create("system", "intr", NULL, "interrupts", NULL, "Total Hardware Interrupts", "interrupts/s", 900, update_every, RRDSET_TYPE_LINE);
468 + st = rrdset_create_localhost("system", "intr", NULL, "interrupts", NULL, "Total Hardware Interrupts", "interrupts/s", 900, update_every, RRDSET_TYPE_LINE);
469 st->isdetail = 1;
470
471 - rrddim_add(st, "interrupts", NULL, 1, 1, RRDDIM_INCREMENTAL);
471 + rrddim_add(st, "interrupts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
472 }
473 else rrdset_next(st);
474
@@ -483,9 +483,9 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
483 do_interrupts = 0;
484 error("DISABLED: system.intr");
485 } else {
486 - st = rrdset_find_bytype("system", "interrupts");
486 + st = rrdset_find_bytype_localhost("system", "interrupts");
487 if (unlikely(!st))
488 - st = rrdset_create("system", "interrupts", NULL, "interrupts", NULL, "System interrupts", "interrupts/s",
488 + st = rrdset_create_localhost("system", "interrupts", NULL, "interrupts", NULL, "System interrupts", "interrupts/s",
489 1000, update_every, RRDSET_TYPE_STACKED);
490 else
491 rrdset_next(st);
@@ -495,7 +495,7 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
495 if (unlikely((intrcnt[i] != 0) && (*(char*)p != 0))) {
496 rd = rrddim_find(st, p);
497 if (unlikely(!rd))
498 - rd = rrddim_add(st, p, NULL, 1, 1, RRDDIM_INCREMENTAL);
498 + rd = rrddim_add(st, p, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
499 rrddim_set_by_pointer(st, rd, intrcnt[i]);
500 }
501 }
@@ -513,11 +513,11 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
513 error("DISABLED: system.dev_intr");
514 } else {
515
516 - st = rrdset_find_bytype("system", "dev_intr");
516 + st = rrdset_find_bytype_localhost("system", "dev_intr");
517 if (unlikely(!st)) {
518 - st = rrdset_create("system", "dev_intr", NULL, "interrupts", NULL, "Device Interrupts", "interrupts/s", 1000, update_every, RRDSET_TYPE_LINE);
518 + st = rrdset_create_localhost("system", "dev_intr", NULL, "interrupts", NULL, "Device Interrupts", "interrupts/s", 1000, update_every, RRDSET_TYPE_LINE);
519
520 - rrddim_add(st, "interrupts", NULL, 1, 1, RRDDIM_INCREMENTAL);
520 + rrddim_add(st, "interrupts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
521 }
522 else rrdset_next(st);
523
@@ -534,11 +534,11 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
534 error("DISABLED: system.dev_intr");
535 } else {
536
537 - st = rrdset_find_bytype("system", "soft_intr");
537 + st = rrdset_find_bytype_localhost("system", "soft_intr");
538 if (unlikely(!st)) {
539 - st = rrdset_create("system", "soft_intr", NULL, "interrupts", NULL, "Software Interrupts", "interrupts/s", 1100, update_every, RRDSET_TYPE_LINE);
539 + st = rrdset_create_localhost("system", "soft_intr", NULL, "interrupts", NULL, "Software Interrupts", "interrupts/s", 1100, update_every, RRDSET_TYPE_LINE);
540
541 - rrddim_add(st, "interrupts", NULL, 1, 1, RRDDIM_INCREMENTAL);
541 + rrddim_add(st, "interrupts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
542 }
543 else rrdset_next(st);
544
@@ -555,11 +555,11 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
555 error("DISABLED: system.ctxt");
556 } else {
557
558 - st = rrdset_find_bytype("system", "ctxt");
558 + st = rrdset_find_bytype_localhost("system", "ctxt");
559 if (unlikely(!st)) {
560 - st = rrdset_create("system", "ctxt", NULL, "processes", NULL, "CPU Context Switches", "context switches/s", 800, update_every, RRDSET_TYPE_LINE);
560 + st = rrdset_create_localhost("system", "ctxt", NULL, "processes", NULL, "CPU Context Switches", "context switches/s", 800, update_every, RRDSET_TYPE_LINE);
561
562 - rrddim_add(st, "switches", NULL, 1, 1, RRDDIM_INCREMENTAL);
562 + rrddim_add(st, "switches", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
563 }
564 else rrdset_next(st);
565
@@ -576,12 +576,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
576 error("DISABLED: system.forks");
577 } else {
578
579 - st = rrdset_find_bytype("system", "forks");
579 + st = rrdset_find_bytype_localhost("system", "forks");
580 if (unlikely(!st)) {
581 - st = rrdset_create("system", "forks", NULL, "processes", NULL, "Started Processes", "processes/s", 700, update_every, RRDSET_TYPE_LINE);
581 + st = rrdset_create_localhost("system", "forks", NULL, "processes", NULL, "Started Processes", "processes/s", 700, update_every, RRDSET_TYPE_LINE);
582 st->isdetail = 1;
583
584 - rrddim_add(st, "started", NULL, 1, 1, RRDDIM_INCREMENTAL);
584 + rrddim_add(st, "started", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
585 }
586 else rrdset_next(st);
587
@@ -612,12 +612,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
612
613 // --------------------------------------------------------------------
614
615 - st = rrdset_find_bytype(RRD_TYPE_DISK, disk);
615 + st = rrdset_find_bytype_localhost(RRD_TYPE_DISK, disk);
616 if (unlikely(!st)) {
617 - st = rrdset_create(RRD_TYPE_DISK, disk, NULL, disk, "disk.io", "Disk I/O Bandwidth", "kilobytes/s", 2000, update_every, RRDSET_TYPE_AREA);
617 + st = rrdset_create_localhost(RRD_TYPE_DISK, disk, NULL, disk, "disk.io", "Disk I/O Bandwidth", "kilobytes/s", 2000, update_every, RRDSET_TYPE_AREA);
618
619 - rrddim_add(st, "reads", NULL, 1, 1024, RRDDIM_INCREMENTAL);
620 - rrddim_add(st, "writes", NULL, -1, 1024, RRDDIM_INCREMENTAL);
619 + rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
620 + rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
621 }
622 else rrdset_next(st);
623
@@ -629,13 +629,13 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
629
630 // --------------------------------------------------------------------
631
632 - st = rrdset_find_bytype("disk_ops", disk);
632 + st = rrdset_find_bytype_localhost("disk_ops", disk);
633 if (unlikely(!st)) {
634 - st = rrdset_create("disk_ops", disk, NULL, disk, "disk.ops", "Disk Completed I/O Operations", "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
634 + st = rrdset_create_localhost("disk_ops", disk, NULL, disk, "disk.ops", "Disk Completed I/O Operations", "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
635 st->isdetail = 1;
636
637 - rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_INCREMENTAL);
638 - rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_INCREMENTAL);
637 + rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
638 + rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
639 }
640 else rrdset_next(st);
641
@@ -645,12 +645,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
645
646 // --------------------------------------------------------------------
647
648 - st = rrdset_find_bytype("disk_qops", disk);
648 + st = rrdset_find_bytype_localhost("disk_qops", disk);
649 if (unlikely(!st)) {
650 - st = rrdset_create("disk_qops", disk, NULL, disk, "disk.qops", "Disk Current I/O Operations", "operations", 2002, update_every, RRDSET_TYPE_LINE);
650 + st = rrdset_create_localhost("disk_qops", disk, NULL, disk, "disk.qops", "Disk Current I/O Operations", "operations", 2002, update_every, RRDSET_TYPE_LINE);
651 st->isdetail = 1;
652
653 - rrddim_add(st, "operations", NULL, 1, 1, RRDDIM_ABSOLUTE);
653 + rrddim_add(st, "operations", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
654 }
655 else rrdset_next(st);
656
@@ -659,12 +659,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
659
660 // --------------------------------------------------------------------
661
662 - st = rrdset_find_bytype("disk_util", disk);
662 + st = rrdset_find_bytype_localhost("disk_util", disk);
663 if (unlikely(!st)) {
664 - st = rrdset_create("disk_util", disk, NULL, disk, "disk.util", "Disk Utilization Time", "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
664 + st = rrdset_create_localhost("disk_util", disk, NULL, disk, "disk.util", "Disk Utilization Time", "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
665 st->isdetail = 1;
666
667 - rrddim_add(st, "utilization", NULL, 1, 10, RRDDIM_INCREMENTAL);
667 + rrddim_add(st, "utilization", NULL, 1, 10, RRD_ALGORITHM_INCREMENTAL);
668 }
669 else rrdset_next(st);
670
@@ -674,13 +674,13 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
674
675 // --------------------------------------------------------------------
676
677 - st = rrdset_find_bytype("disk_iotime", disk);
677 + st = rrdset_find_bytype_localhost("disk_iotime", disk);
678 if (unlikely(!st)) {
679 - st = rrdset_create("disk_iotime", disk, NULL, disk, "disk.iotime", "Disk Total I/O Time", "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
679 + st = rrdset_create_localhost("disk_iotime", disk, NULL, disk, "disk.iotime", "Disk Total I/O Time", "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
680 st->isdetail = 1;
681
682 - rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_INCREMENTAL);
683 - rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_INCREMENTAL);
682 + rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
683 + rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
684 }
685 else rrdset_next(st);
686
@@ -698,13 +698,13 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
698
699 // --------------------------------------------------------------------
700
701 - st = rrdset_find_bytype("disk_await", disk);
701 + st = rrdset_find_bytype_localhost("disk_await", disk);
702 if (unlikely(!st)) {
703 - st = rrdset_create("disk_await", disk, NULL, disk, "disk.await", "Average Completed I/O Operation Time", "ms per operation", 2005, update_every, RRDSET_TYPE_LINE);
703 + st = rrdset_create_localhost("disk_await", disk, NULL, disk, "disk.await", "Average Completed I/O Operation Time", "ms per operation", 2005, update_every, RRDSET_TYPE_LINE);
704 st->isdetail = 1;
705
706 - rrddim_add(st, "reads", NULL, 1, 1, RRDDIM_ABSOLUTE);
707 - rrddim_add(st, "writes", NULL, -1, 1, RRDDIM_ABSOLUTE);
706 + rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
707 + rrddim_add(st, "writes", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
708 }
709 else rrdset_next(st);
710
@@ -716,13 +716,13 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
716
717 // --------------------------------------------------------------------
718
719 - st = rrdset_find_bytype("disk_avgsz", disk);
719 + st = rrdset_find_bytype_localhost("disk_avgsz", disk);
720 if (unlikely(!st)) {
721 - st = rrdset_create("disk_avgsz", disk, NULL, disk, "disk.avgsz", "Average Completed I/O Operation Bandwidth", "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
721 + st = rrdset_create_localhost("disk_avgsz", disk, NULL, disk, "disk.avgsz", "Average Completed I/O Operation Bandwidth", "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
722 st->isdetail = 1;
723
724 - rrddim_add(st, "reads", NULL, 1, 1024, RRDDIM_ABSOLUTE);
725 - rrddim_add(st, "writes", NULL, -1, 1024, RRDDIM_ABSOLUTE);
724 + rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
725 + rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_ABSOLUTE);
726 }
727 else rrdset_next(st);
728
@@ -734,12 +734,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
734
735 // --------------------------------------------------------------------
736
737 - st = rrdset_find_bytype("disk_svctm", disk);
737 + st = rrdset_find_bytype_localhost("disk_svctm", disk);
738 if (unlikely(!st)) {
739 - st = rrdset_create("disk_svctm", disk, NULL, disk, "disk.svctm", "Average Service Time", "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
739 + st = rrdset_create_localhost("disk_svctm", disk, NULL, disk, "disk.svctm", "Average Service Time", "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
740 st->isdetail = 1;
741
742 - rrddim_add(st, "svctm", NULL, 1, 1, RRDDIM_ABSOLUTE);
742 + rrddim_add(st, "svctm", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
743 }
744 else rrdset_next(st);
745
@@ -752,11 +752,11 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
752
753 // --------------------------------------------------------------------
754
755 - st = rrdset_find_bytype("system", "io");
755 + st = rrdset_find_bytype_localhost("system", "io");
756 if (unlikely(!st)) {
757 - st = rrdset_create("system", "io", NULL, "disk", NULL, "Disk I/O", "kilobytes/s", 150, update_every, RRDSET_TYPE_AREA);
758 - rrddim_add(st, "in", NULL, 1, 1, RRDDIM_INCREMENTAL);
759 - rrddim_add(st, "out", NULL, -1, 1, RRDDIM_INCREMENTAL);
757 + st = rrdset_create_localhost("system", "io", NULL, "disk", NULL, "Disk I/O", "kilobytes/s", 150, update_every, RRDSET_TYPE_AREA);
758 + rrddim_add(st, "in", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
759 + rrddim_add(st, "out", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
760 }
761 else rrdset_next(st);
762
@@ -798,13 +798,13 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
798 }
799
800 if (likely(do_swap)) {
801 - st = rrdset_find("system.swap");
801 + st = rrdset_find_localhost("system.swap");
802 if (unlikely(!st)) {
803 - st = rrdset_create("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every, RRDSET_TYPE_STACKED);
803 + st = rrdset_create_localhost("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every, RRDSET_TYPE_STACKED);
804 st->isdetail = 1;
805
806 - rrddim_add(st, "free", NULL, system_pagesize, MEGA_FACTOR, RRDDIM_ABSOLUTE);
807 - rrddim_add(st, "used", NULL, system_pagesize, MEGA_FACTOR, RRDDIM_ABSOLUTE);
806 + rrddim_add(st, "free", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
807 + rrddim_add(st, "used", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
808 }
809 else rrdset_next(st);
810
@@ -829,18 +829,18 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
829 do_ram = 0;
830 error("DISABLED: system.ram");
831 } else {
832 - st = rrdset_find("system.ram");
832 + st = rrdset_find_localhost("system.ram");
833 if (unlikely(!st)) {
834 - st = rrdset_create("system", "ram", NULL, "ram", NULL, "System RAM", "MB", 200, update_every, RRDSET_TYPE_STACKED);
834 + st = rrdset_create_localhost("system", "ram", NULL, "ram", NULL, "System RAM", "MB", 200, update_every, RRDSET_TYPE_STACKED);
835
836 - rrddim_add(st, "active", NULL, system_pagesize, MEGA_FACTOR, RRDDIM_ABSOLUTE);
837 - rrddim_add(st, "inactive", NULL, system_pagesize, MEGA_FACTOR, RRDDIM_ABSOLUTE);
838 - rrddim_add(st, "wired", NULL, system_pagesize, MEGA_FACTOR, RRDDIM_ABSOLUTE);
836 + rrddim_add(st, "active", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
837 + rrddim_add(st, "inactive", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
838 + rrddim_add(st, "wired", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
839 #if __FreeBSD_version < 1200016
840 - rrddim_add(st, "cache", NULL, system_pagesize, MEGA_FACTOR, RRDDIM_ABSOLUTE);
840 + rrddim_add(st, "cache", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
841 #endif
842 - rrddim_add(st, "buffers", NULL, 1, MEGA_FACTOR, RRDDIM_ABSOLUTE);
843 - rrddim_add(st, "free", NULL, system_pagesize, MEGA_FACTOR, RRDDIM_ABSOLUTE);
842 + rrddim_add(st, "buffers", NULL, 1, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
843 + rrddim_add(st, "free", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
844 }
845 else rrdset_next(st);
846
@@ -863,12 +863,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
863 do_swapio = 0;
864 error("DISABLED: system.swapio");
865 } else {
866 - st = rrdset_find("system.swapio");
866 + st = rrdset_find_localhost("system.swapio");
867 if (unlikely(!st)) {
868 - st = rrdset_create("system", "swapio", NULL, "swap", NULL, "Swap I/O", "kilobytes/s", 250, update_every, RRDSET_TYPE_AREA);
868 + st = rrdset_create_localhost("system", "swapio", NULL, "swap", NULL, "Swap I/O", "kilobytes/s", 250, update_every, RRDSET_TYPE_AREA);
869
870 - rrddim_add(st, "in", NULL, system_pagesize, 1024, RRDDIM_INCREMENTAL);
871 - rrddim_add(st, "out", NULL, -system_pagesize, 1024, RRDDIM_INCREMENTAL);
870 + rrddim_add(st, "in", NULL, system_pagesize, 1024, RRD_ALGORITHM_INCREMENTAL);
871 + rrddim_add(st, "out", NULL, -system_pagesize, 1024, RRD_ALGORITHM_INCREMENTAL);
872 }
873 else rrdset_next(st);
874
@@ -889,16 +889,16 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
889 do_pgfaults = 0;
890 error("DISABLED: mem.pgfaults");
891 } else {
892 - st = rrdset_find("mem.pgfaults");
892 + st = rrdset_find_localhost("mem.pgfaults");
893 if (unlikely(!st)) {
894 - st = rrdset_create("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults", "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
894 + st = rrdset_create_localhost("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults", "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
895 st->isdetail = 1;
896
897 - rrddim_add(st, "memory", NULL, 1, 1, RRDDIM_INCREMENTAL);
898 - rrddim_add(st, "io_requiring", NULL, 1, 1, RRDDIM_INCREMENTAL);
899 - rrddim_add(st, "cow", NULL, 1, 1, RRDDIM_INCREMENTAL);
900 - rrddim_add(st, "cow_optimized", NULL, 1, 1, RRDDIM_INCREMENTAL);
901 - rrddim_add(st, "in_transit", NULL, 1, 1, RRDDIM_INCREMENTAL);
897 + rrddim_add(st, "memory", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
898 + rrddim_add(st, "io_requiring", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
899 + rrddim_add(st, "cow", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
900 + rrddim_add(st, "cow_optimized", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
901 + rrddim_add(st, "in_transit", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
902 }
903 else rrdset_next(st);
904
@@ -934,10 +934,10 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
934
935 // --------------------------------------------------------------------
936
937 - st = rrdset_find("system.ipc_semaphores");
937 + st = rrdset_find_localhost("system.ipc_semaphores");
938 if (unlikely(!st)) {
939 - st = rrdset_create("system", "ipc_semaphores", NULL, "ipc semaphores", NULL, "IPC Semaphores", "semaphores", 1000, rrd_update_every, RRDSET_TYPE_AREA);
940 - rrddim_add(st, "semaphores", NULL, 1, 1, RRDDIM_ABSOLUTE);
939 + st = rrdset_create_localhost("system", "ipc_semaphores", NULL, "ipc semaphores", NULL, "IPC Semaphores", "semaphores", 1000, rrd_update_every, RRDSET_TYPE_AREA);
940 + rrddim_add(st, "semaphores", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
941 }
942 else rrdset_next(st);
943
@@ -946,10 +946,10 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
946
947 // --------------------------------------------------------------------
948
949 - st = rrdset_find("system.ipc_semaphore_arrays");
949 + st = rrdset_find_localhost("system.ipc_semaphore_arrays");
950 if (unlikely(!st)) {
951 - st = rrdset_create("system", "ipc_semaphore_arrays", NULL, "ipc semaphores", NULL, "IPC Semaphore Arrays", "arrays", 1000, rrd_update_every, RRDSET_TYPE_AREA);
952 - rrddim_add(st, "arrays", NULL, 1, 1, RRDDIM_ABSOLUTE);
951 + st = rrdset_create_localhost("system", "ipc_semaphore_arrays", NULL, "ipc semaphores", NULL, "IPC Semaphore Arrays", "arrays", 1000, rrd_update_every, RRDSET_TYPE_AREA);
952 + rrddim_add(st, "arrays", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
953 }
954 else rrdset_next(st);
955
@@ -982,10 +982,10 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
982
983 // --------------------------------------------------------------------
984
985 - st = rrdset_find("system.ipc_shared_mem_segs");
985 + st = rrdset_find_localhost("system.ipc_shared_mem_segs");
986 if (unlikely(!st)) {
987 - st = rrdset_create("system", "ipc_shared_mem_segs", NULL, "ipc shared memory", NULL, "IPC Shared Memory Segments", "segments", 1000, rrd_update_every, RRDSET_TYPE_AREA);
988 - rrddim_add(st, "segments", NULL, 1, 1, RRDDIM_ABSOLUTE);
987 + st = rrdset_create_localhost("system", "ipc_shared_mem_segs", NULL, "ipc shared memory", NULL, "IPC Shared Memory Segments", "segments", 1000, rrd_update_every, RRDSET_TYPE_AREA);
988 + rrddim_add(st, "segments", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
989 }
990 else rrdset_next(st);
991
@@ -994,10 +994,10 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
994
995 // --------------------------------------------------------------------
996
997 - st = rrdset_find("system.ipc_shared_mem_size");
997 + st = rrdset_find_localhost("system.ipc_shared_mem_size");
998 if (unlikely(!st)) {
999 - st = rrdset_create("system", "ipc_shared_mem_size", NULL, "ipc shared memory", NULL, "IPC Shared Memory Segments Size", "kilobytes", 1000, rrd_update_every, RRDSET_TYPE_AREA);
1000 - rrddim_add(st, "allocated", NULL, 1, 1024, RRDDIM_ABSOLUTE);
999 + st = rrdset_create_localhost("system", "ipc_shared_mem_size", NULL, "ipc shared memory", NULL, "IPC Shared Memory Segments Size", "kilobytes", 1000, rrd_update_every, RRDSET_TYPE_AREA);
1000 + rrddim_add(st, "allocated", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
1001 }
1002 else rrdset_next(st);
1003
@@ -1034,10 +1034,10 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1034
1035 // --------------------------------------------------------------------
1036
1037 - st = rrdset_find("system.ipc_msq_queues");
1037 + st = rrdset_find_localhost("system.ipc_msq_queues");
1038 if (unlikely(!st)) {
1039 - st = rrdset_create("system", "ipc_msq_queues", NULL, "ipc message queues", NULL, "Number of IPC Message Queues", "queues", 990, rrd_update_every, RRDSET_TYPE_AREA);
1040 - rrddim_add(st, "queues", NULL, 1, 1, RRDDIM_ABSOLUTE);
1039 + st = rrdset_create_localhost("system", "ipc_msq_queues", NULL, "ipc message queues", NULL, "Number of IPC Message Queues", "queues", 990, rrd_update_every, RRDSET_TYPE_AREA);
1040 + rrddim_add(st, "queues", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1041 }
1042 else rrdset_next(st);
1043
@@ -1046,10 +1046,10 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1046
1047 // --------------------------------------------------------------------
1048
1049 - st = rrdset_find("system.ipc_msq_messages");
1049 + st = rrdset_find_localhost("system.ipc_msq_messages");
1050 if (unlikely(!st)) {
1051 - st = rrdset_create("system", "ipc_msq_messages", NULL, "ipc message queues", NULL, "Number of Messages in IPC Message Queues", "messages", 1000, rrd_update_every, RRDSET_TYPE_AREA);
1052 - rrddim_add(st, "messages", NULL, 1, 1, RRDDIM_ABSOLUTE);
1051 + st = rrdset_create_localhost("system", "ipc_msq_messages", NULL, "ipc message queues", NULL, "Number of Messages in IPC Message Queues", "messages", 1000, rrd_update_every, RRDSET_TYPE_AREA);
1052 + rrddim_add(st, "messages", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1053 }
1054 else rrdset_next(st);
1055
@@ -1058,11 +1058,11 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1058
1059 // --------------------------------------------------------------------
1060
1061 - st = rrdset_find("system.ipc_msq_size");
1061 + st = rrdset_find_localhost("system.ipc_msq_size");
1062 if (unlikely(!st)) {
1063 - st = rrdset_create("system", "ipc_msq_size", NULL, "ipc message queues", NULL, "Size of IPC Message Queues", "bytes", 1100, rrd_update_every, RRDSET_TYPE_LINE);
1064 - rrddim_add(st, "allocated", NULL, 1, 1, RRDDIM_ABSOLUTE);
1065 - rrddim_add(st, "used", NULL, 1, 1, RRDDIM_ABSOLUTE);
1063 + st = rrdset_create_localhost("system", "ipc_msq_size", NULL, "ipc message queues", NULL, "Size of IPC Message Queues", "bytes", 1100, rrd_update_every, RRDSET_TYPE_LINE);
1064 + rrddim_add(st, "allocated", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1065 + rrddim_add(st, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1066 }
1067 else rrdset_next(st);
1068
@@ -1129,13 +1129,13 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1129 // --------------------------------------------------------------------
1130
1131 if (likely(do_netisr)) {
1132 - st = rrdset_find_bytype("system", "softnet_stat");
1132 + st = rrdset_find_bytype_localhost("system", "softnet_stat");
1133 if (unlikely(!st)) {
1134 - st = rrdset_create("system", "softnet_stat", NULL, "softnet_stat", NULL, "System softnet_stat", "events/s", 955, update_every, RRDSET_TYPE_LINE);
1135 - rrddim_add(st, "dispatched", NULL, 1, 1, RRDDIM_INCREMENTAL);
1136 - rrddim_add(st, "hybrid_dispatched", NULL, 1, 1, RRDDIM_INCREMENTAL);
1137 - rrddim_add(st, "qdrops", NULL, 1, 1, RRDDIM_INCREMENTAL);
1138 - rrddim_add(st, "queued", NULL, 1, 1, RRDDIM_INCREMENTAL);
1134 + st = rrdset_create_localhost("system", "softnet_stat", NULL, "softnet_stat", NULL, "System softnet_stat", "events/s", 955, update_every, RRDSET_TYPE_LINE);
1135 + rrddim_add(st, "dispatched", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1136 + rrddim_add(st, "hybrid_dispatched", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1137 + rrddim_add(st, "qdrops", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1138 + rrddim_add(st, "queued", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1139 }
1140 else rrdset_next(st);
1141
@@ -1152,13 +1152,13 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1152 for (i = 0; i < ncpus ;i++) {
1153 snprintfz(netstat_cpuid, 21, "cpu%d_softnet_stat", i);
1154
1155 - st = rrdset_find_bytype("cpu", netstat_cpuid);
1155 + st = rrdset_find_bytype_localhost("cpu", netstat_cpuid);
1156 if (unlikely(!st)) {
1157 - st = rrdset_create("cpu", netstat_cpuid, NULL, "softnet_stat", NULL, "Per CPU netisr statistics", "events/s", 1101 + i, update_every, RRDSET_TYPE_LINE);
1158 - rrddim_add(st, "dispatched", NULL, 1, 1, RRDDIM_INCREMENTAL);
1159 - rrddim_add(st, "hybrid_dispatched", NULL, 1, 1, RRDDIM_INCREMENTAL);
1160 - rrddim_add(st, "qdrops", NULL, 1, 1, RRDDIM_INCREMENTAL);
1161 - rrddim_add(st, "queued", NULL, 1, 1, RRDDIM_INCREMENTAL);
1157 + st = rrdset_create_localhost("cpu", netstat_cpuid, NULL, "softnet_stat", NULL, "Per CPU netisr statistics", "events/s", 1101 + i, update_every, RRDSET_TYPE_LINE);
1158 + rrddim_add(st, "dispatched", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1159 + rrddim_add(st, "hybrid_dispatched", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1160 + rrddim_add(st, "qdrops", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1161 + rrddim_add(st, "queued", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1162 }
1163 else rrdset_next(st);
1164
@@ -1186,12 +1186,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1186 iftot.ift_obytes += IFA_DATA(obytes);
1187 }
1188
1189 - st = rrdset_find("system.ipv4");
1189 + st = rrdset_find_localhost("system.ipv4");
1190 if (unlikely(!st)) {
1191 - st = rrdset_create("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
1191 + st = rrdset_create_localhost("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
1192
1193 - rrddim_add(st, "InOctets", "received", 8, 1024, RRDDIM_INCREMENTAL);
1194 - rrddim_add(st, "OutOctets", "sent", -8, 1024, RRDDIM_INCREMENTAL);
1193 + rrddim_add(st, "InOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
1194 + rrddim_add(st, "OutOctets", "sent", -8, 1024, RRD_ALGORITHM_INCREMENTAL);
1195 }
1196 else rrdset_next(st);
1197
@@ -1209,12 +1209,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1209 iftot.ift_obytes += IFA_DATA(obytes);
1210 }
1211
1212 - st = rrdset_find("system.ipv6");
1212 + st = rrdset_find_localhost("system.ipv6");
1213 if (unlikely(!st)) {
1214 - st = rrdset_create("system", "ipv6", NULL, "network", NULL, "IPv6 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
1214 + st = rrdset_create_localhost("system", "ipv6", NULL, "network", NULL, "IPv6 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
1215
1216 - rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_INCREMENTAL);
1217 - rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_INCREMENTAL);
1216 + rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
1217 + rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
1218 }
1219 else rrdset_next(st);
1220
@@ -1228,12 +1228,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1228
1229 // --------------------------------------------------------------------
1230
1231 - st = rrdset_find_bytype("net", ifa->ifa_name);
1231 + st = rrdset_find_bytype_localhost("net", ifa->ifa_name);
1232 if (unlikely(!st)) {
1233 - st = rrdset_create("net", ifa->ifa_name, NULL, ifa->ifa_name, "net.net", "Bandwidth", "kilobits/s", 7000, update_every, RRDSET_TYPE_AREA);
1233 + st = rrdset_create_localhost("net", ifa->ifa_name, NULL, ifa->ifa_name, "net.net", "Bandwidth", "kilobits/s", 7000, update_every, RRDSET_TYPE_AREA);
1234
1235 - rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_INCREMENTAL);
1236 - rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_INCREMENTAL);
1235 + rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
1236 + rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
1237 }
1238 else rrdset_next(st);
1239
@@ -1243,15 +1243,15 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1243
1244 // --------------------------------------------------------------------
1245
1246 - st = rrdset_find_bytype("net_packets", ifa->ifa_name);
1246 + st = rrdset_find_bytype_localhost("net_packets", ifa->ifa_name);
1247 if (unlikely(!st)) {
1248 - st = rrdset_create("net_packets", ifa->ifa_name, NULL, ifa->ifa_name, "net.packets", "Packets", "packets/s", 7001, update_every, RRDSET_TYPE_LINE);
1248 + st = rrdset_create_localhost("net_packets", ifa->ifa_name, NULL, ifa->ifa_name, "net.packets", "Packets", "packets/s", 7001, update_every, RRDSET_TYPE_LINE);
1249 st->isdetail = 1;
1250
1251 - rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
1252 - rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
1253 - rrddim_add(st, "multicast_received", NULL, 1, 1, RRDDIM_INCREMENTAL);
1254 - rrddim_add(st, "multicast_sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
1251 + rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1252 + rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1253 + rrddim_add(st, "multicast_received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1254 + rrddim_add(st, "multicast_sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1255 }
1256 else rrdset_next(st);
1257
@@ -1263,13 +1263,13 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1263
1264 // --------------------------------------------------------------------
1265
1266 - st = rrdset_find_bytype("net_errors", ifa->ifa_name);
1266 + st = rrdset_find_bytype_localhost("net_errors", ifa->ifa_name);
1267 if (unlikely(!st)) {
1268 - st = rrdset_create("net_errors", ifa->ifa_name, NULL, ifa->ifa_name, "net.errors", "Interface Errors", "errors/s", 7002, update_every, RRDSET_TYPE_LINE);
1268 + st = rrdset_create_localhost("net_errors", ifa->ifa_name, NULL, ifa->ifa_name, "net.errors", "Interface Errors", "errors/s", 7002, update_every, RRDSET_TYPE_LINE);
1269 st->isdetail = 1;
1270
1271 - rrddim_add(st, "inbound", NULL, 1, 1, RRDDIM_INCREMENTAL);
1272 - rrddim_add(st, "outbound", NULL, -1, 1, RRDDIM_INCREMENTAL);
1271 + rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1272 + rrddim_add(st, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1273 }
1274 else rrdset_next(st);
1275
@@ -1279,14 +1279,14 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1279
1280 // --------------------------------------------------------------------
1281
1282 - st = rrdset_find_bytype("net_drops", ifa->ifa_name);
1282 + st = rrdset_find_bytype_localhost("net_drops", ifa->ifa_name);
1283 if (unlikely(!st)) {
1284 - st = rrdset_create("net_drops", ifa->ifa_name, NULL, ifa->ifa_name, "net.drops", "Interface Drops", "drops/s", 7003, update_every, RRDSET_TYPE_LINE);
1284 + st = rrdset_create_localhost("net_drops", ifa->ifa_name, NULL, ifa->ifa_name, "net.drops", "Interface Drops", "drops/s", 7003, update_every, RRDSET_TYPE_LINE);
1285 st->isdetail = 1;
1286
1287 - rrddim_add(st, "inbound", NULL, 1, 1, RRDDIM_INCREMENTAL);
1287 + rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1288 #if __FreeBSD__ >= 11
1289 - rrddim_add(st, "outbound", NULL, -1, 1, RRDDIM_INCREMENTAL);
1289 + rrddim_add(st, "outbound", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1290 #endif
1291 }
1292 else rrdset_next(st);
@@ -1299,14 +1299,14 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1299
1300 // --------------------------------------------------------------------
1301
1302 - st = rrdset_find_bytype("net_events", ifa->ifa_name);
1302 + st = rrdset_find_bytype_localhost("net_events", ifa->ifa_name);
1303 if (unlikely(!st)) {
1304 - st = rrdset_create("net_events", ifa->ifa_name, NULL, ifa->ifa_name, "net.events", "Network Interface Events", "events/s", 7006, update_every, RRDSET_TYPE_LINE);
1304 + st = rrdset_create_localhost("net_events", ifa->ifa_name, NULL, ifa->ifa_name, "net.events", "Network Interface Events", "events/s", 7006, update_every, RRDSET_TYPE_LINE);
1305 st->isdetail = 1;
1306
1307 - rrddim_add(st, "frames", NULL, 1, 1, RRDDIM_INCREMENTAL);
1308 - rrddim_add(st, "collisions", NULL, -1, 1, RRDDIM_INCREMENTAL);
1309 - rrddim_add(st, "carrier", NULL, -1, 1, RRDDIM_INCREMENTAL);
1307 + rrddim_add(st, "frames", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1308 + rrddim_add(st, "collisions", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1309 + rrddim_add(st, "carrier", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1310 }
1311 else rrdset_next(st);
1312
@@ -1327,12 +1327,12 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1327 error("DISABLED: ipv4.tcpsock");
1328 } else {
1329 if (likely(do_tcp_sockets)) {
1330 - st = rrdset_find("ipv4.tcpsock");
1330 + st = rrdset_find_localhost("ipv4.tcpsock");
1331 if (unlikely(!st)) {
1332 - st = rrdset_create("ipv4", "tcpsock", NULL, "tcp", NULL, "IPv4 TCP Connections",
1332 + st = rrdset_create_localhost("ipv4", "tcpsock", NULL, "tcp", NULL, "IPv4 TCP Connections",
1333 "active connections", 2500, update_every, RRDSET_TYPE_LINE);
1334
1335 - rrddim_add(st, "CurrEstab", "connections", 1, 1, RRDDIM_ABSOLUTE);
1335 + rrddim_add(st, "CurrEstab", "connections", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1336 } else
1337 rrdset_next(st);
1338
@@ -1363,14 +1363,14 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1363 error("DISABLED: ipv4.ecnpkts");
1364 } else {
1365 if (likely(do_tcp_packets)) {
1366 - st = rrdset_find("ipv4.tcppackets");
1366 + st = rrdset_find_localhost("ipv4.tcppackets");
1367 if (unlikely(!st)) {
1368 - st = rrdset_create("ipv4", "tcppackets", NULL, "tcp", NULL, "IPv4 TCP Packets",
1368 + st = rrdset_create_localhost("ipv4", "tcppackets", NULL, "tcp", NULL, "IPv4 TCP Packets",
1369 "packets/s",
1370 2600, update_every, RRDSET_TYPE_LINE);
1371
1372 - rrddim_add(st, "InSegs", "received", 1, 1, RRDDIM_INCREMENTAL);
1373 - rrddim_add(st, "OutSegs", "sent", -1, 1, RRDDIM_INCREMENTAL);
1372 + rrddim_add(st, "InSegs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1373 + rrddim_add(st, "OutSegs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1374 } else
1375 rrdset_next(st);
1376
@@ -1382,16 +1382,16 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1382 // --------------------------------------------------------------------
1383
1384 if (likely(do_tcp_errors)) {
1385 - st = rrdset_find("ipv4.tcperrors");
1385 + st = rrdset_find_localhost("ipv4.tcperrors");
1386 if (unlikely(!st)) {
1387 - st = rrdset_create("ipv4", "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors",
1387 + st = rrdset_create_localhost("ipv4", "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors",
1388 "packets/s",
1389 2700, update_every, RRDSET_TYPE_LINE);
1390 st->isdetail = 1;
1391
1392 - rrddim_add(st, "InErrs", NULL, 1, 1, RRDDIM_INCREMENTAL);
1393 - rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
1394 - rrddim_add(st, "RetransSegs", NULL, -1, 1, RRDDIM_INCREMENTAL);
1392 + rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1393 + rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1394 + rrddim_add(st, "RetransSegs", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1395 } else
1396 rrdset_next(st);
1397
@@ -1408,17 +1408,17 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1408 // --------------------------------------------------------------------
1409
1410 if (likely(do_tcp_handshake)) {
1411 - st = rrdset_find("ipv4.tcphandshake");
1411 + st = rrdset_find_localhost("ipv4.tcphandshake");
1412 if (unlikely(!st)) {
1413 - st = rrdset_create("ipv4", "tcphandshake", NULL, "tcp", NULL,
1413 + st = rrdset_create_localhost("ipv4", "tcphandshake", NULL, "tcp", NULL,
1414 "IPv4 TCP Handshake Issues",
1415 "events/s", 2900, update_every, RRDSET_TYPE_LINE);
1416 st->isdetail = 1;
1417
1418 - rrddim_add(st, "EstabResets", NULL, 1, 1, RRDDIM_INCREMENTAL);
1419 - rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRDDIM_INCREMENTAL);
1420 - rrddim_add(st, "PassiveOpens", NULL, 1, 1, RRDDIM_INCREMENTAL);
1421 - rrddim_add(st, "AttemptFails", NULL, 1, 1, RRDDIM_INCREMENTAL);
1418 + rrddim_add(st, "EstabResets", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1419 + rrddim_add(st, "ActiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1420 + rrddim_add(st, "PassiveOpens", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1421 + rrddim_add(st, "AttemptFails", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1422 } else
1423 rrdset_next(st);
1424
@@ -1433,15 +1433,15 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1433
1434 if (do_tcpext_connaborts == CONFIG_ONDEMAND_YES || (do_tcpext_connaborts == CONFIG_ONDEMAND_ONDEMAND && (tcpstat.tcps_rcvpackafterwin || tcpstat.tcps_rcvafterclose || tcpstat.tcps_rcvmemdrop || tcpstat.tcps_persistdrop || tcpstat.tcps_finwait2_drops))) {
1435 do_tcpext_connaborts = CONFIG_ONDEMAND_YES;
1436 - st = rrdset_find("ipv4.tcpconnaborts");
1436 + st = rrdset_find_localhost("ipv4.tcpconnaborts");
1437 if (unlikely(!st)) {
1438 - st = rrdset_create("ipv4", "tcpconnaborts", NULL, "tcp", NULL, "TCP Connection Aborts", "connections/s", 3010, update_every, RRDSET_TYPE_LINE);
1438 + st = rrdset_create_localhost("ipv4", "tcpconnaborts", NULL, "tcp", NULL, "TCP Connection Aborts", "connections/s", 3010, update_every, RRDSET_TYPE_LINE);
1439
1440 - rrddim_add(st, "TCPAbortOnData", "baddata", 1, 1, RRDDIM_INCREMENTAL);
1441 - rrddim_add(st, "TCPAbortOnClose", "userclosed", 1, 1, RRDDIM_INCREMENTAL);
1442 - rrddim_add(st, "TCPAbortOnMemory", "nomemory", 1, 1, RRDDIM_INCREMENTAL);
1443 - rrddim_add(st, "TCPAbortOnTimeout", "timeout", 1, 1, RRDDIM_INCREMENTAL);
1444 - rrddim_add(st, "TCPAbortOnLinger", "linger", 1, 1, RRDDIM_INCREMENTAL);
1440 + rrddim_add(st, "TCPAbortOnData", "baddata", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1441 + rrddim_add(st, "TCPAbortOnClose", "userclosed", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1442 + rrddim_add(st, "TCPAbortOnMemory", "nomemory", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1443 + rrddim_add(st, "TCPAbortOnTimeout", "timeout", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1444 + rrddim_add(st, "TCPAbortOnLinger", "linger", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1445 }
1446 else rrdset_next(st);
1447
@@ -1457,11 +1457,11 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1457
1458 if (do_tcpext_ofo == CONFIG_ONDEMAND_YES || (do_tcpext_ofo == CONFIG_ONDEMAND_ONDEMAND && tcpstat.tcps_rcvoopack)) {
1459 do_tcpext_ofo = CONFIG_ONDEMAND_YES;
1460 - st = rrdset_find("ipv4.tcpofo");
1460 + st = rrdset_find_localhost("ipv4.tcpofo");
1461 if (unlikely(!st)) {
1462 - st = rrdset_create("ipv4", "tcpofo", NULL, "tcp", NULL, "TCP Out-Of-Order Queue", "packets/s", 3050, update_every, RRDSET_TYPE_LINE);
1462 + st = rrdset_create_localhost("ipv4", "tcpofo", NULL, "tcp", NULL, "TCP Out-Of-Order Queue", "packets/s", 3050, update_every, RRDSET_TYPE_LINE);
1463
1464 - rrddim_add(st, "TCPOFOQueue", "inqueue", 1, 1, RRDDIM_INCREMENTAL);
1464 + rrddim_add(st, "TCPOFOQueue", "inqueue", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1465 }
1466 else rrdset_next(st);
1467
@@ -1474,13 +1474,13 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1474 if (do_tcpext_syscookies == CONFIG_ONDEMAND_YES || (do_tcpext_syscookies == CONFIG_ONDEMAND_ONDEMAND && (tcpstat.tcps_sc_sendcookie || tcpstat.tcps_sc_recvcookie || tcpstat.tcps_sc_zonefail))) {
1475 do_tcpext_syscookies = CONFIG_ONDEMAND_YES;
1476
1477 - st = rrdset_find("ipv4.tcpsyncookies");
1477 + st = rrdset_find_localhost("ipv4.tcpsyncookies");
1478 if (unlikely(!st)) {
1479 - st = rrdset_create("ipv4", "tcpsyncookies", NULL, "tcp", NULL, "TCP SYN Cookies", "packets/s", 3100, update_every, RRDSET_TYPE_LINE);
1479 + st = rrdset_create_localhost("ipv4", "tcpsyncookies", NULL, "tcp", NULL, "TCP SYN Cookies", "packets/s", 3100, update_every, RRDSET_TYPE_LINE);
1480
1481 - rrddim_add(st, "SyncookiesRecv", "received", 1, 1, RRDDIM_INCREMENTAL);
1482 - rrddim_add(st, "SyncookiesSent", "sent", -1, 1, RRDDIM_INCREMENTAL);
1483 - rrddim_add(st, "SyncookiesFailed", "failed", -1, 1, RRDDIM_INCREMENTAL);
1481 + rrddim_add(st, "SyncookiesRecv", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1482 + rrddim_add(st, "SyncookiesSent", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1483 + rrddim_add(st, "SyncookiesFailed", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1484 }
1485 else rrdset_next(st);
1486
@@ -1494,15 +1494,15 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1494
1495 if (do_ecn == CONFIG_ONDEMAND_YES || (do_ecn == CONFIG_ONDEMAND_ONDEMAND && (tcpstat.tcps_ecn_ce || tcpstat.tcps_ecn_ect0 || tcpstat.tcps_ecn_ect1))) {
1496 do_ecn = CONFIG_ONDEMAND_YES;
1497 - st = rrdset_find("ipv4.ecnpkts");
1497 + st = rrdset_find_localhost("ipv4.ecnpkts");
1498 if (unlikely(!st)) {
1499 - st = rrdset_create("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics", "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
1499 + st = rrdset_create_localhost("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics", "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
1500 st->isdetail = 1;
1501
1502 - rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRDDIM_INCREMENTAL);
1503 - rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRDDIM_INCREMENTAL);
1504 - rrddim_add(st, "InECT0Pkts", "ECTP0", 1, 1, RRDDIM_INCREMENTAL);
1505 - rrddim_add(st, "InECT1Pkts", "ECTP1", 1, 1, RRDDIM_INCREMENTAL);
1502 + rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1503 + rrddim_add(st, "InNoECTPkts", "NoECTP", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1504 + rrddim_add(st, "InECT0Pkts", "ECTP0", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1505 + rrddim_add(st, "InECT1Pkts", "ECTP1", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1506 }
1507 else rrdset_next(st);
1508
@@ -1527,13 +1527,13 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1527 error("DISABLED: ipv4.udperrors");
1528 } else {
1529 if (likely(do_udp_packets)) {
1530 - st = rrdset_find("ipv4.udppackets");
1530 + st = rrdset_find_localhost("ipv4.udppackets");
1531 if (unlikely(!st)) {
1532 - st = rrdset_create("ipv4", "udppackets", NULL, "udp", NULL, "IPv4 UDP Packets",
1532 + st = rrdset_create_localhost("ipv4", "udppackets", NULL, "udp", NULL, "IPv4 UDP Packets",
1533 "packets/s", 2601, update_every, RRDSET_TYPE_LINE);
1534
1535 - rrddim_add(st, "InDatagrams", "received", 1, 1, RRDDIM_INCREMENTAL);
1536 - rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRDDIM_INCREMENTAL);
1535 + rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1536 + rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1537 } else
1538 rrdset_next(st);
1539
@@ -1545,17 +1545,17 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1545 // --------------------------------------------------------------------
1546
1547 if (likely(do_udp_errors)) {
1548 - st = rrdset_find("ipv4.udperrors");
1548 + st = rrdset_find_localhost("ipv4.udperrors");
1549 if (unlikely(!st)) {
1550 - st = rrdset_create("ipv4", "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s",
1550 + st = rrdset_create_localhost("ipv4", "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s",
1551 2701, update_every, RRDSET_TYPE_LINE);
1552 st->isdetail = 1;
1553
1554 - rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
1555 - rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
1556 - rrddim_add(st, "NoPorts", NULL, 1, 1, RRDDIM_INCREMENTAL);
1557 - rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
1558 - rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRDDIM_INCREMENTAL);
1554 + rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1555 + rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1556 + rrddim_add(st, "NoPorts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1557 + rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1558 + rrddim_add(st, "IgnoredMulti", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1559 } else
1560 rrdset_next(st);
1561
@@ -1588,14 +1588,14 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1588 // --------------------------------------------------------------------
1589
1590 if (likely(do_icmp_packets)) {
1591 - st = rrdset_find("ipv4.icmp");
1591 + st = rrdset_find_localhost("ipv4.icmp");
1592 if (unlikely(!st)) {
1593 - st = rrdset_create("ipv4", "icmp", NULL, "icmp", NULL, "IPv4 ICMP Packets", "packets/s",
1593 + st = rrdset_create_localhost("ipv4", "icmp", NULL, "icmp", NULL, "IPv4 ICMP Packets", "packets/s",
1594 2602,
1595 update_every, RRDSET_TYPE_LINE);
1596
1597 - rrddim_add(st, "InMsgs", "received", 1, 1, RRDDIM_INCREMENTAL);
1598 - rrddim_add(st, "OutMsgs", "sent", -1, 1, RRDDIM_INCREMENTAL);
1597 + rrddim_add(st, "InMsgs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1598 + rrddim_add(st, "OutMsgs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1599 } else
1600 rrdset_next(st);
1601
@@ -1606,15 +1606,15 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1606
1607 // --------------------------------------------------------------------
1608
1609 - st = rrdset_find("ipv4.icmp_errors");
1609 + st = rrdset_find_localhost("ipv4.icmp_errors");
1610 if (unlikely(!st)) {
1611 - st = rrdset_create("ipv4", "icmp_errors", NULL, "icmp", NULL, "IPv4 ICMP Errors",
1611 + st = rrdset_create_localhost("ipv4", "icmp_errors", NULL, "icmp", NULL, "IPv4 ICMP Errors",
1612 "packets/s",
1613 2603, update_every, RRDSET_TYPE_LINE);
1614
1615 - rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
1616 - rrddim_add(st, "OutErrors", NULL, -1, 1, RRDDIM_INCREMENTAL);
1617 - rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
1615 + rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1616 + rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1617 + rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1618 } else
1619 rrdset_next(st);
1620
@@ -1628,15 +1628,15 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1628 // --------------------------------------------------------------------
1629
1630 if (likely(do_icmpmsg)) {
1631 - st = rrdset_find("ipv4.icmpmsg");
1631 + st = rrdset_find_localhost("ipv4.icmpmsg");
1632 if (unlikely(!st)) {
1633 - st = rrdset_create("ipv4", "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messsages",
1633 + st = rrdset_create_localhost("ipv4", "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messsages",
1634 "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
1635
1636 - rrddim_add(st, "InEchoReps", NULL, 1, 1, RRDDIM_INCREMENTAL);
1637 - rrddim_add(st, "OutEchoReps", NULL, -1, 1, RRDDIM_INCREMENTAL);
1638 - rrddim_add(st, "InEchos", NULL, 1, 1, RRDDIM_INCREMENTAL);
1639 - rrddim_add(st, "OutEchos", NULL, -1, 1, RRDDIM_INCREMENTAL);
1636 + rrddim_add(st, "InEchoReps", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1637 + rrddim_add(st, "OutEchoReps", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1638 + rrddim_add(st, "InEchos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1639 + rrddim_add(st, "OutEchos", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1640 } else
1641 rrdset_next(st);
1642
@@ -1665,15 +1665,15 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1665 error("DISABLED: ipv4.errors");
1666 } else {
1667 if (likely(do_ip_packets)) {
1668 - st = rrdset_find("ipv4.packets");
1668 + st = rrdset_find_localhost("ipv4.packets");
1669 if (unlikely(!st)) {
1670 - st = rrdset_create("ipv4", "packets", NULL, "packets", NULL, "IPv4 Packets", "packets/s",
1670 + st = rrdset_create_localhost("ipv4", "packets", NULL, "packets", NULL, "IPv4 Packets", "packets/s",
1671 3000, update_every, RRDSET_TYPE_LINE);
1672
1673 - rrddim_add(st, "InReceives", "received", 1, 1, RRDDIM_INCREMENTAL);
1674 - rrddim_add(st, "OutRequests", "sent", -1, 1, RRDDIM_INCREMENTAL);
1675 - rrddim_add(st, "ForwDatagrams", "forwarded", 1, 1, RRDDIM_INCREMENTAL);
1676 - rrddim_add(st, "InDelivers", "delivered", 1, 1, RRDDIM_INCREMENTAL);
1673 + rrddim_add(st, "InReceives", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1674 + rrddim_add(st, "OutRequests", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1675 + rrddim_add(st, "ForwDatagrams", "forwarded", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1676 + rrddim_add(st, "InDelivers", "delivered", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1677 } else
1678 rrdset_next(st);
1679
@@ -1687,15 +1687,15 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1687 // --------------------------------------------------------------------
1688
1689 if (likely(do_ip_fragsout)) {
1690 - st = rrdset_find("ipv4.fragsout");
1690 + st = rrdset_find_localhost("ipv4.fragsout");
1691 if (unlikely(!st)) {
1692 - st = rrdset_create("ipv4", "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent",
1692 + st = rrdset_create_localhost("ipv4", "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent",
1693 "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
1694 st->isdetail = 1;
1695
1696 - rrddim_add(st, "FragOKs", "ok", 1, 1, RRDDIM_INCREMENTAL);
1697 - rrddim_add(st, "FragFails", "failed", -1, 1, RRDDIM_INCREMENTAL);
1698 - rrddim_add(st, "FragCreates", "created", 1, 1, RRDDIM_INCREMENTAL);
1696 + rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1697 + rrddim_add(st, "FragFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1698 + rrddim_add(st, "FragCreates", "created", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1699 } else
1700 rrdset_next(st);
1701
@@ -1708,16 +1708,16 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1708 // --------------------------------------------------------------------
1709
1710 if (likely(do_ip_fragsin)) {
1711 - st = rrdset_find("ipv4.fragsin");
1711 + st = rrdset_find_localhost("ipv4.fragsin");
1712 if (unlikely(!st)) {
1713 - st = rrdset_create("ipv4", "fragsin", NULL, "fragments", NULL,
1713 + st = rrdset_create_localhost("ipv4", "fragsin", NULL, "fragments", NULL,
1714 "IPv4 Fragments Reassembly",
1715 "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
1716 st->isdetail = 1;
1717
1718 - rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRDDIM_INCREMENTAL);
1719 - rrddim_add(st, "ReasmFails", "failed", -1, 1, RRDDIM_INCREMENTAL);
1720 - rrddim_add(st, "ReasmReqds", "all", 1, 1, RRDDIM_INCREMENTAL);
1718 + rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1719 + rrddim_add(st, "ReasmFails", "failed", -1, 1, RRD_ALGORITHM_INCREMENTAL);
1720 + rrddim_add(st, "ReasmReqds", "all", 1, 1, RRD_ALGORITHM_INCREMENTAL);
1721 } else
1722 rrdset_next(st);
1723
@@ -1730,21 +1730,21 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1730 // --------------------------------------------------------------------
1731
1732 if (likely(do_ip_errors)) {
1733 - st = rrdset_find("ipv4.errors");
1733 + st = rrdset_find_localhost("ipv4.errors");
1734 if (unlikely(!st)) {
1735 - st = rrdset_create("ipv4", "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s",
1735 + st = rrdset_create_localhost("ipv4", "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s",
1736 3002,
1737 update_every, RRDSET_TYPE_LINE);
1738 st->isdetail = 1;
1739
1740 - rrddim_add(st, "InDiscards", NULL, 1, 1, RRDDIM_INCREMENTAL);
1741 - rrddim_add(st, "OutDiscards", NULL, -1, 1, RRDDIM_INCREMENTAL);
1740 + rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1741 + rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1742
1743 - rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
1744 - rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRDDIM_INCREMENTAL);
1743 + rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1744 + rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1745
1746 - rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
1747 - rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRDDIM_INCREMENTAL);
1746 + rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1747 + rrddim_add(st, "InUnknownProtos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1748 } else
1749 rrdset_next(st);
1750
@@ -1776,15 +1776,15 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1776 (ip6stat.ip6s_localout || ip6stat.ip6s_total ||
1777 ip6stat.ip6s_forward || ip6stat.ip6s_delivered))) {
1778 do_ip6_packets = CONFIG_ONDEMAND_YES;
1779 - st = rrdset_find("ipv6.packets");
1779 + st = rrdset_find_localhost("ipv6.packets");
1780 if (unlikely(!st)) {
1781 - st = rrdset_create("ipv6", "packets", NULL, "packets", NULL, "IPv6 Packets", "packets/s", 3000,
1781 + st = rrdset_create_localhost("ipv6", "packets", NULL, "packets", NULL, "IPv6 Packets", "packets/s", 3000,
1782 update_every, RRDSET_TYPE_LINE);
1783
1784 - rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
1785 - rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
1786 - rrddim_add(st, "forwarded", NULL, 1, 1, RRDDIM_INCREMENTAL);
1787 - rrddim_add(st, "delivers", NULL, -1, 1, RRDDIM_INCREMENTAL);
1784 + rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1785 + rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1786 + rrddim_add(st, "forwarded", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1787 + rrddim_add(st, "delivers", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1788 } else
1789 rrdset_next(st);
1790
@@ -1801,15 +1801,15 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1801 (ip6stat.ip6s_fragmented || ip6stat.ip6s_cantfrag ||
1802 ip6stat.ip6s_ofragments))) {
1803 do_ip6_fragsout = CONFIG_ONDEMAND_YES;
1804 - st = rrdset_find("ipv6.fragsout");
1804 + st = rrdset_find_localhost("ipv6.fragsout");
1805 if (unlikely(!st)) {
1806 - st = rrdset_create("ipv6", "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent",
1806 + st = rrdset_create_localhost("ipv6", "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent",
1807 "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
1808 st->isdetail = 1;
1809
1810 - rrddim_add(st, "ok", NULL, 1, 1, RRDDIM_INCREMENTAL);
1811 - rrddim_add(st, "failed", NULL, -1, 1, RRDDIM_INCREMENTAL);
1812 - rrddim_add(st, "all", NULL, 1, 1, RRDDIM_INCREMENTAL);
1810 + rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1811 + rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1812 + rrddim_add(st, "all", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1813 } else
1814 rrdset_next(st);
1815
@@ -1825,16 +1825,16 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1825 (ip6stat.ip6s_reassembled || ip6stat.ip6s_fragdropped ||
1826 ip6stat.ip6s_fragtimeout || ip6stat.ip6s_fragments))) {
1827 do_ip6_fragsin = CONFIG_ONDEMAND_YES;
1828 - st = rrdset_find("ipv6.fragsin");
1828 + st = rrdset_find_localhost("ipv6.fragsin");
1829 if (unlikely(!st)) {
1830 - st = rrdset_create("ipv6", "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly",
1830 + st = rrdset_create_localhost("ipv6", "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly",
1831 "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
1832 st->isdetail = 1;
1833
1834 - rrddim_add(st, "ok", NULL, 1, 1, RRDDIM_INCREMENTAL);
1835 - rrddim_add(st, "failed", NULL, -1, 1, RRDDIM_INCREMENTAL);
1836 - rrddim_add(st, "timeout", NULL, -1, 1, RRDDIM_INCREMENTAL);
1837 - rrddim_add(st, "all", NULL, 1, 1, RRDDIM_INCREMENTAL);
1834 + rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1835 + rrddim_add(st, "failed", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1836 + rrddim_add(st, "timeout", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1837 + rrddim_add(st, "all", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1838 } else
1839 rrdset_next(st);
1840
@@ -1858,21 +1858,21 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1858 ip6stat.ip6s_cantforward ||
1859 ip6stat.ip6s_noroute))) {
1860 do_ip6_errors = CONFIG_ONDEMAND_YES;
1861 - st = rrdset_find("ipv6.errors");
1861 + st = rrdset_find_localhost("ipv6.errors");
1862 if (unlikely(!st)) {
1863 - st = rrdset_create("ipv6", "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s", 3002,
1863 + st = rrdset_create_localhost("ipv6", "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s", 3002,
1864 update_every, RRDSET_TYPE_LINE);
1865 st->isdetail = 1;
1866
1867 - rrddim_add(st, "InDiscards", NULL, 1, 1, RRDDIM_INCREMENTAL);
1868 - rrddim_add(st, "OutDiscards", NULL, -1, 1, RRDDIM_INCREMENTAL);
1867 + rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1868 + rrddim_add(st, "OutDiscards", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1869
1870 - rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
1871 - rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
1872 - rrddim_add(st, "InTruncatedPkts", NULL, 1, 1, RRDDIM_INCREMENTAL);
1873 - rrddim_add(st, "InNoRoutes", NULL, 1, 1, RRDDIM_INCREMENTAL);
1870 + rrddim_add(st, "InHdrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1871 + rrddim_add(st, "InAddrErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1872 + rrddim_add(st, "InTruncatedPkts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1873 + rrddim_add(st, "InNoRoutes", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1874
1875 - rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRDDIM_INCREMENTAL);
1875 + rrddim_add(st, "OutNoRoutes", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1876 } else
1877 rrdset_next(st);
1878
@@ -1905,13 +1905,13 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1905 icmp6_total.msgs_in += icmp6stat.icp6s_badcode + icmp6stat.icp6s_badlen + icmp6stat.icp6s_checksum + icmp6stat.icp6s_tooshort;
1906 if (do_icmp6 == CONFIG_ONDEMAND_YES || (do_icmp6 == CONFIG_ONDEMAND_ONDEMAND && (icmp6_total.msgs_in || icmp6_total.msgs_out))) {
1907 do_icmp6 = CONFIG_ONDEMAND_YES;
1908 - st = rrdset_find("ipv6.icmp");
1908 + st = rrdset_find_localhost("ipv6.icmp");
1909 if (unlikely(!st)) {
1910 - st = rrdset_create("ipv6", "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages",
1910 + st = rrdset_create_localhost("ipv6", "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages",
1911 "messages/s", 10000, update_every, RRDSET_TYPE_LINE);
1912
1913 - rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
1914 - rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
1913 + rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1914 + rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1915 } else
1916 rrdset_next(st);
1917
@@ -1924,13 +1924,13 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1924
1925 if (do_icmp6_redir == CONFIG_ONDEMAND_YES || (do_icmp6_redir == CONFIG_ONDEMAND_ONDEMAND && (icmp6stat.icp6s_inhist[ND_REDIRECT] || icmp6stat.icp6s_outhist[ND_REDIRECT]))) {
1926 do_icmp6_redir = CONFIG_ONDEMAND_YES;
1927 - st = rrdset_find("ipv6.icmpredir");
1927 + st = rrdset_find_localhost("ipv6.icmpredir");
1928 if (unlikely(!st)) {
1929 - st = rrdset_create("ipv6", "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects",
1929 + st = rrdset_create_localhost("ipv6", "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects",
1930 "redirects/s", 10050, update_every, RRDSET_TYPE_LINE);
1931
1932 - rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL);
1933 - rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL);
1932 + rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1933 + rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1934 } else
1935 rrdset_next(st);
1936
@@ -1954,21 +1954,21 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1954 icmp6stat.icp6s_outhist[ICMP6_TIME_EXCEEDED] ||
1955 icmp6stat.icp6s_outhist[ICMP6_PARAM_PROB]))) {
1956 do_icmp6_errors = CONFIG_ONDEMAND_YES;
1957 - st = rrdset_find("ipv6.icmperrors");
1957 + st = rrdset_find_localhost("ipv6.icmperrors");
1958 if (unlikely(!st)) {
1959 - st = rrdset_create("ipv6", "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors", "errors/s", 10100, update_every, RRDSET_TYPE_LINE);
1960 -
1961 - rrddim_add(st, "InErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
1962 - rrddim_add(st, "OutErrors", NULL, -1, 1, RRDDIM_INCREMENTAL);
1963 -
1964 - rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRDDIM_INCREMENTAL);
1965 - rrddim_add(st, "InDestUnreachs", NULL, 1, 1, RRDDIM_INCREMENTAL);
1966 - rrddim_add(st, "InPktTooBigs", NULL, 1, 1, RRDDIM_INCREMENTAL);
1967 - rrddim_add(st, "InTimeExcds", NULL, 1, 1, RRDDIM_INCREMENTAL);
1968 - rrddim_add(st, "InParmProblems", NULL, 1, 1, RRDDIM_INCREMENTAL);
1969 - rrddim_add(st, "OutDestUnreachs", NULL, -1, 1, RRDDIM_INCREMENTAL);
1970 - rrddim_add(st, "OutTimeExcds", NULL, -1, 1, RRDDIM_INCREMENTAL);
1971 - rrddim_add(st, "OutParmProblems", NULL, -1, 1, RRDDIM_INCREMENTAL);
1959 + st = rrdset_create_localhost("ipv6", "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors", "errors/s", 10100, update_every, RRDSET_TYPE_LINE);
1960 +
1961 + rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1962 + rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1963 +
1964 + rrddim_add(st, "InCsumErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1965 + rrddim_add(st, "InDestUnreachs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1966 + rrddim_add(st, "InPktTooBigs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1967 + rrddim_add(st, "InTimeExcds", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1968 + rrddim_add(st, "InParmProblems", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1969 + rrddim_add(st, "OutDestUnreachs", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1970 + rrddim_add(st, "OutTimeExcds", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1971 + rrddim_add(st, "OutParmProblems", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
1972 } else
1973 rrdset_next(st);
1974
@@ -1993,14 +1993,14 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
1993 icmp6stat.icp6s_inhist[ICMP6_ECHO_REPLY] ||
1994 icmp6stat.icp6s_outhist[ICMP6_ECHO_REPLY]))) {
1995 do_icmp6_echos = CONFIG_ONDEMAND_YES;
1996 - st = rrdset_find("ipv6.icmpechos");
1996 + st = rrdset_find_localhost("ipv6.icmpechos");
1997 if (unlikely(!st)) {
1998 - st = rrdset_create("ipv6", "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo", "messages/s", 10200, update_every, RRDSET_TYPE_LINE);
1998 + st = rrdset_create_localhost("ipv6", "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo", "messages/s", 10200, update_every, RRDSET_TYPE_LINE);
1999
2000 - rrddim_add(st, "InEchos", NULL, 1, 1, RRDDIM_INCREMENTAL);
2001 - rrddim_add(st, "OutEchos", NULL, -1, 1, RRDDIM_INCREMENTAL);
2002 - rrddim_add(st, "InEchoReplies", NULL, 1, 1, RRDDIM_INCREMENTAL);
2003 - rrddim_add(st, "OutEchoReplies", NULL, -1, 1, RRDDIM_INCREMENTAL);
2000 + rrddim_add(st, "InEchos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2001 + rrddim_add(st, "OutEchos", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2002 + rrddim_add(st, "InEchoReplies", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2003 + rrddim_add(st, "OutEchoReplies", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2004 } else
2005 rrdset_next(st);
2006
@@ -2019,14 +2019,14 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
2019 icmp6stat.icp6s_inhist[ND_ROUTER_ADVERT] ||
2020 icmp6stat.icp6s_outhist[ND_ROUTER_ADVERT]))) {
2021 do_icmp6_router = CONFIG_ONDEMAND_YES;
2022 - st = rrdset_find("ipv6.icmprouter");
2022 + st = rrdset_find_localhost("ipv6.icmprouter");
2023 if (unlikely(!st)) {
2024 - st = rrdset_create("ipv6", "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages", "messages/s", 10400, update_every, RRDSET_TYPE_LINE);
2024 + st = rrdset_create_localhost("ipv6", "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages", "messages/s", 10400, update_every, RRDSET_TYPE_LINE);
2025
2026 - rrddim_add(st, "InSolicits", NULL, 1, 1, RRDDIM_INCREMENTAL);
2027 - rrddim_add(st, "OutSolicits", NULL, -1, 1, RRDDIM_INCREMENTAL);
2028 - rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRDDIM_INCREMENTAL);
2029 - rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRDDIM_INCREMENTAL);
2026 + rrddim_add(st, "InSolicits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2027 + rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2028 + rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2029 + rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2030 } else
2031 rrdset_next(st);
2032
@@ -2045,14 +2045,14 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
2045 icmp6stat.icp6s_inhist[ND_NEIGHBOR_ADVERT] ||
2046 icmp6stat.icp6s_outhist[ND_NEIGHBOR_ADVERT]))) {
2047 do_icmp6_neighbor = CONFIG_ONDEMAND_YES;
2048 - st = rrdset_find("ipv6.icmpneighbor");
2048 + st = rrdset_find_localhost("ipv6.icmpneighbor");
2049 if (unlikely(!st)) {
2050 - st = rrdset_create("ipv6", "icmpneighbor", NULL, "icmp", NULL, "IPv6 Neighbor Messages", "messages/s", 10500, update_every, RRDSET_TYPE_LINE);
2050 + st = rrdset_create_localhost("ipv6", "icmpneighbor", NULL, "icmp", NULL, "IPv6 Neighbor Messages", "messages/s", 10500, update_every, RRDSET_TYPE_LINE);
2051
2052 - rrddim_add(st, "InSolicits", NULL, 1, 1, RRDDIM_INCREMENTAL);
2053 - rrddim_add(st, "OutSolicits", NULL, -1, 1, RRDDIM_INCREMENTAL);
2054 - rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRDDIM_INCREMENTAL);
2055 - rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRDDIM_INCREMENTAL);
2052 + rrddim_add(st, "InSolicits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2053 + rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2054 + rrddim_add(st, "InAdvertisements", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2055 + rrddim_add(st, "OutAdvertisements", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2056 } else
2057 rrdset_next(st);
2058
@@ -2077,21 +2077,21 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
2077 icmp6stat.icp6s_outhist[135] ||
2078 icmp6stat.icp6s_outhist[136]))) {
2079 do_icmp6_types = CONFIG_ONDEMAND_YES;
2080 - st = rrdset_find("ipv6.icmptypes");
2080 + st = rrdset_find_localhost("ipv6.icmptypes");
2081 if (unlikely(!st)) {
2082 - st = rrdset_create("ipv6", "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types",
2082 + st = rrdset_create_localhost("ipv6", "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types",
2083 "messages/s", 10700, update_every, RRDSET_TYPE_LINE);
2084
2085 - rrddim_add(st, "InType1", NULL, 1, 1, RRDDIM_INCREMENTAL);
2086 - rrddim_add(st, "InType128", NULL, 1, 1, RRDDIM_INCREMENTAL);
2087 - rrddim_add(st, "InType129", NULL, 1, 1, RRDDIM_INCREMENTAL);
2088 - rrddim_add(st, "InType136", NULL, 1, 1, RRDDIM_INCREMENTAL);
2089 - rrddim_add(st, "OutType1", NULL, -1, 1, RRDDIM_INCREMENTAL);
2090 - rrddim_add(st, "OutType128", NULL, -1, 1, RRDDIM_INCREMENTAL);
2091 - rrddim_add(st, "OutType129", NULL, -1, 1, RRDDIM_INCREMENTAL);
2092 - rrddim_add(st, "OutType133", NULL, -1, 1, RRDDIM_INCREMENTAL);
2093 - rrddim_add(st, "OutType135", NULL, -1, 1, RRDDIM_INCREMENTAL);
2094 - rrddim_add(st, "OutType143", NULL, -1, 1, RRDDIM_INCREMENTAL);
2085 + rrddim_add(st, "InType1", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2086 + rrddim_add(st, "InType128", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2087 + rrddim_add(st, "InType129", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2088 + rrddim_add(st, "InType136", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2089 + rrddim_add(st, "OutType1", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2090 + rrddim_add(st, "OutType128", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2091 + rrddim_add(st, "OutType129", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2092 + rrddim_add(st, "OutType133", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2093 + rrddim_add(st, "OutType135", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2094 + rrddim_add(st, "OutType143", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
2095 } else
2096 rrdset_next(st);
2097
@@ -2135,17 +2135,17 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
2135 // --------------------------------------------------------------------------
2136
2137 if (likely(do_space)) {
2138 - st = rrdset_find_bytype("disk_space", mntbuf[i].f_mntonname);
2138 + st = rrdset_find_bytype_localhost("disk_space", mntbuf[i].f_mntonname);
2139 if (unlikely(!st)) {
2140 snprintfz(title, 4096, "Disk Space Usage for %s [%s]", mntbuf[i].f_mntonname, mntbuf[i].f_mntfromname);
2141 - st = rrdset_create("disk_space", mntbuf[i].f_mntonname, NULL, mntbuf[i].f_mntonname, "disk.space", title, "GB", 2023,
2141 + st = rrdset_create_localhost("disk_space", mntbuf[i].f_mntonname, NULL, mntbuf[i].f_mntonname, "disk.space", title, "GB", 2023,
2142 update_every,
2143 RRDSET_TYPE_STACKED);
2144
2145 - rrddim_add(st, "avail", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRDDIM_ABSOLUTE);
2146 - rrddim_add(st, "used", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRDDIM_ABSOLUTE);
2145 + rrddim_add(st, "avail", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
2146 + rrddim_add(st, "used", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
2147 rrddim_add(st, "reserved_for_root", "reserved for root", mntbuf[i].f_bsize, GIGA_FACTOR,
2148 - RRDDIM_ABSOLUTE);
2148 + RRD_ALGORITHM_ABSOLUTE);
2149 } else
2150 rrdset_next(st);
2151
@@ -2158,15 +2158,15 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
2158 // --------------------------------------------------------------------------
2159
2160 if (likely(do_inodes)) {
2161 - st = rrdset_find_bytype("disk_inodes", mntbuf[i].f_mntonname);
2161 + st = rrdset_find_bytype_localhost("disk_inodes", mntbuf[i].f_mntonname);
2162 if (unlikely(!st)) {
2163 snprintfz(title, 4096, "Disk Files (inodes) Usage for %s [%s]", mntbuf[i].f_mntonname, mntbuf[i].f_mntfromname);
2164 - st = rrdset_create("disk_inodes", mntbuf[i].f_mntonname, NULL, mntbuf[i].f_mntonname, "disk.inodes", title, "Inodes", 2024,
2164 + st = rrdset_create_localhost("disk_inodes", mntbuf[i].f_mntonname, NULL, mntbuf[i].f_mntonname, "disk.inodes", title, "Inodes", 2024,
2165 update_every, RRDSET_TYPE_STACKED);
2166
2167 - rrddim_add(st, "avail", NULL, 1, 1, RRDDIM_ABSOLUTE);
2168 - rrddim_add(st, "used", NULL, 1, 1, RRDDIM_ABSOLUTE);
2169 - rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1, RRDDIM_ABSOLUTE);
2167 + rrddim_add(st, "avail", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
2168 + rrddim_add(st, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
2169 + rrddim_add(st, "reserved_for_root", "reserved for root", 1, 1, RRD_ALGORITHM_ABSOLUTE);
2170 } else
2171 rrdset_next(st);
2172
@@ -2186,11 +2186,11 @@ int do_freebsd_sysctl(int update_every, usec_t dt) {
2186 error("DISABLED: system.uptime");
2187 } else {
2188 clock_gettime(CLOCK_REALTIME, &cur_time);
2189 - st = rrdset_find("system.uptime");
2189 + st = rrdset_find_localhost("system.uptime");
2190
2191 if(unlikely(!st)) {
2192 - st = rrdset_create("system", "uptime", NULL, "uptime", NULL, "System Uptime", "seconds", 1000, update_every, RRDSET_TYPE_LINE);
2193 - rrddim_add(st, "uptime", NULL, 1, 1, RRDDIM_ABSOLUTE);
2192 + st = rrdset_create_localhost("system", "uptime", NULL, "uptime", NULL, "System Uptime", "seconds", 1000, update_every, RRDSET_TYPE_LINE);
2193 + rrddim_add(st, "uptime", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
2194 }
2195 else rrdset_next(st);
2196
src/global_statistics.c
+17 -16
@@ -131,9 +131,9 @@ void global_statistics_charts(void) {
131
132 if (!stcpu_thread) stcpu_thread = rrdset_find_localhost("netdata.plugin_proc_cpu");
133 if (!stcpu_thread) {
134 - stcpu_thread = rrdset_create("netdata", "plugin_proc_cpu", NULL, "proc", NULL,
135 - "NetData Proc Plugin CPU usage", "milliseconds/s", 132000, rrd_update_every,
136 - RRDSET_TYPE_STACKED);
134 + stcpu_thread = rrdset_create_localhost("netdata", "plugin_proc_cpu", NULL, "proc", NULL
135 + , "NetData Proc Plugin CPU usage", "milliseconds/s", 132000
136 + , rrd_update_every, RRDSET_TYPE_STACKED);
137
138 rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
139 rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
@@ -147,8 +147,8 @@ void global_statistics_charts(void) {
147
148 if (!stcpu) stcpu = rrdset_find_localhost("netdata.server_cpu");
149 if (!stcpu) {
150 - stcpu = rrdset_create("netdata", "server_cpu", NULL, "netdata", NULL, "NetData CPU usage", "milliseconds/s",
151 - 130000, rrd_update_every, RRDSET_TYPE_STACKED);
150 + stcpu = rrdset_create_localhost("netdata", "server_cpu", NULL, "netdata", NULL, "NetData CPU usage"
151 + , "milliseconds/s", 130000, rrd_update_every, RRDSET_TYPE_STACKED);
152
153 rrddim_add(stcpu, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
154 rrddim_add(stcpu, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
@@ -162,8 +162,8 @@ void global_statistics_charts(void) {
162
163 if (!stclients) stclients = rrdset_find_localhost("netdata.clients");
164 if (!stclients) {
165 - stclients = rrdset_create("netdata", "clients", NULL, "netdata", NULL, "NetData Web Clients",
166 - "connected clients", 130200, rrd_update_every, RRDSET_TYPE_LINE);
165 + stclients = rrdset_create_localhost("netdata", "clients", NULL, "netdata", NULL, "NetData Web Clients"
166 + , "connected clients", 130200, rrd_update_every, RRDSET_TYPE_LINE);
167
168 rrddim_add(stclients, "clients", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
169 } else rrdset_next(stclients);
@@ -175,8 +175,8 @@ void global_statistics_charts(void) {
175
176 if (!streqs) streqs = rrdset_find_localhost("netdata.requests");
177 if (!streqs) {
178 - streqs = rrdset_create("netdata", "requests", NULL, "netdata", NULL, "NetData Web Requests", "requests/s",
179 - 130300, rrd_update_every, RRDSET_TYPE_LINE);
178 + streqs = rrdset_create_localhost("netdata", "requests", NULL, "netdata", NULL, "NetData Web Requests"
179 + , "requests/s", 130300, rrd_update_every, RRDSET_TYPE_LINE);
180
181 rrddim_add(streqs, "requests", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
182 } else rrdset_next(streqs);
@@ -188,8 +188,8 @@ void global_statistics_charts(void) {
188
189 if (!stbytes) stbytes = rrdset_find_localhost("netdata.net");
190 if (!stbytes) {
191 - stbytes = rrdset_create("netdata", "net", NULL, "netdata", NULL, "NetData Network Traffic", "kilobits/s",
192 - 130000, rrd_update_every, RRDSET_TYPE_AREA);
191 + stbytes = rrdset_create_localhost("netdata", "net", NULL, "netdata", NULL, "NetData Network Traffic"
192 + , "kilobits/s", 130000, rrd_update_every, RRDSET_TYPE_AREA);
193
194 rrddim_add(stbytes, "in", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
195 rrddim_add(stbytes, "out", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -203,8 +203,9 @@ void global_statistics_charts(void) {
203
204 if (!stduration) stduration = rrdset_find_localhost("netdata.response_time");
205 if (!stduration) {
206 - stduration = rrdset_create("netdata", "response_time", NULL, "netdata", NULL, "NetData API Response Time",
207 - "ms/request", 130400, rrd_update_every, RRDSET_TYPE_LINE);
206 + stduration = rrdset_create_localhost("netdata", "response_time", NULL, "netdata", NULL
207 + , "NetData API Response Time", "ms/request", 130400, rrd_update_every
208 + , RRDSET_TYPE_LINE);
209
210 rrddim_add(stduration, "average", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
211 rrddim_add(stduration, "max", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
@@ -234,9 +235,9 @@ void global_statistics_charts(void) {
235
236 if (!stcompression) stcompression = rrdset_find_localhost("netdata.compression_ratio");
237 if (!stcompression) {
237 - stcompression = rrdset_create("netdata", "compression_ratio", NULL, "netdata", NULL,
238 - "NetData API Responses Compression Savings Ratio", "percentage", 130500,
239 - rrd_update_every, RRDSET_TYPE_LINE);
238 + stcompression = rrdset_create_localhost("netdata", "compression_ratio", NULL, "netdata", NULL
239 + , "NetData API Responses Compression Savings Ratio", "percentage"
240 + , 130500, rrd_update_every, RRDSET_TYPE_LINE);
241
242 rrddim_add(stcompression, "savings", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
243 } else rrdset_next(stcompression);
src/ipc.c
+6 -2
@@ -193,13 +193,17 @@ 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("system", "ipc_semaphores", NULL, "ipc semaphores", NULL, "IPC Semaphores", "semaphores", 1000, rrd_update_every, RRDSET_TYPE_AREA);
196 + semaphores = rrdset_create_localhost("system", "ipc_semaphores", NULL, "ipc semaphores", NULL
197 + , "IPC Semaphores", "semaphores", 1000, rrd_update_every
198 + , RRDSET_TYPE_AREA);
199 rrddim_add(semaphores, "semaphores", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
200 }
201
202 arrays = rrdset_find_localhost("system.ipc_semaphore_arrays");
203 if(!arrays) {
202 - arrays = rrdset_create("system", "ipc_semaphore_arrays", NULL, "ipc semaphores", NULL, "IPC Semaphore Arrays", "arrays", 1000, rrd_update_every, RRDSET_TYPE_AREA);
204 + arrays = rrdset_create_localhost("system", "ipc_semaphore_arrays", NULL, "ipc semaphores", NULL
205 + , "IPC Semaphore Arrays", "arrays", 1000, rrd_update_every
206 + , RRDSET_TYPE_AREA);
207 rrddim_add(arrays, "arrays", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
208 }
209 }
src/macos_fw.c
+41 -18
@@ -138,7 +138,9 @@ 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("disk", diskstat.name, NULL, diskstat.name, "disk.io", "Disk I/O Bandwidth", "kilobytes/s", 2000, update_every, RRDSET_TYPE_AREA);
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);
144
145 rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
146 rrddim_add(st, "writes", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -163,7 +165,9 @@ int do_macos_iokit(int update_every, usec_t dt) {
165
166 st = rrdset_find_bytype_localhost("disk_ops", diskstat.name);
167 if (unlikely(!st)) {
166 - st = rrdset_create("disk_ops", diskstat.name, NULL, diskstat.name, "disk.ops", "Disk Completed I/O Operations", "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
168 + st = rrdset_create_localhost("disk_ops", diskstat.name, NULL, diskstat.name, "disk.ops"
169 + , "Disk Completed I/O Operations", "operations/s", 2001
170 + , update_every, RRDSET_TYPE_LINE);
171 st->isdetail = 1;
172
173 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -189,7 +193,9 @@ int do_macos_iokit(int update_every, usec_t dt) {
193
194 st = rrdset_find_bytype_localhost("disk_util", diskstat.name);
195 if (unlikely(!st)) {
192 - st = rrdset_create("disk_util", diskstat.name, NULL, diskstat.name, "disk.util", "Disk Utilization Time", "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
196 + st = rrdset_create_localhost("disk_util", diskstat.name, NULL, diskstat.name, "disk.util"
197 + , "Disk Utilization Time", "% of time working", 2004, update_every
198 + , RRDSET_TYPE_AREA);
199 st->isdetail = 1;
200
201 rrddim_add(st, "utilization", NULL, 1, 10000000, RRD_ALGORITHM_INCREMENTAL);
@@ -214,7 +220,9 @@ int do_macos_iokit(int update_every, usec_t dt) {
220
221 st = rrdset_find_bytype_localhost("disk_iotime", diskstat.name);
222 if (unlikely(!st)) {
217 - st = rrdset_create("disk_iotime", diskstat.name, NULL, diskstat.name, "disk.iotime", "Disk Total I/O Time", "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
223 + st = rrdset_create_localhost("disk_iotime", diskstat.name, NULL, diskstat.name, "disk.iotime"
224 + , "Disk Total I/O Time", "milliseconds/s", 2022, update_every
225 + , RRDSET_TYPE_LINE);
226 st->isdetail = 1;
227
228 rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_INCREMENTAL);
@@ -238,7 +246,9 @@ int do_macos_iokit(int update_every, usec_t dt) {
246
247 st = rrdset_find_bytype_localhost("disk_await", diskstat.name);
248 if (unlikely(!st)) {
241 - st = rrdset_create("disk_await", diskstat.name, NULL, diskstat.name, "disk.await", "Average Completed I/O Operation Time", "ms per operation", 2005, update_every, RRDSET_TYPE_LINE);
249 + st = rrdset_create_localhost("disk_await", diskstat.name, NULL, diskstat.name, "disk.await"
250 + , "Average Completed I/O Operation Time", "ms per operation"
251 + , 2005, update_every, RRDSET_TYPE_LINE);
252 st->isdetail = 1;
253
254 rrddim_add(st, "reads", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
@@ -256,7 +266,10 @@ int do_macos_iokit(int update_every, usec_t dt) {
266
267 st = rrdset_find_bytype_localhost("disk_avgsz", diskstat.name);
268 if (unlikely(!st)) {
259 - st = rrdset_create("disk_avgsz", diskstat.name, NULL, diskstat.name, "disk.avgsz", "Average Completed I/O Operation Bandwidth", "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
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);
273 st->isdetail = 1;
274
275 rrddim_add(st, "reads", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -274,7 +287,9 @@ int do_macos_iokit(int update_every, usec_t dt) {
287
288 st = rrdset_find_bytype_localhost("disk_svctm", diskstat.name);
289 if (unlikely(!st)) {
277 - st = rrdset_create("disk_svctm", diskstat.name, NULL, diskstat.name, "disk.svctm", "Average Service Time", "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
290 + st = rrdset_create_localhost("disk_svctm", diskstat.name, NULL, diskstat.name, "disk.svctm"
291 + , "Average Service Time", "ms per operation", 2007
292 + , update_every, RRDSET_TYPE_LINE);
293 st->isdetail = 1;
294
295 rrddim_add(st, "svctm", NULL, 1, 1000000, RRD_ALGORITHM_ABSOLUTE);
@@ -303,7 +318,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
318 if (likely(do_io)) {
319 st = rrdset_find_bytype_localhost("system", "io");
320 if (unlikely(!st)) {
306 - st = rrdset_create("system", "io", NULL, "disk", NULL, "Disk I/O", "kilobytes/s", 150, update_every, RRDSET_TYPE_AREA);
321 + st = rrdset_create_localhost("system", "io", NULL, "disk", NULL, "Disk I/O", "kilobytes/s", 150
322 + , update_every, RRDSET_TYPE_AREA);
323 rrddim_add(st, "in", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
324 rrddim_add(st, "out", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
325 }
@@ -343,9 +359,9 @@ int do_macos_iokit(int update_every, usec_t dt) {
359 st = rrdset_find_bytype_localhost("disk_space", mntbuf[i].f_mntonname);
360 if (unlikely(!st)) {
361 snprintfz(title, 4096, "Disk Space Usage for %s [%s]", mntbuf[i].f_mntonname, mntbuf[i].f_mntfromname);
346 - st = rrdset_create("disk_space", mntbuf[i].f_mntonname, NULL, mntbuf[i].f_mntonname, "disk.space", title, "GB", 2023,
347 - update_every,
348 - RRDSET_TYPE_STACKED);
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);
365
366 rrddim_add(st, "avail", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
367 rrddim_add(st, "used", NULL, mntbuf[i].f_bsize, GIGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
@@ -366,8 +382,9 @@ int do_macos_iokit(int update_every, usec_t dt) {
382 st = rrdset_find_bytype_localhost("disk_inodes", mntbuf[i].f_mntonname);
383 if (unlikely(!st)) {
384 snprintfz(title, 4096, "Disk Files (inodes) Usage for %s [%s]", mntbuf[i].f_mntonname, mntbuf[i].f_mntfromname);
369 - st = rrdset_create("disk_inodes", mntbuf[i].f_mntonname, NULL, mntbuf[i].f_mntonname, "disk.inodes", title, "Inodes", 2024,
370 - update_every, RRDSET_TYPE_STACKED);
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);
388
389 rrddim_add(st, "avail", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
390 rrddim_add(st, "used", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -400,7 +417,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
417
418 st = rrdset_find_bytype_localhost("net", ifa->ifa_name);
419 if (unlikely(!st)) {
403 - st = rrdset_create("net", ifa->ifa_name, NULL, ifa->ifa_name, "net.net", "Bandwidth", "kilobits/s", 7000, update_every, RRDSET_TYPE_AREA);
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);
422
423 rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
424 rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -415,7 +433,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
433
434 st = rrdset_find_bytype_localhost("net_packets", ifa->ifa_name);
435 if (unlikely(!st)) {
418 - st = rrdset_create("net_packets", ifa->ifa_name, NULL, ifa->ifa_name, "net.packets", "Packets", "packets/s", 7001, update_every, RRDSET_TYPE_LINE);
436 + st = rrdset_create_localhost("net_packets", ifa->ifa_name, NULL, ifa->ifa_name, "net.packets"
437 + , "Packets", "packets/s", 7001, update_every, RRDSET_TYPE_LINE);
438 st->isdetail = 1;
439
440 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -435,7 +454,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
454
455 st = rrdset_find_bytype_localhost("net_errors", ifa->ifa_name);
456 if (unlikely(!st)) {
438 - st = rrdset_create("net_errors", ifa->ifa_name, NULL, ifa->ifa_name, "net.errors", "Interface Errors", "errors/s", 7002, update_every, RRDSET_TYPE_LINE);
457 + st = rrdset_create_localhost("net_errors", ifa->ifa_name, NULL, ifa->ifa_name, "net.errors"
458 + , "Interface Errors", "errors/s", 7002, update_every, RRDSET_TYPE_LINE);
459 st->isdetail = 1;
460
461 rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -451,7 +471,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
471
472 st = rrdset_find_bytype_localhost("net_drops", ifa->ifa_name);
473 if (unlikely(!st)) {
454 - st = rrdset_create("net_drops", ifa->ifa_name, NULL, ifa->ifa_name, "net.drops", "Interface Drops", "drops/s", 7003, update_every, RRDSET_TYPE_LINE);
474 + st = rrdset_create_localhost("net_drops", ifa->ifa_name, NULL, ifa->ifa_name, "net.drops"
475 + , "Interface Drops", "drops/s", 7003, update_every, RRDSET_TYPE_LINE);
476 st->isdetail = 1;
477
478 rrddim_add(st, "inbound", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -465,7 +486,9 @@ int do_macos_iokit(int update_every, usec_t dt) {
486
487 st = rrdset_find_bytype_localhost("net_events", ifa->ifa_name);
488 if (unlikely(!st)) {
468 - st = rrdset_create("net_events", ifa->ifa_name, NULL, ifa->ifa_name, "net.events", "Network Interface Events", "events/s", 7006, update_every, RRDSET_TYPE_LINE);
489 + st = rrdset_create_localhost("net_events", ifa->ifa_name, NULL, ifa->ifa_name, "net.events"
490 + , "Network Interface Events", "events/s", 7006, update_every
491 + , RRDSET_TYPE_LINE);
492 st->isdetail = 1;
493
494 rrddim_add(st, "frames", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/macos_mach_smi.c
+8 -4
@@ -50,7 +50,8 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
50
51 st = rrdset_find_bytype_localhost("system", "cpu");
52 if (unlikely(!st)) {
53 - st = rrdset_create("system", "cpu", NULL, "cpu", "system.cpu", "Total CPU utilization", "percentage", 100, update_every, RRDSET_TYPE_STACKED);
53 + st = rrdset_create_localhost("system", "cpu", NULL, "cpu", "system.cpu", "Total CPU utilization"
54 + , "percentage", 100, update_every, RRDSET_TYPE_STACKED);
55
56 rrddim_add(st, "user", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
57 rrddim_add(st, "nice", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
@@ -86,7 +87,8 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
87 if (likely(do_ram)) {
88 st = rrdset_find_localhost("system.ram");
89 if (unlikely(!st)) {
89 - st = rrdset_create("system", "ram", NULL, "ram", NULL, "System RAM", "MB", 200, update_every, RRDSET_TYPE_STACKED);
90 + st = rrdset_create_localhost("system", "ram", NULL, "ram", NULL, "System RAM", "MB", 200
91 + , update_every, RRDSET_TYPE_STACKED);
92
93 rrddim_add(st, "active", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
94 rrddim_add(st, "wired", NULL, system_pagesize, 1048576, RRD_ALGORITHM_ABSOLUTE);
@@ -115,7 +117,8 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
117 if (likely(do_swapio)) {
118 st = rrdset_find_localhost("system.swapio");
119 if (unlikely(!st)) {
118 - st = rrdset_create("system", "swapio", NULL, "swap", NULL, "Swap I/O", "kilobytes/s", 250, update_every, RRDSET_TYPE_AREA);
120 + st = rrdset_create_localhost("system", "swapio", NULL, "swap", NULL, "Swap I/O", "kilobytes/s", 250
121 + , update_every, RRDSET_TYPE_AREA);
122
123 rrddim_add(st, "in", NULL, system_pagesize, 1024, RRD_ALGORITHM_INCREMENTAL);
124 rrddim_add(st, "out", NULL, -system_pagesize, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -132,7 +135,8 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
135 if (likely(do_pgfaults)) {
136 st = rrdset_find_localhost("mem.pgfaults");
137 if (unlikely(!st)) {
135 - st = rrdset_create("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults", "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
138 + st = rrdset_create_localhost("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults"
139 + , "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
140 st->isdetail = 1;
141
142 rrddim_add(st, "memory", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/macos_sysctl.c
+63 -57
@@ -217,7 +217,9 @@ int do_macos_sysctl(int update_every, usec_t dt) {
217
218 st = rrdset_find_bytype_localhost("system", "load");
219 if (unlikely(!st)) {
220 - st = rrdset_create("system", "load", NULL, "load", NULL, "System Load Average", "load", 100, (update_every < MIN_LOADAVG_UPDATE_EVERY) ? MIN_LOADAVG_UPDATE_EVERY : update_every, RRDSET_TYPE_LINE);
220 + st = rrdset_create_localhost("system", "load", NULL, "load", NULL, "System Load Average", "load"
221 + , 100, (update_every < MIN_LOADAVG_UPDATE_EVERY)
222 + ? MIN_LOADAVG_UPDATE_EVERY : update_every, RRDSET_TYPE_LINE);
223 rrddim_add(st, "load1", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
224 rrddim_add(st, "load5", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
225 rrddim_add(st, "load15", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
@@ -244,7 +246,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
246 } else {
247 st = rrdset_find_localhost("system.swap");
248 if (unlikely(!st)) {
247 - st = rrdset_create("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every, RRDSET_TYPE_STACKED);
249 + st = rrdset_create_localhost("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201
250 + , update_every, RRDSET_TYPE_STACKED);
251 st->isdetail = 1;
252
253 rrddim_add(st, "free", NULL, 1, 1048576, RRD_ALGORITHM_ABSOLUTE);
@@ -293,7 +296,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
296 }
297 st = rrdset_find_localhost("system.ipv4");
298 if (unlikely(!st)) {
296 - st = rrdset_create("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
299 + st = rrdset_create_localhost("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s"
300 + , 500, update_every, RRDSET_TYPE_AREA);
301
302 rrddim_add(st, "InOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
303 rrddim_add(st, "OutOctets", "sent", -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -330,9 +334,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
334 if (likely(do_tcp_packets)) {
335 st = rrdset_find_localhost("ipv4.tcppackets");
336 if (unlikely(!st)) {
333 - st = rrdset_create("ipv4", "tcppackets", NULL, "tcp", NULL, "IPv4 TCP Packets",
334 - "packets/s",
335 - 2600, update_every, RRDSET_TYPE_LINE);
337 + st = rrdset_create_localhost("ipv4", "tcppackets", NULL, "tcp", NULL, "IPv4 TCP Packets"
338 + , "packets/s", 2600, update_every, RRDSET_TYPE_LINE);
339
340 rrddim_add(st, "InSegs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
341 rrddim_add(st, "OutSegs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -349,9 +352,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
352 if (likely(do_tcp_errors)) {
353 st = rrdset_find_localhost("ipv4.tcperrors");
354 if (unlikely(!st)) {
352 - st = rrdset_create("ipv4", "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors",
353 - "packets/s",
354 - 2700, update_every, RRDSET_TYPE_LINE);
355 + st = rrdset_create_localhost("ipv4", "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors", "packets/s"
356 + , 2700, update_every, RRDSET_TYPE_LINE);
357 st->isdetail = 1;
358
359 rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -371,9 +373,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
373 if (likely(do_tcp_handshake)) {
374 st = rrdset_find_localhost("ipv4.tcphandshake");
375 if (unlikely(!st)) {
374 - st = rrdset_create("ipv4", "tcphandshake", NULL, "tcp", NULL,
375 - "IPv4 TCP Handshake Issues",
376 - "events/s", 2900, update_every, RRDSET_TYPE_LINE);
376 + st = rrdset_create_localhost("ipv4", "tcphandshake", NULL, "tcp", NULL, "IPv4 TCP Handshake Issues"
377 + , "events/s", 2900, update_every, RRDSET_TYPE_LINE);
378 st->isdetail = 1;
379
380 rrddim_add(st, "EstabResets", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -396,7 +397,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
397 do_tcpext_connaborts = CONFIG_ONDEMAND_YES;
398 st = rrdset_find_localhost("ipv4.tcpconnaborts");
399 if (unlikely(!st)) {
399 - st = rrdset_create("ipv4", "tcpconnaborts", NULL, "tcp", NULL, "TCP Connection Aborts", "connections/s", 3010, update_every, RRDSET_TYPE_LINE);
400 + st = rrdset_create_localhost("ipv4", "tcpconnaborts", NULL, "tcp", NULL, "TCP Connection Aborts"
401 + , "connections/s", 3010, update_every, RRDSET_TYPE_LINE);
402
403 rrddim_add(st, "TCPAbortOnData", "baddata", 1, 1, RRD_ALGORITHM_INCREMENTAL);
404 rrddim_add(st, "TCPAbortOnClose", "userclosed", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -418,7 +420,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
420 do_tcpext_ofo = CONFIG_ONDEMAND_YES;
421 st = rrdset_find_localhost("ipv4.tcpofo");
422 if (unlikely(!st)) {
421 - st = rrdset_create("ipv4", "tcpofo", NULL, "tcp", NULL, "TCP Out-Of-Order Queue", "packets/s", 3050, update_every, RRDSET_TYPE_LINE);
423 + st = rrdset_create_localhost("ipv4", "tcpofo", NULL, "tcp", NULL, "TCP Out-Of-Order Queue"
424 + , "packets/s", 3050, update_every, RRDSET_TYPE_LINE);
425
426 rrddim_add(st, "TCPOFOQueue", "inqueue", 1, 1, RRD_ALGORITHM_INCREMENTAL);
427 }
@@ -435,7 +438,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
438
439 st = rrdset_find_localhost("ipv4.tcpsyncookies");
440 if (unlikely(!st)) {
438 - st = rrdset_create("ipv4", "tcpsyncookies", NULL, "tcp", NULL, "TCP SYN Cookies", "packets/s", 3100, update_every, RRDSET_TYPE_LINE);
441 + st = rrdset_create_localhost("ipv4", "tcpsyncookies", NULL, "tcp", NULL, "TCP SYN Cookies"
442 + , "packets/s", 3100, update_every, RRDSET_TYPE_LINE);
443
444 rrddim_add(st, "SyncookiesRecv", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
445 rrddim_add(st, "SyncookiesSent", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -455,7 +459,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
459 do_ecn = CONFIG_ONDEMAND_YES;
460 st = rrdset_find_localhost("ipv4.ecnpkts");
461 if (unlikely(!st)) {
458 - st = rrdset_create("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics", "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
462 + st = rrdset_create_localhost("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics"
463 + , "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
464 st->isdetail = 1;
465
466 rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -484,8 +489,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
489 if (likely(do_udp_packets)) {
490 st = rrdset_find_localhost("ipv4.udppackets");
491 if (unlikely(!st)) {
487 - st = rrdset_create("ipv4", "udppackets", NULL, "udp", NULL, "IPv4 UDP Packets",
488 - "packets/s", 2601, update_every, RRDSET_TYPE_LINE);
492 + st = rrdset_create_localhost("ipv4", "udppackets", NULL, "udp", NULL, "IPv4 UDP Packets"
493 + , "packets/s", 2601, update_every, RRDSET_TYPE_LINE);
494
495 rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
496 rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -502,8 +507,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
507 if (likely(do_udp_errors)) {
508 st = rrdset_find_localhost("ipv4.udperrors");
509 if (unlikely(!st)) {
505 - st = rrdset_create("ipv4", "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s",
506 - 2701, update_every, RRDSET_TYPE_LINE);
510 + st = rrdset_create_localhost("ipv4", "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s"
511 + , 2701, update_every, RRDSET_TYPE_LINE);
512 st->isdetail = 1;
513
514 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -545,9 +550,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
550 if (likely(do_icmp_packets)) {
551 st = rrdset_find_localhost("ipv4.icmp");
552 if (unlikely(!st)) {
548 - st = rrdset_create("ipv4", "icmp", NULL, "icmp", NULL, "IPv4 ICMP Packets", "packets/s",
549 - 2602,
550 - update_every, RRDSET_TYPE_LINE);
553 + st = rrdset_create_localhost("ipv4", "icmp", NULL, "icmp", NULL, "IPv4 ICMP Packets", "packets/s"
554 + , 2602, update_every, RRDSET_TYPE_LINE);
555
556 rrddim_add(st, "InMsgs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
557 rrddim_add(st, "OutMsgs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -563,9 +567,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
567
568 st = rrdset_find_localhost("ipv4.icmp_errors");
569 if (unlikely(!st)) {
566 - st = rrdset_create("ipv4", "icmp_errors", NULL, "icmp", NULL, "IPv4 ICMP Errors",
567 - "packets/s",
568 - 2603, update_every, RRDSET_TYPE_LINE);
570 + st = rrdset_create_localhost("ipv4", "icmp_errors", NULL, "icmp", NULL, "IPv4 ICMP Errors"
571 + , "packets/s", 2603, update_every, RRDSET_TYPE_LINE);
572
573 rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
574 rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -585,8 +588,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
588 if (likely(do_icmpmsg)) {
589 st = rrdset_find_localhost("ipv4.icmpmsg");
590 if (unlikely(!st)) {
588 - st = rrdset_create("ipv4", "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messsages",
589 - "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
591 + st = rrdset_create_localhost("ipv4", "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messsages"
592 + , "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
593
594 rrddim_add(st, "InEchoReps", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
595 rrddim_add(st, "OutEchoReps", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -622,8 +625,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
625 if (likely(do_ip_packets)) {
626 st = rrdset_find_localhost("ipv4.packets");
627 if (unlikely(!st)) {
625 - st = rrdset_create("ipv4", "packets", NULL, "packets", NULL, "IPv4 Packets", "packets/s",
626 - 3000, update_every, RRDSET_TYPE_LINE);
628 + st = rrdset_create_localhost("ipv4", "packets", NULL, "packets", NULL, "IPv4 Packets", "packets/s"
629 + , 3000, update_every, RRDSET_TYPE_LINE);
630
631 rrddim_add(st, "InReceives", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
632 rrddim_add(st, "OutRequests", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -644,8 +647,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
647 if (likely(do_ip_fragsout)) {
648 st = rrdset_find_localhost("ipv4.fragsout");
649 if (unlikely(!st)) {
647 - st = rrdset_create("ipv4", "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent",
648 - "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
650 + st = rrdset_create_localhost("ipv4", "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent"
651 + , "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
652 st->isdetail = 1;
653
654 rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -665,9 +668,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
668 if (likely(do_ip_fragsin)) {
669 st = rrdset_find_localhost("ipv4.fragsin");
670 if (unlikely(!st)) {
668 - st = rrdset_create("ipv4", "fragsin", NULL, "fragments", NULL,
669 - "IPv4 Fragments Reassembly",
670 - "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
671 + st = rrdset_create_localhost("ipv4", "fragsin", NULL, "fragments", NULL, "IPv4 Fragments Reassembly"
672 + , "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
673 st->isdetail = 1;
674
675 rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -687,9 +689,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
689 if (likely(do_ip_errors)) {
690 st = rrdset_find_localhost("ipv4.errors");
691 if (unlikely(!st)) {
690 - st = rrdset_create("ipv4", "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s",
691 - 3002,
692 - update_every, RRDSET_TYPE_LINE);
692 + st = rrdset_create_localhost("ipv4", "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s"
693 + , 3002, update_every, RRDSET_TYPE_LINE);
694 st->isdetail = 1;
695
696 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -733,8 +734,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
734 do_ip6_packets = CONFIG_ONDEMAND_YES;
735 st = rrdset_find_localhost("ipv6.packets");
736 if (unlikely(!st)) {
736 - st = rrdset_create("ipv6", "packets", NULL, "packets", NULL, "IPv6 Packets", "packets/s", 3000,
737 - update_every, RRDSET_TYPE_LINE);
737 + st = rrdset_create_localhost("ipv6", "packets", NULL, "packets", NULL, "IPv6 Packets", "packets/s"
738 + , 3000, update_every, RRDSET_TYPE_LINE);
739
740 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
741 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -758,8 +759,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
759 do_ip6_fragsout = CONFIG_ONDEMAND_YES;
760 st = rrdset_find_localhost("ipv6.fragsout");
761 if (unlikely(!st)) {
761 - st = rrdset_create("ipv6", "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent",
762 - "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
762 + st = rrdset_create_localhost("ipv6", "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent"
763 + , "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
764 st->isdetail = 1;
765
766 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -782,8 +783,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
783 do_ip6_fragsin = CONFIG_ONDEMAND_YES;
784 st = rrdset_find_localhost("ipv6.fragsin");
785 if (unlikely(!st)) {
785 - st = rrdset_create("ipv6", "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly",
786 - "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
786 + st = rrdset_create_localhost("ipv6", "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly"
787 + , "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
788 st->isdetail = 1;
789
790 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -815,8 +816,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
816 do_ip6_errors = CONFIG_ONDEMAND_YES;
817 st = rrdset_find_localhost("ipv6.errors");
818 if (unlikely(!st)) {
818 - st = rrdset_create("ipv6", "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s", 3002,
819 - update_every, RRDSET_TYPE_LINE);
819 + st = rrdset_create_localhost("ipv6", "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s"
820 + , 3002, update_every, RRDSET_TYPE_LINE);
821 st->isdetail = 1;
822
823 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -862,8 +863,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
863 do_icmp6 = CONFIG_ONDEMAND_YES;
864 st = rrdset_find_localhost("ipv6.icmp");
865 if (unlikely(!st)) {
865 - st = rrdset_create("ipv6", "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages",
866 - "messages/s", 10000, update_every, RRDSET_TYPE_LINE);
866 + st = rrdset_create_localhost("ipv6", "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages", "messages/s"
867 + , 10000, update_every, RRDSET_TYPE_LINE);
868
869 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
870 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -881,8 +882,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
882 do_icmp6_redir = CONFIG_ONDEMAND_YES;
883 st = rrdset_find_localhost("ipv6.icmpredir");
884 if (unlikely(!st)) {
884 - st = rrdset_create("ipv6", "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects",
885 - "redirects/s", 10050, update_every, RRDSET_TYPE_LINE);
885 + st = rrdset_create_localhost("ipv6", "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects"
886 + , "redirects/s", 10050, update_every, RRDSET_TYPE_LINE);
887
888 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
889 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -911,7 +912,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
912 do_icmp6_errors = CONFIG_ONDEMAND_YES;
913 st = rrdset_find_localhost("ipv6.icmperrors");
914 if (unlikely(!st)) {
914 - st = rrdset_create("ipv6", "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors", "errors/s", 10100, update_every, RRDSET_TYPE_LINE);
915 + st = rrdset_create_localhost("ipv6", "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors"
916 + , "errors/s", 10100, update_every, RRDSET_TYPE_LINE);
917
918 rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
919 rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -950,7 +952,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
952 do_icmp6_echos = CONFIG_ONDEMAND_YES;
953 st = rrdset_find_localhost("ipv6.icmpechos");
954 if (unlikely(!st)) {
953 - st = rrdset_create("ipv6", "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo", "messages/s", 10200, update_every, RRDSET_TYPE_LINE);
955 + st = rrdset_create_localhost("ipv6", "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo", "messages/s"
956 + , 10200, update_every, RRDSET_TYPE_LINE);
957
958 rrddim_add(st, "InEchos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
959 rrddim_add(st, "OutEchos", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -976,7 +979,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
979 do_icmp6_router = CONFIG_ONDEMAND_YES;
980 st = rrdset_find_localhost("ipv6.icmprouter");
981 if (unlikely(!st)) {
979 - st = rrdset_create("ipv6", "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages", "messages/s", 10400, update_every, RRDSET_TYPE_LINE);
982 + st = rrdset_create_localhost("ipv6", "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages"
983 + , "messages/s", 10400, update_every, RRDSET_TYPE_LINE);
984
985 rrddim_add(st, "InSolicits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
986 rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1002,7 +1006,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1006 do_icmp6_neighbor = CONFIG_ONDEMAND_YES;
1007 st = rrdset_find_localhost("ipv6.icmpneighbor");
1008 if (unlikely(!st)) {
1005 - st = rrdset_create("ipv6", "icmpneighbor", NULL, "icmp", NULL, "IPv6 Neighbor Messages", "messages/s", 10500, update_every, RRDSET_TYPE_LINE);
1009 + st = rrdset_create_localhost("ipv6", "icmpneighbor", NULL, "icmp", NULL, "IPv6 Neighbor Messages"
1010 + , "messages/s", 10500, update_every, RRDSET_TYPE_LINE);
1011
1012 rrddim_add(st, "InSolicits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1013 rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1034,8 +1039,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1039 do_icmp6_types = CONFIG_ONDEMAND_YES;
1040 st = rrdset_find_localhost("ipv6.icmptypes");
1041 if (unlikely(!st)) {
1037 - st = rrdset_create("ipv6", "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types",
1038 - "messages/s", 10700, update_every, RRDSET_TYPE_LINE);
1042 + st = rrdset_create_localhost("ipv6", "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types"
1043 + , "messages/s", 10700, update_every, RRDSET_TYPE_LINE);
1044
1045 rrddim_add(st, "InType1", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
1046 rrddim_add(st, "InType128", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1076,7 +1081,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
1081 st = rrdset_find_localhost("system.uptime");
1082
1083 if(unlikely(!st)) {
1079 - st = rrdset_create("system", "uptime", NULL, "uptime", NULL, "System Uptime", "seconds", 1000, update_every, RRDSET_TYPE_LINE);
1084 + st = rrdset_create_localhost("system", "uptime", NULL, "uptime", NULL, "System Uptime", "seconds", 1000
1085 + , update_every, RRDSET_TYPE_LINE);
1086 rrddim_add(st, "uptime", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
1087 }
1088 else rrdset_next(st);
src/plugin_checks.c
+6 -3
@@ -16,15 +16,18 @@ void *checks_main(void *ptr) {
16
17 RRDSET *check1, *check2, *check3, *apps_cpu = NULL;
18
19 - check1 = rrdset_create("netdata", "check1", NULL, "netdata", NULL, "Caller gives microseconds", "a million !", 99999, rrd_update_every, RRDSET_TYPE_LINE);
19 + check1 = rrdset_create_localhost("netdata", "check1", NULL, "netdata", NULL, "Caller gives microseconds"
20 + , "a million !", 99999, rrd_update_every, RRDSET_TYPE_LINE);
21 rrddim_add(check1, "absolute", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
22 rrddim_add(check1, "incremental", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
23
23 - check2 = rrdset_create("netdata", "check2", NULL, "netdata", NULL, "Netdata calcs microseconds", "a million !", 99999, rrd_update_every, RRDSET_TYPE_LINE);
24 + check2 = rrdset_create_localhost("netdata", "check2", NULL, "netdata", NULL, "Netdata calcs microseconds"
25 + , "a million !", 99999, rrd_update_every, RRDSET_TYPE_LINE);
26 rrddim_add(check2, "absolute", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
27 rrddim_add(check2, "incremental", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
28
27 - check3 = rrdset_create("netdata", "checkdt", NULL, "netdata", NULL, "Clock difference", "microseconds diff", 99999, rrd_update_every, RRDSET_TYPE_LINE);
29 + check3 = rrdset_create_localhost("netdata", "checkdt", NULL, "netdata", NULL, "Clock difference"
30 + , "microseconds diff", 99999, rrd_update_every, RRDSET_TYPE_LINE);
31 rrddim_add(check3, "caller", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
32 rrddim_add(check3, "netdata", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
33 rrddim_add(check3, "apps.plugin", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
src/plugin_idlejitter.c
+2 -1
@@ -21,7 +21,8 @@ void *cpuidlejitter_main(void *ptr) {
21
22 RRDSET *st = rrdset_find_localhost("system.idlejitter");
23 if(!st) {
24 - st = rrdset_create("system", "idlejitter", NULL, "processes", NULL, "CPU Idle Jitter", "microseconds lost/s", 9999, rrd_update_every, RRDSET_TYPE_LINE);
24 + st = rrdset_create_localhost("system", "idlejitter", NULL, "processes", NULL, "CPU Idle Jitter"
25 + , "microseconds lost/s", 9999, rrd_update_every, RRDSET_TYPE_LINE);
26 rrddim_add(st, "jitter", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
27 }
28
src/plugin_proc.c
+3 -1
@@ -115,7 +115,9 @@ void *proc_main(void *ptr) {
115 st = rrdset_find_bytype_localhost("netdata", "plugin_proc_modules");
116
117 if(!st) {
118 - st = rrdset_create("netdata", "plugin_proc_modules", NULL, "proc", NULL, "NetData Proc Plugin Modules Durations", "milliseconds/run", 132001, rrd_update_every, RRDSET_TYPE_STACKED);
118 + st = rrdset_create_localhost("netdata", "plugin_proc_modules", NULL, "proc", NULL
119 + , "NetData Proc Plugin Modules Durations", "milliseconds/run", 132001
120 + , rrd_update_every, RRDSET_TYPE_STACKED);
121
122 for(i = 0 ; proc_modules[i].name ;i++) {
123 struct proc_module *pm = &proc_modules[i];
src/plugin_proc_diskspace.c
+14 -8
@@ -157,7 +157,8 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
157 if(unlikely(!m->st_space)) {
158 char title[4096 + 1];
159 snprintfz(title, 4096, "Disk Space Usage for %s [%s]", family, mi->mount_source);
160 - m->st_space = rrdset_create("disk_space", disk, NULL, family, "disk.space", title, "GB", 2023, update_every, RRDSET_TYPE_STACKED);
160 + m->st_space = rrdset_create_localhost("disk_space", disk, NULL, family, "disk.space", title, "GB", 2023
161 + , update_every, RRDSET_TYPE_STACKED);
162 }
163
164 m->rd_space_avail = rrddim_add(m->st_space, "avail", NULL, bsize, 1024 * 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -184,7 +185,8 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
185 if(unlikely(!m->st_inodes)) {
186 char title[4096 + 1];
187 snprintfz(title, 4096, "Disk Files (inodes) Usage for %s [%s]", family, mi->mount_source);
187 - m->st_inodes = rrdset_create("disk_inodes", disk, NULL, family, "disk.inodes", title, "Inodes", 2024, update_every, RRDSET_TYPE_STACKED);
188 + m->st_inodes = rrdset_create_localhost("disk_inodes", disk, NULL, family, "disk.inodes", title, "Inodes"
189 + , 2024, update_every, RRDSET_TYPE_STACKED);
190 }
191
192 m->rd_inodes_avail = rrddim_add(m->st_inodes, "avail", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -273,9 +275,11 @@ void *proc_diskspace_main(void *ptr) {
275
276 if(!stcpu_thread) {
277 stcpu_thread = rrdset_find_localhost("netdata.plugin_diskspace");
276 - if(!stcpu_thread) stcpu_thread = rrdset_create("netdata", "plugin_diskspace", NULL, "diskspace", NULL
277 - , "NetData Disk Space Plugin CPU usage", "milliseconds/s", 132020
278 - , update_every, RRDSET_TYPE_STACKED);
278 + if(!stcpu_thread) stcpu_thread = rrdset_create_localhost("netdata", "plugin_diskspace", NULL
279 + , "diskspace", NULL
280 + , "NetData Disk Space Plugin CPU usage"
281 + , "milliseconds/s", 132020
282 + , update_every, RRDSET_TYPE_STACKED);
283
284 rd_user = rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
285 rd_system = rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
@@ -291,9 +295,11 @@ void *proc_diskspace_main(void *ptr) {
295
296 if(!st_duration) {
297 st_duration = rrdset_find_localhost("netdata.plugin_diskspace_dt");
294 - if(!st_duration) st_duration = rrdset_create("netdata", "plugin_diskspace_dt", NULL, "diskspace", NULL
295 - , "NetData Disk Space Plugin Duration", "milliseconds/run", 132021
296 - , update_every, RRDSET_TYPE_AREA);
298 + if(!st_duration) st_duration = rrdset_create_localhost("netdata", "plugin_diskspace_dt", NULL
299 + , "diskspace", NULL
300 + , "NetData Disk Space Plugin Duration"
301 + , "milliseconds/run", 132021
302 + , update_every, RRDSET_TYPE_AREA);
303
304 rd_duration = rrddim_add(st_duration, "duration", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
305 }
src/plugin_tc.c
+26 -7
@@ -374,7 +374,11 @@ static inline void tc_device_commit(struct tc_device *d) {
374 d->enabled_bytes = CONFIG_ONDEMAND_YES;
375
376 if(unlikely(!d->st_bytes))
377 - d->st_bytes = rrdset_create(RRD_TYPE_TC, d->id, d->name?d->name:d->id, d->family?d->family:d->id, RRD_TYPE_TC ".qos", "Class Usage", "kilobits/s", 7000, rrd_update_every, d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE : RRDSET_TYPE_STACKED);
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, rrd_update_every
380 + , d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE
381 + : RRDSET_TYPE_STACKED);
382
383 else {
384 rrdset_next(d->st_bytes);
@@ -409,7 +413,10 @@ static inline void tc_device_commit(struct tc_device *d) {
413 snprintfz(id, RRD_ID_LENGTH_MAX, "%s_packets", d->id);
414 snprintfz(name, RRD_ID_LENGTH_MAX, "%s_packets", d->name?d->name:d->id);
415
412 - d->st_packets = rrdset_create(RRD_TYPE_TC, id, name, d->family?d->family:d->id, RRD_TYPE_TC ".qos_packets", "Class Packets", "packets/s", 7010, rrd_update_every, d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE : RRDSET_TYPE_STACKED);
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 + , rrd_update_every, d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE
419 + : RRDSET_TYPE_STACKED);
420 }
421 else {
422 rrdset_next(d->st_packets);
@@ -449,7 +456,11 @@ static inline void tc_device_commit(struct tc_device *d) {
456 snprintfz(id, RRD_ID_LENGTH_MAX, "%s_dropped", d->id);
457 snprintfz(name, RRD_ID_LENGTH_MAX, "%s_dropped", d->name?d->name:d->id);
458
452 - d->st_dropped = rrdset_create(RRD_TYPE_TC, id, name, d->family?d->family:d->id, RRD_TYPE_TC ".qos_dropped", "Class Dropped Packets", "packets/s", 7020, rrd_update_every, d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE : RRDSET_TYPE_STACKED);
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, rrd_update_every
462 + , d->enabled_all_classes_qdiscs ? RRDSET_TYPE_LINE
463 + : RRDSET_TYPE_STACKED);
464 }
465 else {
466 rrdset_next(d->st_dropped);
@@ -489,7 +500,9 @@ static inline void tc_device_commit(struct tc_device *d) {
500 snprintfz(id, RRD_ID_LENGTH_MAX, "%s_tokens", d->id);
501 snprintfz(name, RRD_ID_LENGTH_MAX, "%s_tokens", d->name?d->name:d->id);
502
492 - d->st_tokens = rrdset_create(RRD_TYPE_TC, id, name, d->family?d->family:d->id, RRD_TYPE_TC ".qos_tokens", "Class Tokens", "tokens", 7030, rrd_update_every, RRDSET_TYPE_LINE);
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 + , rrd_update_every, RRDSET_TYPE_LINE);
506 }
507 else {
508 rrdset_next(d->st_tokens);
@@ -530,7 +543,9 @@ static inline void tc_device_commit(struct tc_device *d) {
543 snprintfz(id, RRD_ID_LENGTH_MAX, "%s_ctokens", d->id);
544 snprintfz(name, RRD_ID_LENGTH_MAX, "%s_ctokens", d->name?d->name:d->id);
545
533 - d->st_ctokens = rrdset_create(RRD_TYPE_TC, id, name, d->family?d->family:d->id, RRD_TYPE_TC ".qos_ctokens", "Class cTokens", "ctokens", 7040, rrd_update_every, RRDSET_TYPE_LINE);
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 + , rrd_update_every, RRDSET_TYPE_LINE);
549 }
550 else {
551 debug(D_TC_LOOP, "TC: Updating _ctokens chart for device '%s'", d->name?d->name:d->id);
@@ -976,7 +991,9 @@ void *tc_main(void *ptr) {
991
992 if(unlikely(!stcpu)) stcpu = rrdset_find_localhost("netdata.plugin_tc_cpu");
993 if(unlikely(!stcpu)) {
979 - stcpu = rrdset_create("netdata", "plugin_tc_cpu", NULL, "tc.helper", NULL, "NetData TC CPU usage", "milliseconds/s", 135000, rrd_update_every, RRDSET_TYPE_STACKED);
994 + stcpu = rrdset_create_localhost("netdata", "plugin_tc_cpu", NULL, "tc.helper", NULL
995 + , "NetData TC CPU usage", "milliseconds/s", 135000, rrd_update_every
996 + , RRDSET_TYPE_STACKED);
997 rrddim_add(stcpu, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
998 rrddim_add(stcpu, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
999 }
@@ -988,7 +1005,9 @@ void *tc_main(void *ptr) {
1005
1006 if(unlikely(!sttime)) stcpu = rrdset_find_localhost("netdata.plugin_tc_time");
1007 if(unlikely(!sttime)) {
991 - sttime = rrdset_create("netdata", "plugin_tc_time", NULL, "tc.helper", NULL, "NetData TC script execution", "milliseconds/run", 135001, rrd_update_every, RRDSET_TYPE_AREA);
1008 + sttime = rrdset_create_localhost("netdata", "plugin_tc_time", NULL, "tc.helper", NULL
1009 + , "NetData TC script execution", "milliseconds/run", 135001
1010 + , rrd_update_every, RRDSET_TYPE_AREA);
1011 rrddim_add(sttime, "run_time", "run time", 1, 1, RRD_ALGORITHM_ABSOLUTE);
1012 }
1013 else rrdset_next(sttime);
src/plugins_d.c
+2 -1
@@ -284,7 +284,8 @@ void *pluginsd_worker_thread(void *arg) {
284 , update_every
285 );
286
287 - st = rrdset_create(type, id, name, family, context, title, units, priority, update_every, chart_type);
287 + st = rrdset_create(host, type, id, name, family, context, title, units, priority, update_every
288 + , chart_type);
289 cd->update_every = update_every;
290 }
291 else debug(D_PLUGINSD, "PLUGINSD: Chart '%s' already exists. Not adding it again.", st->id);
src/proc_diskstats.c
+22 -10
@@ -419,7 +419,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
419
420 st = rrdset_find_bytype_localhost(RRD_TYPE_DISK, disk);
421 if(unlikely(!st)) {
422 - st = rrdset_create(RRD_TYPE_DISK, disk, NULL, family, "disk.io", "Disk I/O Bandwidth", "kilobytes/s", 2000, update_every, RRDSET_TYPE_AREA);
422 + st = rrdset_create_localhost(RRD_TYPE_DISK, disk, NULL, family, "disk.io", "Disk I/O Bandwidth"
423 + , "kilobytes/s", 2000, update_every, RRDSET_TYPE_AREA);
424
425 rrddim_add(st, "reads", NULL, d->sector_size, 1024, RRD_ALGORITHM_INCREMENTAL);
426 rrddim_add(st, "writes", NULL, d->sector_size * -1, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -438,7 +439,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
439
440 st = rrdset_find_bytype_localhost("disk_ops", disk);
441 if(unlikely(!st)) {
441 - st = rrdset_create("disk_ops", disk, NULL, family, "disk.ops", "Disk Completed I/O Operations", "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
442 + st = rrdset_create_localhost("disk_ops", disk, NULL, family, "disk.ops", "Disk Completed I/O Operations"
443 + , "operations/s", 2001, update_every, RRDSET_TYPE_LINE);
444 st->isdetail = 1;
445
446 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -458,7 +460,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
460
461 st = rrdset_find_bytype_localhost("disk_qops", disk);
462 if(unlikely(!st)) {
461 - st = rrdset_create("disk_qops", disk, NULL, family, "disk.qops", "Disk Current I/O Operations", "operations", 2002, update_every, RRDSET_TYPE_LINE);
463 + st = rrdset_create_localhost("disk_qops", disk, NULL, family, "disk.qops", "Disk Current I/O Operations"
464 + , "operations", 2002, update_every, RRDSET_TYPE_LINE);
465 st->isdetail = 1;
466
467 rrddim_add(st, "operations", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -476,7 +479,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
479
480 st = rrdset_find_bytype_localhost("disk_backlog", disk);
481 if(unlikely(!st)) {
479 - st = rrdset_create("disk_backlog", disk, NULL, family, "disk.backlog", "Disk Backlog", "backlog (ms)", 2003, update_every, RRDSET_TYPE_AREA);
482 + st = rrdset_create_localhost("disk_backlog", disk, NULL, family, "disk.backlog", "Disk Backlog"
483 + , "backlog (ms)", 2003, update_every, RRDSET_TYPE_AREA);
484 st->isdetail = 1;
485
486 rrddim_add(st, "backlog", NULL, 1, 10, RRD_ALGORITHM_INCREMENTAL);
@@ -494,7 +498,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
498
499 st = rrdset_find_bytype_localhost("disk_util", disk);
500 if(unlikely(!st)) {
497 - st = rrdset_create("disk_util", disk, NULL, family, "disk.util", "Disk Utilization Time", "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
501 + st = rrdset_create_localhost("disk_util", disk, NULL, family, "disk.util", "Disk Utilization Time"
502 + , "% of time working", 2004, update_every, RRDSET_TYPE_AREA);
503 st->isdetail = 1;
504
505 rrddim_add(st, "utilization", NULL, 1, 10, RRD_ALGORITHM_INCREMENTAL);
@@ -512,7 +517,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
517
518 st = rrdset_find_bytype_localhost("disk_mops", disk);
519 if(unlikely(!st)) {
515 - st = rrdset_create("disk_mops", disk, NULL, family, "disk.mops", "Disk Merged Operations", "merged operations/s", 2021, update_every, RRDSET_TYPE_LINE);
520 + st = rrdset_create_localhost("disk_mops", disk, NULL, family, "disk.mops", "Disk Merged Operations"
521 + , "merged operations/s", 2021, update_every, RRDSET_TYPE_LINE);
522 st->isdetail = 1;
523
524 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -532,7 +538,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
538
539 st = rrdset_find_bytype_localhost("disk_iotime", disk);
540 if(unlikely(!st)) {
535 - st = rrdset_create("disk_iotime", disk, NULL, family, "disk.iotime", "Disk Total I/O Time", "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
541 + st = rrdset_create_localhost("disk_iotime", disk, NULL, family, "disk.iotime", "Disk Total I/O Time"
542 + , "milliseconds/s", 2022, update_every, RRDSET_TYPE_LINE);
543 st->isdetail = 1;
544
545 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -554,7 +561,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
561 (d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
562 st = rrdset_find_bytype_localhost("disk_await", disk);
563 if(unlikely(!st)) {
557 - st = rrdset_create("disk_await", disk, NULL, family, "disk.await", "Average Completed I/O Operation Time", "ms per operation", 2005, update_every, RRDSET_TYPE_LINE);
564 + st = rrdset_create_localhost("disk_await", disk, NULL, family, "disk.await"
565 + , "Average Completed I/O Operation Time", "ms per operation", 2005
566 + , update_every, RRDSET_TYPE_LINE);
567 st->isdetail = 1;
568
569 rrddim_add(st, "reads", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -571,7 +580,9 @@ int do_proc_diskstats(int update_every, usec_t dt) {
580 (d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
581 st = rrdset_find_bytype_localhost("disk_avgsz", disk);
582 if(unlikely(!st)) {
574 - st = rrdset_create("disk_avgsz", disk, NULL, family, "disk.avgsz", "Average Completed I/O Operation Bandwidth", "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
583 + st = rrdset_create_localhost("disk_avgsz", disk, NULL, family, "disk.avgsz"
584 + , "Average Completed I/O Operation Bandwidth"
585 + , "kilobytes per operation", 2006, update_every, RRDSET_TYPE_AREA);
586 st->isdetail = 1;
587
588 rrddim_add(st, "reads", NULL, d->sector_size, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -588,7 +599,8 @@ int do_proc_diskstats(int update_every, usec_t dt) {
599 (d->do_ops == CONFIG_ONDEMAND_YES || (d->do_ops == CONFIG_ONDEMAND_ONDEMAND && (reads || writes)))) {
600 st = rrdset_find_bytype_localhost("disk_svctm", disk);
601 if(unlikely(!st)) {
591 - st = rrdset_create("disk_svctm", disk, NULL, family, "disk.svctm", "Average Service Time", "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
602 + st = rrdset_create_localhost("disk_svctm", disk, NULL, family, "disk.svctm", "Average Service Time"
603 + , "ms per operation", 2007, update_every, RRDSET_TYPE_LINE);
604 st->isdetail = 1;
605
606 rrddim_add(st, "svctm", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
src/proc_interrupts.c
+4 -2
@@ -147,7 +147,8 @@ int do_proc_interrupts(int update_every, usec_t dt) {
147 // --------------------------------------------------------------------
148
149 st = rrdset_find_bytype_localhost("system", "interrupts");
150 - if(unlikely(!st)) st = rrdset_create("system", "interrupts", NULL, "interrupts", NULL, "System interrupts", "interrupts/s", 1000, update_every, RRDSET_TYPE_STACKED);
150 + if(unlikely(!st)) st = rrdset_create_localhost("system", "interrupts", NULL, "interrupts", NULL, "System interrupts"
151 + , "interrupts/s", 1000, update_every, RRDSET_TYPE_STACKED);
152 else rrdset_next(st);
153
154 for(l = 0; l < lines ;l++) {
@@ -185,7 +186,8 @@ int do_proc_interrupts(int update_every, usec_t dt) {
186 if(unlikely(!st)) {
187 char title[100+1];
188 snprintfz(title, 100, "CPU%d Interrupts", c);
188 - st = rrdset_create("cpu", id, NULL, "interrupts", "cpu.interrupts", title, "interrupts/s", 1100 + c, update_every, RRDSET_TYPE_STACKED);
189 + st = rrdset_create_localhost("cpu", id, NULL, "interrupts", "cpu.interrupts", title, "interrupts/s",
190 + 1100 + c, update_every, RRDSET_TYPE_STACKED);
191 }
192 else rrdset_next(st);
193
src/proc_loadavg.c
+7 -2
@@ -52,7 +52,10 @@ int do_proc_loadavg(int update_every, usec_t dt) {
52 if(unlikely(!load_chart)) {
53 load_chart = rrdset_find_byname_localhost("system.load");
54 if(unlikely(!load_chart)) {
55 - load_chart = rrdset_create("system", "load", NULL, "load", NULL, "System Load Average", "load", 100, (update_every < MIN_LOADAVG_UPDATE_EVERY) ? MIN_LOADAVG_UPDATE_EVERY : update_every, RRDSET_TYPE_LINE);
55 + load_chart = rrdset_create_localhost("system", "load", NULL, "load", NULL, "System Load Average"
56 + , "load", 100, (update_every < MIN_LOADAVG_UPDATE_EVERY)
57 + ? MIN_LOADAVG_UPDATE_EVERY : update_every
58 + , RRDSET_TYPE_LINE);
59 rrddim_add(load_chart, "load1", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
60 rrddim_add(load_chart, "load5", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
61 rrddim_add(load_chart, "load15", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
@@ -77,7 +80,9 @@ int do_proc_loadavg(int update_every, usec_t dt) {
80 if(unlikely(!processes_chart)) {
81 processes_chart = rrdset_find_byname_localhost("system.active_processes");
82 if(unlikely(!processes_chart)) {
80 - processes_chart = rrdset_create("system", "active_processes", NULL, "processes", NULL, "System Active Processes", "processes", 750, update_every, RRDSET_TYPE_LINE);
83 + processes_chart = rrdset_create_localhost("system", "active_processes", NULL, "processes", NULL
84 + , "System Active Processes", "processes", 750, update_every
85 + , RRDSET_TYPE_LINE);
86 rrddim_add(processes_chart, "active", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
87 }
88 }
src/proc_meminfo.c
+14 -7
@@ -142,7 +142,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
142 if(do_ram) {
143 st = rrdset_find_localhost("system.ram");
144 if(!st) {
145 - st = rrdset_create("system", "ram", NULL, "ram", NULL, "System RAM", "MB", 200, update_every, RRDSET_TYPE_STACKED);
145 + st = rrdset_create_localhost("system", "ram", NULL, "ram", NULL, "System RAM", "MB", 200, update_every
146 + , RRDSET_TYPE_STACKED);
147
148 rrddim_add(st, "free", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
149 rrddim_add(st, "used", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -167,7 +168,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
168
169 st = rrdset_find_localhost("system.swap");
170 if(!st) {
170 - st = rrdset_create("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every, RRDSET_TYPE_STACKED);
171 + st = rrdset_create_localhost("system", "swap", NULL, "swap", NULL, "System Swap", "MB", 201, update_every
172 + , RRDSET_TYPE_STACKED);
173 st->isdetail = 1;
174
175 rrddim_add(st, "free", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -187,7 +189,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
189
190 st = rrdset_find_localhost("mem.hwcorrupt");
191 if(!st) {
190 - st = rrdset_create("mem", "hwcorrupt", NULL, "ecc", NULL, "Hardware Corrupted ECC", "MB", 9000, update_every, RRDSET_TYPE_LINE);
192 + st = rrdset_create_localhost("mem", "hwcorrupt", NULL, "ecc", NULL, "Hardware Corrupted ECC", "MB", 9000
193 + , update_every, RRDSET_TYPE_LINE);
194 st->isdetail = 1;
195
196 rrddim_add(st, "HardwareCorrupted", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -203,7 +206,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
206 if(do_committed) {
207 st = rrdset_find_localhost("mem.committed");
208 if(!st) {
206 - st = rrdset_create("mem", "committed", NULL, "system", NULL, "Committed (Allocated) Memory", "MB", 5000, update_every, RRDSET_TYPE_AREA);
209 + st = rrdset_create_localhost("mem", "committed", NULL, "system", NULL, "Committed (Allocated) Memory", "MB"
210 + , 5000, update_every, RRDSET_TYPE_AREA);
211 st->isdetail = 1;
212
213 rrddim_add(st, "Committed_AS", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -219,7 +223,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
223 if(do_writeback) {
224 st = rrdset_find_localhost("mem.writeback");
225 if(!st) {
222 - st = rrdset_create("mem", "writeback", NULL, "kernel", NULL, "Writeback Memory", "MB", 4000, update_every, RRDSET_TYPE_LINE);
226 + st = rrdset_create_localhost("mem", "writeback", NULL, "kernel", NULL, "Writeback Memory", "MB", 4000
227 + , update_every, RRDSET_TYPE_LINE);
228 st->isdetail = 1;
229
230 rrddim_add(st, "Dirty", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -243,7 +248,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
248 if(do_kernel) {
249 st = rrdset_find_localhost("mem.kernel");
250 if(!st) {
246 - st = rrdset_create("mem", "kernel", NULL, "kernel", NULL, "Memory Used by Kernel", "MB", 6000, update_every, RRDSET_TYPE_STACKED);
251 + st = rrdset_create_localhost("mem", "kernel", NULL, "kernel", NULL, "Memory Used by Kernel", "MB", 6000
252 + , update_every, RRDSET_TYPE_STACKED);
253 st->isdetail = 1;
254
255 rrddim_add(st, "Slab", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -265,7 +271,8 @@ int do_proc_meminfo(int update_every, usec_t dt) {
271 if(do_slab) {
272 st = rrdset_find_localhost("mem.slab");
273 if(!st) {
268 - st = rrdset_create("mem", "slab", NULL, "slab", NULL, "Reclaimable Kernel Memory", "MB", 6500, update_every, RRDSET_TYPE_STACKED);
274 + st = rrdset_create_localhost("mem", "slab", NULL, "slab", NULL, "Reclaimable Kernel Memory", "MB", 6500
275 + , update_every, RRDSET_TYPE_STACKED);
276 st->isdetail = 1;
277
278 rrddim_add(st, "reclaimable", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
src/proc_net_dev.c
+20 -7
@@ -226,7 +226,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
226 d->st_bandwidth = rrdset_find_bytype_localhost("net", d->name);
227
228 if(!d->st_bandwidth)
229 - d->st_bandwidth = rrdset_create("net", d->name, NULL, d->name, "net.net", "Bandwidth", "kilobits/s", 7000, update_every, RRDSET_TYPE_AREA);
229 + d->st_bandwidth = rrdset_create_localhost("net", d->name, NULL, d->name, "net.net", "Bandwidth"
230 + , "kilobits/s", 7000, update_every, RRDSET_TYPE_AREA);
231
232 d->rd_rbytes = rrddim_add(d->st_bandwidth, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
233 d->rd_tbytes = rrddim_add(d->st_bandwidth, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -248,7 +249,9 @@ int do_proc_net_dev(int update_every, usec_t dt) {
249 d->st_packets = rrdset_find_bytype_localhost("net_packets", d->name);
250
251 if(!d->st_packets)
251 - d->st_packets = rrdset_create("net_packets", d->name, NULL, d->name, "net.packets", "Packets", "packets/s", 7001, update_every, RRDSET_TYPE_LINE);
252 + d->st_packets = rrdset_create_localhost("net_packets", d->name, NULL, d->name, "net.packets"
253 + , "Packets", "packets/s", 7001, update_every
254 + , RRDSET_TYPE_LINE);
255
256 d->st_packets->isdetail = 1;
257
@@ -274,7 +277,9 @@ int do_proc_net_dev(int update_every, usec_t dt) {
277 d->st_errors = rrdset_find_bytype_localhost("net_errors", d->name);
278
279 if(!d->st_errors)
277 - d->st_errors = rrdset_create("net_errors", d->name, NULL, d->name, "net.errors", "Interface Errors", "errors/s", 7002, update_every, RRDSET_TYPE_LINE);
280 + d->st_errors = rrdset_create_localhost("net_errors", d->name, NULL, d->name, "net.errors"
281 + , "Interface Errors", "errors/s", 7002, update_every
282 + , RRDSET_TYPE_LINE);
283
284 d->st_errors->isdetail = 1;
285
@@ -298,7 +303,9 @@ int do_proc_net_dev(int update_every, usec_t dt) {
303 d->st_drops = rrdset_find_bytype_localhost("net_drops", d->name);
304
305 if(!d->st_drops)
301 - d->st_drops = rrdset_create("net_drops", d->name, NULL, d->name, "net.drops", "Interface Drops", "drops/s", 7003, update_every, RRDSET_TYPE_LINE);
306 + d->st_drops = rrdset_create_localhost("net_drops", d->name, NULL, d->name, "net.drops"
307 + , "Interface Drops", "drops/s", 7003, update_every
308 + , RRDSET_TYPE_LINE);
309
310 d->st_drops->isdetail = 1;
311
@@ -322,7 +329,9 @@ int do_proc_net_dev(int update_every, usec_t dt) {
329 d->st_fifo = rrdset_find_bytype_localhost("net_fifo", d->name);
330
331 if(!d->st_fifo)
325 - d->st_fifo = rrdset_create("net_fifo", d->name, NULL, d->name, "net.fifo", "Interface FIFO Buffer Errors", "errors", 7004, update_every, RRDSET_TYPE_LINE);
332 + d->st_fifo = rrdset_create_localhost("net_fifo", d->name, NULL, d->name, "net.fifo"
333 + , "Interface FIFO Buffer Errors", "errors", 7004, update_every
334 + , RRDSET_TYPE_LINE);
335
336 d->st_fifo->isdetail = 1;
337
@@ -345,7 +354,9 @@ int do_proc_net_dev(int update_every, usec_t dt) {
354 if(unlikely(!d->st_compressed)) {
355 d->st_compressed = rrdset_find_bytype_localhost("net_compressed", d->name);
356 if(!d->st_compressed)
348 - d->st_compressed = rrdset_create("net_compressed", d->name, NULL, d->name, "net.compressed", "Compressed Packets", "packets/s", 7005, update_every, RRDSET_TYPE_LINE);
357 + d->st_compressed = rrdset_create_localhost("net_compressed", d->name, NULL, d->name
358 + , "net.compressed", "Compressed Packets", "packets/s"
359 + , 7005, update_every, RRDSET_TYPE_LINE);
360
361 d->st_compressed->isdetail = 1;
362
@@ -368,7 +379,9 @@ int do_proc_net_dev(int update_every, usec_t dt) {
379 if(unlikely(!d->st_events)) {
380 d->st_events = rrdset_find_bytype_localhost("net_events", d->name);
381 if(!d->st_events)
371 - d->st_events = rrdset_create("net_events", d->name, NULL, d->name, "net.events", "Network Interface Events", "events/s", 7006, update_every, RRDSET_TYPE_LINE);
382 + d->st_events = rrdset_create_localhost("net_events", d->name, NULL, d->name, "net.events"
383 + , "Network Interface Events", "events/s", 7006, update_every
384 + , RRDSET_TYPE_LINE);
385
386 d->st_events->isdetail = 1;
387
src/proc_net_ip_vs_stats.c
+7 -3
@@ -42,7 +42,9 @@ 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(RRD_TYPE_NET_IPVS, "sockets", NULL, RRD_TYPE_NET_IPVS, NULL, "IPVS New Connections", "connections/s", 3101, update_every, RRDSET_TYPE_LINE);
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);
48
49 rrddim_add(st, "connections", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
50 }
@@ -57,7 +59,8 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
59 if(do_packets) {
60 st = rrdset_find_localhost(RRD_TYPE_NET_IPVS ".packets");
61 if(!st) {
60 - st = rrdset_create(RRD_TYPE_NET_IPVS, "packets", NULL, RRD_TYPE_NET_IPVS, NULL, "IPVS Packets", "packets/s", 3102, update_every, RRDSET_TYPE_LINE);
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);
64
65 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
66 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -74,7 +77,8 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
77 if(do_bandwidth) {
78 st = rrdset_find_localhost(RRD_TYPE_NET_IPVS ".net");
79 if(!st) {
77 - st = rrdset_create(RRD_TYPE_NET_IPVS, "net", NULL, RRD_TYPE_NET_IPVS, NULL, "IPVS Bandwidth", "kilobits/s", 3100, update_every, RRDSET_TYPE_AREA);
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);
82
83 rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
84 rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_netstat.c
+25 -12
@@ -232,7 +232,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
232 do_bandwidth = CONFIG_ONDEMAND_YES;
233 st = rrdset_find_localhost("system.ipv4");
234 if(unlikely(!st)) {
235 - st = rrdset_create("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
235 + st = rrdset_create_localhost("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s"
236 + , 500, update_every, RRDSET_TYPE_AREA);
237
238 rrddim_add(st, "InOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
239 rrddim_add(st, "OutOctets", "sent", -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -250,7 +251,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
251 do_inerrors = CONFIG_ONDEMAND_YES;
252 st = rrdset_find_localhost("ipv4.inerrors");
253 if(unlikely(!st)) {
253 - st = rrdset_create("ipv4", "inerrors", NULL, "errors", NULL, "IPv4 Input Errors", "packets/s", 4000, update_every, RRDSET_TYPE_LINE);
254 + st = rrdset_create_localhost("ipv4", "inerrors", NULL, "errors", NULL, "IPv4 Input Errors"
255 + , "packets/s", 4000, update_every, RRDSET_TYPE_LINE);
256 st->isdetail = 1;
257
258 rrddim_add(st, "InNoRoutes", "noroutes", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -271,7 +273,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
273 do_mcast = CONFIG_ONDEMAND_YES;
274 st = rrdset_find_localhost("ipv4.mcast");
275 if(unlikely(!st)) {
274 - st = rrdset_create("ipv4", "mcast", NULL, "multicast", NULL, "IPv4 Multicast Bandwidth", "kilobits/s", 9000, update_every, RRDSET_TYPE_AREA);
276 + st = rrdset_create_localhost("ipv4", "mcast", NULL, "multicast", NULL, "IPv4 Multicast Bandwidth"
277 + , "kilobits/s", 9000, update_every, RRDSET_TYPE_AREA);
278 st->isdetail = 1;
279
280 rrddim_add(st, "InMcastOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -290,7 +293,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
293 do_bcast = CONFIG_ONDEMAND_YES;
294 st = rrdset_find_localhost("ipv4.bcast");
295 if(unlikely(!st)) {
293 - st = rrdset_create("ipv4", "bcast", NULL, "broadcast", NULL, "IPv4 Broadcast Bandwidth", "kilobits/s", 8000, update_every, RRDSET_TYPE_AREA);
296 + st = rrdset_create_localhost("ipv4", "bcast", NULL, "broadcast", NULL, "IPv4 Broadcast Bandwidth"
297 + , "kilobits/s", 8000, update_every, RRDSET_TYPE_AREA);
298 st->isdetail = 1;
299
300 rrddim_add(st, "InBcastOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -309,7 +313,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
313 do_mcast_p = CONFIG_ONDEMAND_YES;
314 st = rrdset_find_localhost("ipv4.mcastpkts");
315 if(unlikely(!st)) {
312 - st = rrdset_create("ipv4", "mcastpkts", NULL, "multicast", NULL, "IPv4 Multicast Packets", "packets/s", 8600, update_every, RRDSET_TYPE_LINE);
316 + st = rrdset_create_localhost("ipv4", "mcastpkts", NULL, "multicast", NULL, "IPv4 Multicast Packets"
317 + , "packets/s", 8600, update_every, RRDSET_TYPE_LINE);
318 st->isdetail = 1;
319
320 rrddim_add(st, "InMcastPkts", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -328,7 +333,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
333 do_bcast_p = CONFIG_ONDEMAND_YES;
334 st = rrdset_find_localhost("ipv4.bcastpkts");
335 if(unlikely(!st)) {
331 - st = rrdset_create("ipv4", "bcastpkts", NULL, "broadcast", NULL, "IPv4 Broadcast Packets", "packets/s", 8500, update_every, RRDSET_TYPE_LINE);
336 + st = rrdset_create_localhost("ipv4", "bcastpkts", NULL, "broadcast", NULL, "IPv4 Broadcast Packets"
337 + , "packets/s", 8500, update_every, RRDSET_TYPE_LINE);
338 st->isdetail = 1;
339
340 rrddim_add(st, "InBcastPkts", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -347,7 +353,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
353 do_ecn = CONFIG_ONDEMAND_YES;
354 st = rrdset_find_localhost("ipv4.ecnpkts");
355 if(unlikely(!st)) {
350 - st = rrdset_create("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics", "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
356 + st = rrdset_create_localhost("ipv4", "ecnpkts", NULL, "ecn", NULL, "IPv4 ECN Statistics"
357 + , "packets/s", 8700, update_every, RRDSET_TYPE_LINE);
358 st->isdetail = 1;
359
360 rrddim_add(st, "InCEPkts", "CEP", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -383,7 +390,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
390 do_tcpext_memory = CONFIG_ONDEMAND_YES;
391 st = rrdset_find_localhost("ipv4.tcpmemorypressures");
392 if(unlikely(!st)) {
386 - st = rrdset_create("ipv4", "tcpmemorypressures", NULL, "tcp", NULL, "TCP Memory Pressures", "events/s", 3000, update_every, RRDSET_TYPE_LINE);
393 + st = rrdset_create_localhost("ipv4", "tcpmemorypressures", NULL, "tcp", NULL, "TCP Memory Pressures"
394 + , "events/s", 3000, update_every, RRDSET_TYPE_LINE);
395
396 rrddim_add(st, "TCPMemoryPressures", "pressures", 1, 1, RRD_ALGORITHM_INCREMENTAL);
397 }
@@ -399,7 +407,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
407 do_tcpext_connaborts = CONFIG_ONDEMAND_YES;
408 st = rrdset_find_localhost("ipv4.tcpconnaborts");
409 if(unlikely(!st)) {
402 - st = rrdset_create("ipv4", "tcpconnaborts", NULL, "tcp", NULL, "TCP Connection Aborts", "connections/s", 3010, update_every, RRDSET_TYPE_LINE);
410 + st = rrdset_create_localhost("ipv4", "tcpconnaborts", NULL, "tcp", NULL, "TCP Connection Aborts"
411 + , "connections/s", 3010, update_every, RRDSET_TYPE_LINE);
412
413 rrddim_add(st, "TCPAbortOnData", "baddata", 1, 1, RRD_ALGORITHM_INCREMENTAL);
414 rrddim_add(st, "TCPAbortOnClose", "userclosed", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -424,7 +433,9 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
433 do_tcpext_reorder = CONFIG_ONDEMAND_YES;
434 st = rrdset_find_localhost("ipv4.tcpreorders");
435 if(unlikely(!st)) {
427 - st = rrdset_create("ipv4", "tcpreorders", NULL, "tcp", NULL, "TCP Reordered Packets by Detection Method", "packets/s", 3020, update_every, RRDSET_TYPE_LINE);
436 + st = rrdset_create_localhost("ipv4", "tcpreorders", NULL, "tcp", NULL
437 + , "TCP Reordered Packets by Detection Method", "packets/s", 3020
438 + , update_every, RRDSET_TYPE_LINE);
439
440 rrddim_add(st, "TCPTSReorder", "timestamp", 1, 1, RRD_ALGORITHM_INCREMENTAL);
441 rrddim_add(st, "TCPSACKReorder", "sack", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -446,7 +457,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
457 do_tcpext_ofo = CONFIG_ONDEMAND_YES;
458 st = rrdset_find_localhost("ipv4.tcpofo");
459 if(unlikely(!st)) {
449 - st = rrdset_create("ipv4", "tcpofo", NULL, "tcp", NULL, "TCP Out-Of-Order Queue", "packets/s", 3050, update_every, RRDSET_TYPE_LINE);
460 + st = rrdset_create_localhost("ipv4", "tcpofo", NULL, "tcp", NULL, "TCP Out-Of-Order Queue"
461 + , "packets/s", 3050, update_every, RRDSET_TYPE_LINE);
462
463 rrddim_add(st, "TCPOFOQueue", "inqueue", 1, 1, RRD_ALGORITHM_INCREMENTAL);
464 rrddim_add(st, "TCPOFODrop", "dropped", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -468,7 +480,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
480 do_tcpext_syscookies = CONFIG_ONDEMAND_YES;
481 st = rrdset_find_localhost("ipv4.tcpsyncookies");
482 if(unlikely(!st)) {
471 - st = rrdset_create("ipv4", "tcpsyncookies", NULL, "tcp", NULL, "TCP SYN Cookies", "packets/s", 3100, update_every, RRDSET_TYPE_LINE);
483 + st = rrdset_create_localhost("ipv4", "tcpsyncookies", NULL, "tcp", NULL, "TCP SYN Cookies"
484 + , "packets/s", 3100, update_every, RRDSET_TYPE_LINE);
485
486 rrddim_add(st, "SyncookiesRecv", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
487 rrddim_add(st, "SyncookiesSent", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_rpc_nfs.c
+10 -5
@@ -271,7 +271,8 @@ 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("nfs", "net", NULL, "network", NULL, "NFS Client Network", "operations/s", 5007, update_every, RRDSET_TYPE_STACKED);
274 + st = rrdset_create_localhost("nfs", "net", NULL, "network", NULL, "NFS Client Network", "operations/s", 5007
275 + , update_every, RRDSET_TYPE_STACKED);
276 st->isdetail = 1;
277
278 rrddim_add(st, "udp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -293,7 +294,8 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
294 if(do_rpc == 2) {
295 st = rrdset_find_bytype_localhost("nfs", "rpc");
296 if(!st) {
296 - st = rrdset_create("nfs", "rpc", NULL, "rpc", NULL, "NFS Client Remote Procedure Calls Statistics", "calls/s", 5008, update_every, RRDSET_TYPE_LINE);
297 + st = rrdset_create_localhost("nfs", "rpc", NULL, "rpc", NULL, "NFS Client Remote Procedure Calls Statistics"
298 + , "calls/s", 5008, update_every, RRDSET_TYPE_LINE);
299 st->isdetail = 1;
300
301 rrddim_add(st, "calls", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -314,7 +316,8 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
316 unsigned int i;
317 st = rrdset_find_bytype_localhost("nfs", "proc2");
318 if(!st) {
317 - st = rrdset_create("nfs", "proc2", NULL, "nfsv2rpc", NULL, "NFS v2 Client Remote Procedure Calls", "calls/s", 5009, update_every, RRDSET_TYPE_STACKED);
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);
321
322 for(i = 0; nfs_proc2_values[i].present ; i++)
323 rrddim_add(st, nfs_proc2_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -333,7 +336,8 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
336 unsigned int i;
337 st = rrdset_find_bytype_localhost("nfs", "proc3");
338 if(!st) {
336 - st = rrdset_create("nfs", "proc3", NULL, "nfsv3rpc", NULL, "NFS v3 Client Remote Procedure Calls", "calls/s", 5010, update_every, RRDSET_TYPE_STACKED);
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);
341
342 for(i = 0; nfs_proc3_values[i].present ; i++)
343 rrddim_add(st, nfs_proc3_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -352,7 +356,8 @@ int do_proc_net_rpc_nfs(int update_every, usec_t dt) {
356 unsigned int i;
357 st = rrdset_find_bytype_localhost("nfs", "proc4");
358 if(!st) {
355 - st = rrdset_create("nfs", "proc4", NULL, "nfsv4rpc", NULL, "NFS v4 Client Remote Procedure Calls", "calls/s", 5011, update_every, RRDSET_TYPE_STACKED);
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);
361
362 for(i = 0; nfs_proc4_values[i].present ; i++)
363 rrddim_add(st, nfs_proc4_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_rpc_nfsd.c
+29 -13
@@ -494,7 +494,8 @@ 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("nfsd", "readcache", NULL, "cache", NULL, "NFS Server Read Cache", "reads/s", 5000, update_every, RRDSET_TYPE_STACKED);
497 + st = rrdset_create_localhost("nfsd", "readcache", NULL, "cache", NULL, "NFS Server Read Cache", "reads/s"
498 + , 5000, update_every, RRDSET_TYPE_STACKED);
499
500 rrddim_add(st, "hits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
501 rrddim_add(st, "misses", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -513,7 +514,8 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
514 if(do_fh == 2) {
515 st = rrdset_find_bytype_localhost("nfsd", "filehandles");
516 if(!st) {
516 - st = rrdset_create("nfsd", "filehandles", NULL, "filehandles", NULL, "NFS Server File Handles", "handles/s", 5001, update_every, RRDSET_TYPE_LINE);
517 + st = rrdset_create_localhost("nfsd", "filehandles", NULL, "filehandles", NULL, "NFS Server File Handles"
518 + , "handles/s", 5001, update_every, RRDSET_TYPE_LINE);
519 st->isdetail = 1;
520
521 rrddim_add(st, "stale", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -537,7 +539,8 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
539 if(do_io == 2) {
540 st = rrdset_find_bytype_localhost("nfsd", "io");
541 if(!st) {
540 - st = rrdset_create("nfsd", "io", NULL, "io", NULL, "NFS Server I/O", "kilobytes/s", 5002, update_every, RRDSET_TYPE_AREA);
542 + st = rrdset_create_localhost("nfsd", "io", NULL, "io", NULL, "NFS Server I/O", "kilobytes/s", 5002
543 + , update_every, RRDSET_TYPE_AREA);
544
545 rrddim_add(st, "read", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
546 rrddim_add(st, "write", NULL, -1, 1000, RRD_ALGORITHM_INCREMENTAL);
@@ -554,7 +557,8 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
557 if(do_th == 2) {
558 st = rrdset_find_bytype_localhost("nfsd", "threads");
559 if(!st) {
557 - st = rrdset_create("nfsd", "threads", NULL, "threads", NULL, "NFS Server Threads", "threads", 5003, update_every, RRDSET_TYPE_LINE);
560 + st = rrdset_create_localhost("nfsd", "threads", NULL, "threads", NULL, "NFS Server Threads", "threads", 5003
561 + , update_every, RRDSET_TYPE_LINE);
562
563 rrddim_add(st, "threads", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
564 }
@@ -565,7 +569,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
569
570 st = rrdset_find_bytype_localhost("nfsd", "threads_fullcnt");
571 if(!st) {
568 - st = rrdset_create("nfsd", "threads_fullcnt", NULL, "threads", NULL, "NFS Server Threads Full Count", "ops/s", 5004, update_every, RRDSET_TYPE_LINE);
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);
575
576 rrddim_add(st, "full_count", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
577 }
@@ -576,7 +582,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
582
583 st = rrdset_find_bytype_localhost("nfsd", "threads_histogram");
584 if(!st) {
579 - st = rrdset_create("nfsd", "threads_histogram", NULL, "threads", NULL, "NFS Server Threads Usage Histogram", "percentage", 5005, update_every, RRDSET_TYPE_LINE);
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);
588
589 rrddim_add(st, "0%-10%", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
590 rrddim_add(st, "10%-20%", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
@@ -609,7 +617,8 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
617 if(do_ra == 2) {
618 st = rrdset_find_bytype_localhost("nfsd", "readahead");
619 if(!st) {
612 - st = rrdset_create("nfsd", "readahead", NULL, "readahead", NULL, "NFS Server Read Ahead Depth", "percentage", 5005, update_every, RRDSET_TYPE_STACKED);
620 + st = rrdset_create_localhost("nfsd", "readahead", NULL, "readahead", NULL, "NFS Server Read Ahead Depth"
621 + , "percentage", 5005, update_every, RRDSET_TYPE_STACKED);
622
623 rrddim_add(st, "10%", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
624 rrddim_add(st, "20%", NULL, 1, 1, RRD_ALGORITHM_PCENT_OVER_DIFF_TOTAL);
@@ -647,7 +656,8 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
656 if(do_net == 2) {
657 st = rrdset_find_bytype_localhost("nfsd", "net");
658 if(!st) {
650 - st = rrdset_create("nfsd", "net", NULL, "network", NULL, "NFS Server Network Statistics", "packets/s", 5007, update_every, RRDSET_TYPE_STACKED);
659 + st = rrdset_create_localhost("nfsd", "net", NULL, "network", NULL, "NFS Server Network Statistics"
660 + , "packets/s", 5007, update_every, RRDSET_TYPE_STACKED);
661 st->isdetail = 1;
662
663 rrddim_add(st, "udp", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -669,7 +679,9 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
679 if(do_rpc == 2) {
680 st = rrdset_find_bytype_localhost("nfsd", "rpc");
681 if(!st) {
672 - st = rrdset_create("nfsd", "rpc", NULL, "rpc", NULL, "NFS Server Remote Procedure Calls Statistics", "calls/s", 5008, update_every, RRDSET_TYPE_LINE);
682 + st = rrdset_create_localhost("nfsd", "rpc", NULL, "rpc", NULL
683 + , "NFS Server Remote Procedure Calls Statistics", "calls/s", 5008, update_every
684 + , RRDSET_TYPE_LINE);
685 st->isdetail = 1;
686
687 rrddim_add(st, "calls", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -693,7 +705,8 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
705 unsigned int i;
706 st = rrdset_find_bytype_localhost("nfsd", "proc2");
707 if(!st) {
696 - st = rrdset_create("nfsd", "proc2", NULL, "nfsv2rpc", NULL, "NFS v2 Server Remote Procedure Calls", "calls/s", 5009, update_every, RRDSET_TYPE_STACKED);
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);
710
711 for(i = 0; nfsd_proc2_values[i].present ; i++)
712 rrddim_add(st, nfsd_proc2_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -712,7 +725,8 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
725 unsigned int i;
726 st = rrdset_find_bytype_localhost("nfsd", "proc3");
727 if(!st) {
715 - st = rrdset_create("nfsd", "proc3", NULL, "nfsv3rpc", NULL, "NFS v3 Server Remote Procedure Calls", "calls/s", 5010, update_every, RRDSET_TYPE_STACKED);
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);
730
731 for(i = 0; nfsd_proc3_values[i].present ; i++)
732 rrddim_add(st, nfsd_proc3_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -731,7 +745,8 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
745 unsigned int i;
746 st = rrdset_find_bytype_localhost("nfsd", "proc4");
747 if(!st) {
734 - st = rrdset_create("nfsd", "proc4", NULL, "nfsv4rpc", NULL, "NFS v4 Server Remote Procedure Calls", "calls/s", 5011, update_every, RRDSET_TYPE_STACKED);
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);
750
751 for(i = 0; nfsd_proc4_values[i].present ; i++)
752 rrddim_add(st, nfsd_proc4_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -750,7 +765,8 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
765 unsigned int i;
766 st = rrdset_find_bytype_localhost("nfsd", "proc4ops");
767 if(!st) {
753 - st = rrdset_create("nfsd", "proc4ops", NULL, "nfsv2ops", NULL, "NFS v4 Server Operations", "operations/s", 5012, update_every, RRDSET_TYPE_STACKED);
768 + st = rrdset_create_localhost("nfsd", "proc4ops", NULL, "nfsv2ops", NULL, "NFS v4 Server Operations"
769 + , "operations/s", 5012, update_every, RRDSET_TYPE_STACKED);
770
771 for(i = 0; nfsd4_ops_values[i].present ; i++)
772 rrddim_add(st, nfsd4_ops_values[i].name, NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_snmp.c
+36 -15
@@ -394,7 +394,8 @@ 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(RRD_TYPE_NET_SNMP, "packets", NULL, "packets", NULL, "IPv4 Packets", "packets/s", 3000, update_every, RRDSET_TYPE_LINE);
397 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "packets", NULL, "packets", NULL, "IPv4 Packets"
398 + , "packets/s", 3000, update_every, RRDSET_TYPE_LINE);
399
400 rrddim_add(st, "InReceives", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
401 rrddim_add(st, "OutRequests", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -415,7 +416,9 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
416 if(do_ip_fragsout) {
417 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".fragsout");
418 if(!st) {
418 - st = rrdset_create(RRD_TYPE_NET_SNMP, "fragsout", NULL, "fragments", NULL, "IPv4 Fragments Sent", "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
419 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "fragsout", NULL, "fragments", NULL
420 + , "IPv4 Fragments Sent", "packets/s", 3010, update_every
421 + , RRDSET_TYPE_LINE);
422 st->isdetail = 1;
423
424 rrddim_add(st, "FragOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -435,7 +438,9 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
438 if(do_ip_fragsin) {
439 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".fragsin");
440 if(!st) {
438 - st = rrdset_create(RRD_TYPE_NET_SNMP, "fragsin", NULL, "fragments", NULL, "IPv4 Fragments Reassembly", "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
441 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "fragsin", NULL, "fragments", NULL
442 + , "IPv4 Fragments Reassembly", "packets/s", 3011, update_every
443 + , RRDSET_TYPE_LINE);
444 st->isdetail = 1;
445
446 rrddim_add(st, "ReasmOKs", "ok", 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -455,7 +460,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
460 if(do_ip_errors) {
461 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".errors");
462 if(!st) {
458 - st = rrdset_create(RRD_TYPE_NET_SNMP, "errors", NULL, "errors", NULL, "IPv4 Errors", "packets/s", 3002, update_every, RRDSET_TYPE_LINE);
463 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "errors", NULL, "errors", NULL, "IPv4 Errors"
464 + , "packets/s", 3002, update_every, RRDSET_TYPE_LINE);
465 st->isdetail = 1;
466
467 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -499,7 +505,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
505 if(do_icmp_packets) {
506 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".icmp");
507 if(!st) {
502 - st = rrdset_create(RRD_TYPE_NET_SNMP, "icmp", NULL, "icmp", NULL, "IPv4 ICMP Packets", "packets/s", 2602, update_every, RRDSET_TYPE_LINE);
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);
510
511 rrddim_add(st, "InMsgs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
512 rrddim_add(st, "OutMsgs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -513,7 +520,9 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
520
521 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".icmp_errors");
522 if(!st) {
516 - st = rrdset_create(RRD_TYPE_NET_SNMP, "icmp_errors", NULL, "icmp", NULL, "IPv4 ICMP Errors", "packets/s", 2603, update_every, RRDSET_TYPE_LINE);
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);
526
527 rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
528 rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -545,7 +554,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
554
555 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".icmpmsg");
556 if(!st) {
548 - st = rrdset_create(RRD_TYPE_NET_SNMP, "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messsages", "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
557 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "icmpmsg", NULL, "icmp", NULL, "IPv4 ICMP Messsages"
558 + , "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
559
560 for(i = 0; icmpmsg_data[i].name ;i++)
561 rrddim_add(st, icmpmsg_data[i].name, icmpmsg_data[i].label, icmpmsg_data[i].multiplier, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -580,7 +590,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
590 if(do_tcp_sockets) {
591 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".tcpsock");
592 if(!st) {
583 - st = rrdset_create(RRD_TYPE_NET_SNMP, "tcpsock", NULL, "tcp", NULL, "IPv4 TCP Connections", "active connections", 2500, update_every, RRDSET_TYPE_LINE);
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);
595
596 rrddim_add(st, "CurrEstab", "connections", 1, 1, RRD_ALGORITHM_ABSOLUTE);
597 }
@@ -595,7 +606,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
606 if(do_tcp_packets) {
607 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".tcppackets");
608 if(!st) {
598 - st = rrdset_create(RRD_TYPE_NET_SNMP, "tcppackets", NULL, "tcp", NULL, "IPv4 TCP Packets", "packets/s", 2600, update_every, RRDSET_TYPE_LINE);
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);
611
612 rrddim_add(st, "InSegs", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
613 rrddim_add(st, "OutSegs", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -612,7 +624,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
624 if(do_tcp_errors) {
625 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".tcperrors");
626 if(!st) {
615 - st = rrdset_create(RRD_TYPE_NET_SNMP, "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors", "packets/s", 2700, update_every, RRDSET_TYPE_LINE);
627 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "tcperrors", NULL, "tcp", NULL, "IPv4 TCP Errors"
628 + , "packets/s", 2700, update_every, RRDSET_TYPE_LINE);
629 st->isdetail = 1;
630
631 rrddim_add(st, "InErrs", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -632,7 +645,9 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
645 if(do_tcp_handshake) {
646 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".tcphandshake");
647 if(!st) {
635 - st = rrdset_create(RRD_TYPE_NET_SNMP, "tcphandshake", NULL, "tcp", NULL, "IPv4 TCP Handshake Issues", "events/s", 2900, update_every, RRDSET_TYPE_LINE);
648 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "tcphandshake", NULL, "tcp", NULL
649 + , "IPv4 TCP Handshake Issues", "events/s", 2900, update_every
650 + , RRDSET_TYPE_LINE);
651 st->isdetail = 1;
652
653 rrddim_add(st, "EstabResets", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -673,7 +688,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
688 if(do_udp_packets) {
689 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".udppackets");
690 if(!st) {
676 - st = rrdset_create(RRD_TYPE_NET_SNMP, "udppackets", NULL, "udp", NULL, "IPv4 UDP Packets", "packets/s", 2601, update_every, RRDSET_TYPE_LINE);
691 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "udppackets", NULL, "udp", NULL, "IPv4 UDP Packets"
692 + , "packets/s", 2601, update_every, RRDSET_TYPE_LINE);
693
694 rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
695 rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -690,7 +706,8 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
706 if(do_udp_errors) {
707 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".udperrors");
708 if(!st) {
693 - st = rrdset_create(RRD_TYPE_NET_SNMP, "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors", "events/s", 2701, update_every, RRDSET_TYPE_LINE);
709 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "udperrors", NULL, "udp", NULL, "IPv4 UDP Errors"
710 + , "events/s", 2701, update_every, RRDSET_TYPE_LINE);
711 st->isdetail = 1;
712
713 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -732,7 +749,9 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
749 if(do_udplite_packets) {
750 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".udplite");
751 if(!st) {
735 - st = rrdset_create(RRD_TYPE_NET_SNMP, "udplite", NULL, "udplite", NULL, "IPv4 UDPLite Packets", "packets/s", 2603, update_every, RRDSET_TYPE_LINE);
752 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "udplite", NULL, "udplite", NULL
753 + , "IPv4 UDPLite Packets", "packets/s", 2603, update_every
754 + , RRDSET_TYPE_LINE);
755
756 rrddim_add(st, "InDatagrams", "received", 1, 1, RRD_ALGORITHM_INCREMENTAL);
757 rrddim_add(st, "OutDatagrams", "sent", -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -745,7 +764,9 @@ int do_proc_net_snmp(int update_every, usec_t dt) {
764
765 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP ".udplite_errors");
766 if(!st) {
748 - st = rrdset_create(RRD_TYPE_NET_SNMP, "udplite_errors", NULL, "udplite", NULL, "IPv4 UDPLite Errors", "packets/s", 2604, update_every, RRDSET_TYPE_LINE);
767 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP, "udplite_errors", NULL, "udplite", NULL
768 + , "IPv4 UDPLite Errors", "packets/s", 2604, update_every
769 + , RRDSET_TYPE_LINE);
770
771 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
772 rrddim_add(st, "SndbufErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_snmp6.c
+49 -22
@@ -280,7 +280,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
280 do_bandwidth = CONFIG_ONDEMAND_YES;
281 st = rrdset_find_localhost("system.ipv6");
282 if(unlikely(!st)) {
283 - st = rrdset_create("system", "ipv6", NULL, "network", NULL, "IPv6 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
283 + st = rrdset_create_localhost("system", "ipv6", NULL, "network", NULL, "IPv6 Bandwidth", "kilobits/s", 500
284 + , update_every, RRDSET_TYPE_AREA);
285
286 rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
287 rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -298,7 +299,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
299 do_ip_packets = CONFIG_ONDEMAND_YES;
300 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".packets");
301 if(unlikely(!st)) {
301 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "packets", NULL, "packets", NULL, "IPv6 Packets", "packets/s", 3000, update_every, RRDSET_TYPE_LINE);
302 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "packets", NULL, "packets", NULL, "IPv6 Packets"
303 + , "packets/s", 3000, update_every, RRDSET_TYPE_LINE);
304
305 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
306 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -320,7 +322,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
322 do_ip_fragsout = CONFIG_ONDEMAND_YES;
323 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".fragsout");
324 if(unlikely(!st)) {
323 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent", "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
325 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent"
326 + , "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
327 st->isdetail = 1;
328
329 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -347,7 +350,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
350 do_ip_fragsin = CONFIG_ONDEMAND_YES;
351 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".fragsin");
352 if(unlikely(!st)) {
350 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly", "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
353 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "fragsin", NULL, "fragments", NULL
354 + , "IPv6 Fragments Reassembly", "packets/s", 3011, update_every
355 + , RRDSET_TYPE_LINE);
356 st->isdetail = 1;
357
358 rrddim_add(st, "ok", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -380,7 +385,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
385 do_ip_errors = CONFIG_ONDEMAND_YES;
386 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".errors");
387 if(unlikely(!st)) {
383 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s", 3002, update_every, RRDSET_TYPE_LINE);
388 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s"
389 + , 3002, update_every, RRDSET_TYPE_LINE);
390 st->isdetail = 1;
391
392 rrddim_add(st, "InDiscards", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -417,7 +423,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
423 do_udp_packets = CONFIG_ONDEMAND_YES;
424 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udppackets");
425 if(unlikely(!st)) {
420 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "udppackets", NULL, "udp", NULL, "IPv6 UDP Packets", "packets/s", 3601, update_every, RRDSET_TYPE_LINE);
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);
428
429 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
430 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -443,7 +450,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
450 do_udp_errors = CONFIG_ONDEMAND_YES;
451 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udperrors");
452 if(unlikely(!st)) {
446 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "udperrors", NULL, "udp", NULL, "IPv6 UDP Errors", "events/s", 3701, update_every, RRDSET_TYPE_LINE);
453 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "udperrors", NULL, "udp", NULL, "IPv6 UDP Errors"
454 + , "events/s", 3701, update_every, RRDSET_TYPE_LINE);
455 st->isdetail = 1;
456
457 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -470,7 +478,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
478 do_udplite_packets = CONFIG_ONDEMAND_YES;
479 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udplitepackets");
480 if(unlikely(!st)) {
473 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "udplitepackets", NULL, "udplite", NULL, "IPv6 UDPlite Packets", "packets/s", 3601, update_every, RRDSET_TYPE_LINE);
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);
483
484 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
485 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -496,7 +505,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
505 do_udplite_errors = CONFIG_ONDEMAND_YES;
506 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".udpliteerrors");
507 if(unlikely(!st)) {
499 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "udpliteerrors", NULL, "udplite", NULL, "IPv6 UDP Lite Errors", "events/s", 3701, update_every, RRDSET_TYPE_LINE);
508 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "udpliteerrors", NULL, "udplite", NULL
509 + , "IPv6 UDP Lite Errors", "events/s", 3701, update_every, RRDSET_TYPE_LINE);
510 st->isdetail = 1;
511
512 rrddim_add(st, "RcvbufErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -521,7 +531,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
531 do_mcast = CONFIG_ONDEMAND_YES;
532 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".mcast");
533 if(unlikely(!st)) {
524 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "mcast", NULL, "multicast", NULL, "IPv6 Multicast Bandwidth", "kilobits/s", 9000, update_every, RRDSET_TYPE_AREA);
534 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "mcast", NULL, "multicast", NULL
535 + , "IPv6 Multicast Bandwidth", "kilobits/s", 9000, update_every
536 + , RRDSET_TYPE_AREA);
537 st->isdetail = 1;
538
539 rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -540,7 +552,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
552 do_bcast = CONFIG_ONDEMAND_YES;
553 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".bcast");
554 if(unlikely(!st)) {
543 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "bcast", NULL, "broadcast", NULL, "IPv6 Broadcast Bandwidth", "kilobits/s", 8000, update_every, RRDSET_TYPE_AREA);
555 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "bcast", NULL, "broadcast", NULL
556 + , "IPv6 Broadcast Bandwidth", "kilobits/s", 8000, update_every
557 + , RRDSET_TYPE_AREA);
558 st->isdetail = 1;
559
560 rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -559,7 +573,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
573 do_mcast_p = CONFIG_ONDEMAND_YES;
574 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".mcastpkts");
575 if(unlikely(!st)) {
562 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "mcastpkts", NULL, "multicast", NULL, "IPv6 Multicast Packets", "packets/s", 9500, update_every, RRDSET_TYPE_LINE);
576 + st = rrdset_create_localhost(RRD_TYPE_NET_SNMP6, "mcastpkts", NULL, "multicast", NULL
577 + , "IPv6 Multicast Packets", "packets/s", 9500, update_every, RRDSET_TYPE_LINE);
578 st->isdetail = 1;
579
580 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -578,7 +593,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
593 do_icmp = CONFIG_ONDEMAND_YES;
594 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmp");
595 if(unlikely(!st)) {
581 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages", "messages/s", 10000, update_every, RRDSET_TYPE_LINE);
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);
598
599 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
600 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -596,7 +612,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
612 do_icmp_redir = CONFIG_ONDEMAND_YES;
613 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpredir");
614 if(unlikely(!st)) {
599 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects", "redirects/s", 10050, update_every, RRDSET_TYPE_LINE);
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);
617
618 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
619 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -627,7 +644,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
644 do_icmp_errors = CONFIG_ONDEMAND_YES;
645 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmperrors");
646 if(unlikely(!st)) {
630 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors", "errors/s", 10100, update_every, RRDSET_TYPE_LINE);
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);
649
650 rrddim_add(st, "InErrors", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
651 rrddim_add(st, "OutErrors", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -670,7 +688,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
688 do_icmp_echos = CONFIG_ONDEMAND_YES;
689 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpechos");
690 if(unlikely(!st)) {
673 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo", "messages/s", 10200, update_every, RRDSET_TYPE_LINE);
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);
693
694 rrddim_add(st, "InEchos", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
695 rrddim_add(st, "OutEchos", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -700,7 +719,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
719 do_icmp_groupmemb = CONFIG_ONDEMAND_YES;
720 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".groupmemb");
721 if(unlikely(!st)) {
703 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "groupmemb", NULL, "icmp", NULL, "IPv6 ICMP Group Membership", "messages/s", 10300, update_every, RRDSET_TYPE_LINE);
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);
725
726 rrddim_add(st, "InQueries", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
727 rrddim_add(st, "OutQueries", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -732,7 +753,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
753 do_icmp_router = CONFIG_ONDEMAND_YES;
754 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmprouter");
755 if(unlikely(!st)) {
735 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages", "messages/s", 10400, update_every, RRDSET_TYPE_LINE);
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);
758
759 rrddim_add(st, "InSolicits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
760 rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -760,7 +782,9 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
782 do_icmp_neighbor = CONFIG_ONDEMAND_YES;
783 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpneighbor");
784 if(unlikely(!st)) {
763 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmpneighbor", NULL, "icmp", NULL, "IPv6 Neighbor Messages", "messages/s", 10500, update_every, RRDSET_TYPE_LINE);
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);
788
789 rrddim_add(st, "InSolicits", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
790 rrddim_add(st, "OutSolicits", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -782,7 +806,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
806 do_icmp_mldv2 = CONFIG_ONDEMAND_YES;
807 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmpmldv2");
808 if(unlikely(!st)) {
785 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmpmldv2", NULL, "icmp", NULL, "IPv6 ICMP MLDv2 Reports", "reports/s", 10600, update_every, RRDSET_TYPE_LINE);
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);
811
812 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
813 rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -812,7 +837,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
837 do_icmp_types = CONFIG_ONDEMAND_YES;
838 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".icmptypes");
839 if(unlikely(!st)) {
815 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types", "messages/s", 10700, update_every, RRDSET_TYPE_LINE);
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);
842
843 rrddim_add(st, "InType1", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
844 rrddim_add(st, "InType128", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -852,7 +878,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
878 do_ect = CONFIG_ONDEMAND_YES;
879 st = rrdset_find_localhost(RRD_TYPE_NET_SNMP6 ".ect");
880 if(unlikely(!st)) {
855 - st = rrdset_create(RRD_TYPE_NET_SNMP6, "ect", NULL, "packets", NULL, "IPv6 ECT Packets", "packets/s", 10800, update_every, RRDSET_TYPE_LINE);
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);
883
884 rrddim_add(st, "InNoECTPkts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
885 rrddim_add(st, "InECT1Pkts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_softnet_stat.c
+4 -2
@@ -79,7 +79,8 @@ 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("system", "softnet_stat", NULL, "softnet_stat", NULL, "System softnet_stat", "events/s", 955, update_every, RRDSET_TYPE_LINE);
82 + st = rrdset_create_localhost("system", "softnet_stat", NULL, "softnet_stat", NULL, "System softnet_stat"
83 + , "events/s", 955, update_every, RRDSET_TYPE_LINE);
84 for(w = 0; w < allocated_columns ;w++)
85 if(unlikely(softnet_column_name(w)))
86 rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -102,7 +103,8 @@ int do_proc_net_softnet_stat(int update_every, usec_t dt) {
103 char title[100+1];
104 snprintfz(title, 100, "CPU%zu softnet_stat", l);
105
105 - st = rrdset_create("cpu", id, NULL, "softnet_stat", NULL, title, "events/s", 4101 + l, update_every, RRDSET_TYPE_LINE);
106 + st = rrdset_create_localhost("cpu", id, NULL, "softnet_stat", NULL, title, "events/s", 4101 + l
107 + , update_every, RRDSET_TYPE_LINE);
108 for(w = 0; w < allocated_columns ;w++)
109 if(unlikely(softnet_column_name(w)))
110 rrddim_add(st, softnet_column_name(w), NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_stat_conntrack.c
+18 -6
@@ -132,7 +132,9 @@ 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(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_sockets", NULL, RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Connections", "active connections", 3000, update_every, RRDSET_TYPE_LINE);
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);
138
139 rrddim_add(st, "connections", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
140 }
@@ -147,7 +149,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
149 if(do_new) {
150 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_new");
151 if(unlikely(!st)) {
150 - st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_new", NULL, RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker New Connections", "connections/s", 3001, update_every, RRDSET_TYPE_LINE);
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);
155
156 rrddim_add(st, "new", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
157 rrddim_add(st, "ignore", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -166,7 +170,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
170 if(do_changes) {
171 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_changes");
172 if(unlikely(!st)) {
169 - st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_changes", NULL, RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Changes", "changes/s", 3002, update_every, RRDSET_TYPE_LINE);
173 + st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_changes", NULL
174 + , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Changes", "changes/s"
175 + , 3002, update_every, RRDSET_TYPE_LINE);
176 st->isdetail = 1;
177
178 rrddim_add(st, "inserted", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -186,7 +192,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
192 if(do_expect) {
193 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_expect");
194 if(unlikely(!st)) {
189 - st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_expect", NULL, RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Expectations", "expectations/s", 3003, update_every, RRDSET_TYPE_LINE);
195 + st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_expect", NULL
196 + , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Expectations"
197 + , "expectations/s", 3003, update_every, RRDSET_TYPE_LINE);
198 st->isdetail = 1;
199
200 rrddim_add(st, "created", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -206,7 +214,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
214 if(do_search) {
215 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_search");
216 if(unlikely(!st)) {
209 - st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_search", NULL, RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Searches", "searches/s", 3010, update_every, RRDSET_TYPE_LINE);
217 + st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_search", NULL
218 + , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Searches"
219 + , "searches/s", 3010, update_every, RRDSET_TYPE_LINE);
220 st->isdetail = 1;
221
222 rrddim_add(st, "searched", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -226,7 +236,9 @@ int do_proc_net_stat_conntrack(int update_every, usec_t dt) {
236 if(do_errors) {
237 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_CONNTRACK "_errors");
238 if(unlikely(!st)) {
229 - st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_errors", NULL, RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Errors", "events/s", 3005, update_every, RRDSET_TYPE_LINE);
239 + st = rrdset_create_localhost(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_CONNTRACK "_errors", NULL
240 + , RRD_TYPE_NET_STAT_CONNTRACK, NULL, "Connection Tracker Errors", "events/s"
241 + , 3005, update_every, RRDSET_TYPE_LINE);
242 st->isdetail = 1;
243
244 rrddim_add(st, "icmp_error", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_net_stat_synproxy.c
+12 -4
@@ -62,7 +62,9 @@ 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(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_entries", NULL, RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY Entries Used", "entries", 3304, update_every, RRDSET_TYPE_LINE);
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);
68
69 rrddim_add(st, "entries", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
70 }
@@ -79,7 +81,9 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
81
82 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_syn_received");
83 if(unlikely(!st)) {
82 - st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_syn_received", NULL, RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY SYN Packets received", "SYN/s", 3301, update_every, RRDSET_TYPE_LINE);
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);
87
88 rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
89 }
@@ -96,7 +100,9 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
100
101 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_conn_reopened");
102 if(unlikely(!st)) {
99 - st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_conn_reopened", NULL, RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY Connections Reopened", "connections/s", 3303, update_every, RRDSET_TYPE_LINE);
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);
106
107 rrddim_add(st, "reopened", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
108 }
@@ -113,7 +119,9 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
119
120 st = rrdset_find_localhost(RRD_TYPE_NET_STAT_NETFILTER "." RRD_TYPE_NET_STAT_SYNPROXY "_cookies");
121 if(unlikely(!st)) {
116 - st = rrdset_create(RRD_TYPE_NET_STAT_NETFILTER, RRD_TYPE_NET_STAT_SYNPROXY "_cookies", NULL, RRD_TYPE_NET_STAT_SYNPROXY, NULL, "SYNPROXY TCP Cookies", "cookies/s", 3302, update_every, RRDSET_TYPE_LINE);
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);
125
126 rrddim_add(st, "valid", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
127 rrddim_add(st, "invalid", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
src/proc_softirqs.c
+4 -2
@@ -129,7 +129,8 @@ int do_proc_softirqs(int update_every, usec_t dt) {
129 // --------------------------------------------------------------------
130
131 st = rrdset_find_bytype_localhost("system", "softirqs");
132 - if(unlikely(!st)) st = rrdset_create("system", "softirqs", NULL, "softirqs", NULL, "System softirqs", "softirqs/s", 950, update_every, RRDSET_TYPE_STACKED);
132 + if(unlikely(!st)) st = rrdset_create_localhost("system", "softirqs", NULL, "softirqs", NULL, "System softirqs"
133 + , "softirqs/s", 950, update_every, RRDSET_TYPE_STACKED);
134 else rrdset_next(st);
135
136 for(l = 0; l < lines ;l++) {
@@ -176,7 +177,8 @@ int do_proc_softirqs(int update_every, usec_t dt) {
177
178 char title[100+1];
179 snprintfz(title, 100, "CPU%d softirqs", c);
179 - st = rrdset_create("cpu", id, NULL, "softirqs", "cpu.softirqs", title, "softirqs/s", 3000 + c, update_every, RRDSET_TYPE_STACKED);
180 + st = rrdset_create_localhost("cpu", id, NULL, "softirqs", "cpu.softirqs", title, "softirqs/s", 3000 + c
181 + , update_every, RRDSET_TYPE_STACKED);
182 }
183 else rrdset_next(st);
184
src/proc_stat.c
+10 -5
@@ -93,7 +93,8 @@ int do_proc_stat(int update_every, usec_t dt) {
93 if(likely((isthistotal && do_cpu) || (!isthistotal && do_cpu_cores))) {
94 st = rrdset_find_bytype_localhost(type, id);
95 if(unlikely(!st)) {
96 - st = rrdset_create(type, id, NULL, family, context, title, "percentage", priority, update_every, RRDSET_TYPE_STACKED);
96 + st = rrdset_create_localhost(type, id, NULL, family, context, title, "percentage", priority
97 + , update_every, RRDSET_TYPE_STACKED);
98
99 long multiplier = 1;
100 long divisor = 1; // sysconf(_SC_CLK_TCK);
@@ -134,7 +135,8 @@ int do_proc_stat(int update_every, usec_t dt) {
135 if(likely(do_interrupts)) {
136 st = rrdset_find_bytype_localhost("system", "intr");
137 if(unlikely(!st)) {
137 - st = rrdset_create("system", "intr", NULL, "interrupts", NULL, "CPU Interrupts", "interrupts/s", 900, update_every, RRDSET_TYPE_LINE);
138 + st = rrdset_create_localhost("system", "intr", NULL, "interrupts", NULL, "CPU Interrupts"
139 + , "interrupts/s", 900, update_every, RRDSET_TYPE_LINE);
140 st->isdetail = 1;
141
142 rrddim_add(st, "interrupts", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -153,7 +155,8 @@ int do_proc_stat(int update_every, usec_t dt) {
155 if(likely(do_context)) {
156 st = rrdset_find_bytype_localhost("system", "ctxt");
157 if(unlikely(!st)) {
156 - st = rrdset_create("system", "ctxt", NULL, "processes", NULL, "CPU Context Switches", "context switches/s", 800, update_every, RRDSET_TYPE_LINE);
158 + st = rrdset_create_localhost("system", "ctxt", NULL, "processes", NULL, "CPU Context Switches"
159 + , "context switches/s", 800, update_every, RRDSET_TYPE_LINE);
160
161 rrddim_add(st, "switches", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
162 }
@@ -179,7 +182,8 @@ int do_proc_stat(int update_every, usec_t dt) {
182 if(likely(do_forks)) {
183 st = rrdset_find_bytype_localhost("system", "forks");
184 if(unlikely(!st)) {
182 - st = rrdset_create("system", "forks", NULL, "processes", NULL, "Started Processes", "processes/s", 700, update_every, RRDSET_TYPE_LINE);
185 + st = rrdset_create_localhost("system", "forks", NULL, "processes", NULL, "Started Processes", "processes/s"
186 + , 700, update_every, RRDSET_TYPE_LINE);
187 st->isdetail = 1;
188
189 rrddim_add(st, "started", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -195,7 +199,8 @@ int do_proc_stat(int update_every, usec_t dt) {
199 if(likely(do_processes)) {
200 st = rrdset_find_bytype_localhost("system", "processes");
201 if(unlikely(!st)) {
198 - st = rrdset_create("system", "processes", NULL, "processes", NULL, "System Processes", "processes", 600, update_every, RRDSET_TYPE_LINE);
202 + st = rrdset_create_localhost("system", "processes", NULL, "processes", NULL, "System Processes", "processes"
203 + , 600, update_every, RRDSET_TYPE_LINE);
204
205 rrddim_add(st, "running", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
206 rrddim_add(st, "blocked", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
src/proc_sys_kernel_random_entropy_avail.c
+2 -1
@@ -19,7 +19,8 @@ int do_proc_sys_kernel_random_entropy_avail(int update_every, usec_t dt) {
19
20 RRDSET *st = rrdset_find_bytype_localhost("system", "entropy");
21 if(unlikely(!st)) {
22 - st = rrdset_create("system", "entropy", NULL, "entropy", NULL, "Available Entropy", "entropy", 1000, update_every, RRDSET_TYPE_LINE);
22 + st = rrdset_create_localhost("system", "entropy", NULL, "entropy", NULL, "Available Entropy", "entropy", 1000
23 + , update_every, RRDSET_TYPE_LINE);
24 rrddim_add(st, "entropy", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
25 }
26 else rrdset_next(st);
src/proc_uptime.c
+2 -1
@@ -42,7 +42,8 @@ int do_proc_uptime(int update_every, usec_t dt) {
42 st = rrdset_find_localhost("system.uptime");
43
44 if(unlikely(!st)) {
45 - st = rrdset_create("system", "uptime", NULL, "uptime", NULL, "System Uptime", "seconds", 1000, update_every, RRDSET_TYPE_LINE);
45 + st = rrdset_create_localhost("system", "uptime", NULL, "uptime", NULL, "System Uptime", "seconds", 1000
46 + , update_every, RRDSET_TYPE_LINE);
47 rrddim_add(st, "uptime", NULL, 1, 1000, RRD_ALGORITHM_ABSOLUTE);
48 }
49 else rrdset_next(st);
src/proc_vmstat.c
+8 -4
@@ -92,7 +92,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
92
93 static RRDSET *st_swapio = NULL;
94 if(unlikely(!st_swapio)) {
95 - st_swapio = rrdset_create("system", "swapio", NULL, "swap", NULL, "Swap I/O", "kilobytes/s", 250, update_every, RRDSET_TYPE_AREA);
95 + st_swapio = rrdset_create_localhost("system", "swapio", NULL, "swap", NULL, "Swap I/O", "kilobytes/s", 250
96 + , update_every, RRDSET_TYPE_AREA);
97
98 rrddim_add(st_swapio, "in", NULL, sysconf(_SC_PAGESIZE), 1024, RRD_ALGORITHM_INCREMENTAL);
99 rrddim_add(st_swapio, "out", NULL, -sysconf(_SC_PAGESIZE), 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -109,7 +110,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
110 if(do_io) {
111 static RRDSET *st_io = NULL;
112 if(unlikely(!st_io)) {
112 - st_io = rrdset_create("system", "io", NULL, "disk", NULL, "Disk I/O", "kilobytes/s", 150, update_every, RRDSET_TYPE_AREA);
113 + st_io = rrdset_create_localhost("system", "io", NULL, "disk", NULL, "Disk I/O", "kilobytes/s", 150
114 + , update_every, RRDSET_TYPE_AREA);
115
116 rrddim_add(st_io, "in", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
117 rrddim_add(st_io, "out", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -126,7 +128,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
128 if(do_pgfaults) {
129 static RRDSET *st_pgfaults = NULL;
130 if(unlikely(!st_pgfaults)) {
129 - st_pgfaults = rrdset_create("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults", "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
131 + st_pgfaults = rrdset_create_localhost("mem", "pgfaults", NULL, "system", NULL, "Memory Page Faults"
132 + , "page faults/s", 500, update_every, RRDSET_TYPE_LINE);
133 st_pgfaults->isdetail = 1;
134
135 rrddim_add(st_pgfaults, "minor", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -154,7 +157,8 @@ int do_proc_vmstat(int update_every, usec_t dt) {
157
158 static RRDSET *st_numa = NULL;
159 if(unlikely(!st_numa)) {
157 - st_numa = rrdset_create("mem", "numa", NULL, "numa", NULL, "NUMA events", "events/s", 800, update_every, RRDSET_TYPE_LINE);
160 + st_numa = rrdset_create_localhost("mem", "numa", NULL, "numa", NULL, "NUMA events", "events/s", 800
161 + , update_every, RRDSET_TYPE_LINE);
162 st_numa->isdetail = 1;
163
164 // These depend on CONFIG_NUMA in the kernel.
src/registry.c
+7 -3
@@ -325,7 +325,9 @@ void registry_statistics(void) {
325
326 if(!sts) sts = rrdset_find_localhost("netdata.registry_sessions");
327 if(!sts) {
328 - sts = rrdset_create("netdata", "registry_sessions", NULL, "registry", NULL, "NetData Registry Sessions", "session", 131000, rrd_update_every, RRDSET_TYPE_LINE);
328 + sts = rrdset_create_localhost("netdata", "registry_sessions", NULL, "registry", NULL
329 + , "NetData Registry Sessions", "session", 131000, rrd_update_every
330 + , RRDSET_TYPE_LINE);
331
332 rrddim_add(sts, "sessions", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
333 }
@@ -338,7 +340,8 @@ void registry_statistics(void) {
340
341 if(!stc) stc = rrdset_find_localhost("netdata.registry_entries");
342 if(!stc) {
341 - stc = rrdset_create("netdata", "registry_entries", NULL, "registry", NULL, "NetData Registry Entries", "entries", 131100, rrd_update_every, RRDSET_TYPE_LINE);
343 + stc = rrdset_create_localhost("netdata", "registry_entries", NULL, "registry", NULL, "NetData Registry Entries"
344 + , "entries", 131100, rrd_update_every, RRDSET_TYPE_LINE);
345
346 rrddim_add(stc, "persons", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
347 rrddim_add(stc, "machines", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -359,7 +362,8 @@ void registry_statistics(void) {
362
363 if(!stm) stm = rrdset_find_localhost("netdata.registry_mem");
364 if(!stm) {
362 - stm = rrdset_create("netdata", "registry_mem", NULL, "registry", NULL, "NetData Registry Memory", "KB", 131300, rrd_update_every, RRDSET_TYPE_STACKED);
365 + stm = rrdset_create_localhost("netdata", "registry_mem", NULL, "registry", NULL, "NetData Registry Memory", "KB"
366 + , 131300, rrd_update_every, RRDSET_TYPE_STACKED);
367
368 rrddim_add(stm, "persons", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
369 rrddim_add(stm, "machines", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
src/rrd.h
+13 -10
@@ -364,16 +364,19 @@ extern void rrdhost_unlock(RRDHOST *host);
364
365 extern void rrdset_set_name(RRDSET *st, const char *name);
366
367 -extern RRDSET *rrdset_create(const char *type
368 - , const char *id
369 - , const char *name
370 - , const char *family
371 - , const char *context
372 - , const char *title
373 - , const char *units
374 - , long priority
375 - , int update_every
376 - , int chart_type);
367 +extern RRDSET *rrdset_create(RRDHOST *host
368 + , const char *type
369 + , const char *id
370 + , const char *name
371 + , const char *family
372 + , const char *context
373 + , const char *title
374 + , const char *units
375 + , long priority
376 + , int update_every
377 + , int chart_type);
378 +
379 +#define rrdset_create_localhost(type, id, name, family, context, title, units, priority, update_every, chart_type) rrdset_create(localhost, type, id, name, family, context, title, units, priority, update_every, chart_type)
380
381 extern void rrdhost_free_all(void);
382 extern void rrdhost_save_all(void);
src/rrdset.c
+3 -2
@@ -209,8 +209,9 @@ static inline void timeval_align(struct timeval *tv, int update_every) {
209 // ----------------------------------------------------------------------------
210 // RRDSET - create a chart
211
212 -RRDSET *rrdset_create(const char *type, const char *id, const char *name, const char *family, const char *context, const char *title, const char *units, long priority, int update_every, int chart_type) {
213 - RRDHOST *host = localhost;
212 +RRDSET *rrdset_create(RRDHOST *host, const char *type, const char *id, const char *name, const char *family
213 + , const char *context, const char *title, const char *units, long priority
214 + , int update_every, int chart_type) {
215
216 if(!type || !type[0]) {
217 fatal("Cannot create rrd stats without a type.");
src/sys_devices_system_edac_mc.c
+4 -4
@@ -134,8 +134,8 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
134 if(unlikely(!ce_st)) {
135 ce_st = rrdset_find_localhost("mem.ecc_ce");
136 if(unlikely(!ce_st))
137 - ce_st = rrdset_create("mem", "ecc_ce", NULL, "ecc", NULL, "ECC Memory Correctable Errors", "errors",
138 - 6600, update_every, RRDSET_TYPE_LINE);
137 + ce_st = rrdset_create_localhost("mem", "ecc_ce", NULL, "ecc", NULL, "ECC Memory Correctable Errors"
138 + , "errors", 6600, update_every, RRDSET_TYPE_LINE);
139
140 for(m = mc_root; m; m = m->next)
141 if(m->ce_count_filename)
@@ -162,8 +162,8 @@ int do_proc_sys_devices_system_edac_mc(int update_every, usec_t dt) {
162 ue_st = rrdset_find_localhost("mem.ecc_ue");
163
164 if(unlikely(!ue_st))
165 - ue_st = rrdset_create("mem", "ecc_ue", NULL, "ecc", NULL, "ECC Memory Uncorrectable Errors", "errors",
166 - 6610, update_every, RRDSET_TYPE_LINE);
165 + ue_st = rrdset_create_localhost("mem", "ecc_ue", NULL, "ecc", NULL, "ECC Memory Uncorrectable Errors"
166 + , "errors", 6610, update_every, RRDSET_TYPE_LINE);
167
168 for(m = mc_root; m; m = m->next)
169 if(m->ue_count_filename)
src/sys_devices_system_node.c
+2 -1
@@ -92,7 +92,8 @@ int do_proc_sys_devices_system_node(int update_every, usec_t dt) {
92
93 RRDSET *st = m->numastat_st;
94 if(unlikely(!st)) {
95 - st = rrdset_create("mem", m->name, NULL, "numa", NULL, "NUMA events", "events/s", 1000, update_every, RRDSET_TYPE_LINE);
95 + st = rrdset_create_localhost("mem", m->name, NULL, "numa", NULL, "NUMA events", "events/s", 1000
96 + , update_every, RRDSET_TYPE_LINE);
97 st->isdetail = 1;
98
99 rrddim_add(st, "local_node", "local", 1, 1, RRD_ALGORITHM_INCREMENTAL);
src/sys_fs_cgroup.c
+145 -39
@@ -1317,7 +1317,8 @@ void update_services_charts(int update_every,
1317 st_cpu = rrdset_find_bytype_localhost("services", "cpu");
1318 if(likely(!st_cpu)) {
1319 snprintfz(title, CHART_TITLE_MAX, "Systemd Services CPU utilization (%d%% = %d core%s)", (processors * 100), processors, (processors > 1) ? "s" : "");
1320 - st_cpu = rrdset_create("services", "cpu", NULL, "cpu", "services.cpu", title, "%", CHART_PRIORITY_SYSTEMD_SERVICES, update_every, RRDSET_TYPE_STACKED);
1320 + st_cpu = rrdset_create_localhost("services", "cpu", NULL, "cpu", "services.cpu", title, "%"
1321 + , CHART_PRIORITY_SYSTEMD_SERVICES, update_every, RRDSET_TYPE_STACKED);
1322 }
1323 }
1324 else
@@ -1328,7 +1329,11 @@ void update_services_charts(int update_every,
1329 if(unlikely(!st_mem_usage)) {
1330 st_mem_usage = rrdset_find_bytype_localhost("services", "mem_usage");
1331 if(likely(!st_mem_usage))
1331 - st_mem_usage = rrdset_create("services", "mem_usage", NULL, "mem", "services.mem_usage", (cgroup_used_memory_without_cache)?"Systemd Services Used Memory without Cache":"Systemd Services Used Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 10, update_every, RRDSET_TYPE_STACKED);
1332 + st_mem_usage = rrdset_create_localhost("services", "mem_usage", NULL, "mem", "services.mem_usage"
1333 + , (cgroup_used_memory_without_cache)
1334 + ? "Systemd Services Used Memory without Cache"
1335 + : "Systemd Services Used Memory", "MB",
1336 + CHART_PRIORITY_SYSTEMD_SERVICES + 10, update_every, RRDSET_TYPE_STACKED);
1337 }
1338 else
1339 rrdset_next(st_mem_usage);
@@ -1338,7 +1343,9 @@ void update_services_charts(int update_every,
1343 if(unlikely(!st_mem_detailed_rss)) {
1344 st_mem_detailed_rss = rrdset_find_bytype_localhost("services", "mem_rss");
1345 if(likely(!st_mem_detailed_rss))
1341 - st_mem_detailed_rss = rrdset_create("services", "mem_rss", NULL, "mem", "services.mem_rss", "Systemd Services RSS Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 20, update_every, RRDSET_TYPE_STACKED);
1346 + st_mem_detailed_rss = rrdset_create_localhost("services", "mem_rss", NULL, "mem", "services.mem_rss"
1347 + , "Systemd Services RSS Memory", "MB",
1348 + CHART_PRIORITY_SYSTEMD_SERVICES + 20, update_every, RRDSET_TYPE_STACKED);
1349 }
1350 else
1351 rrdset_next(st_mem_detailed_rss);
@@ -1346,7 +1353,10 @@ void update_services_charts(int update_every,
1353 if(unlikely(!st_mem_detailed_mapped)) {
1354 st_mem_detailed_mapped = rrdset_find_bytype_localhost("services", "mem_mapped");
1355 if(likely(!st_mem_detailed_mapped))
1349 - st_mem_detailed_mapped = rrdset_create("services", "mem_mapped", NULL, "mem", "services.mem_mapped", "Systemd Services Mapped Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 30, update_every, RRDSET_TYPE_STACKED);
1356 + st_mem_detailed_mapped = rrdset_create_localhost("services", "mem_mapped", NULL, "mem"
1357 + , "services.mem_mapped"
1358 + , "Systemd Services Mapped Memory", "MB",
1359 + CHART_PRIORITY_SYSTEMD_SERVICES + 30, update_every, RRDSET_TYPE_STACKED);
1360 }
1361 else
1362 rrdset_next(st_mem_detailed_mapped);
@@ -1354,7 +1364,10 @@ void update_services_charts(int update_every,
1364 if(unlikely(!st_mem_detailed_cache)) {
1365 st_mem_detailed_cache = rrdset_find_bytype_localhost("services", "mem_cache");
1366 if(likely(!st_mem_detailed_cache))
1357 - st_mem_detailed_cache = rrdset_create("services", "mem_cache", NULL, "mem", "services.mem_cache", "Systemd Services Cache Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 40, update_every, RRDSET_TYPE_STACKED);
1367 + st_mem_detailed_cache = rrdset_create_localhost("services", "mem_cache", NULL, "mem"
1368 + , "services.mem_cache", "Systemd Services Cache Memory"
1369 + , "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 40
1370 + , update_every, RRDSET_TYPE_STACKED);
1371 }
1372 else
1373 rrdset_next(st_mem_detailed_cache);
@@ -1362,7 +1375,10 @@ void update_services_charts(int update_every,
1375 if(unlikely(!st_mem_detailed_writeback)) {
1376 st_mem_detailed_writeback = rrdset_find_bytype_localhost("services", "mem_writeback");
1377 if(likely(!st_mem_detailed_writeback))
1365 - st_mem_detailed_writeback = rrdset_create("services", "mem_writeback", NULL, "mem", "services.mem_writeback", "Systemd Services Writeback Memory", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 50, update_every, RRDSET_TYPE_STACKED);
1378 + st_mem_detailed_writeback = rrdset_create_localhost("services", "mem_writeback", NULL, "mem"
1379 + , "services.mem_writeback"
1380 + , "Systemd Services Writeback Memory", "MB",
1381 + CHART_PRIORITY_SYSTEMD_SERVICES + 50, update_every, RRDSET_TYPE_STACKED);
1382 }
1383 else
1384 rrdset_next(st_mem_detailed_writeback);
@@ -1370,7 +1386,10 @@ void update_services_charts(int update_every,
1386 if(unlikely(!st_mem_detailed_pgfault)) {
1387 st_mem_detailed_pgfault = rrdset_find_bytype_localhost("services", "mem_pgfault");
1388 if(likely(!st_mem_detailed_pgfault))
1373 - st_mem_detailed_pgfault = rrdset_create("services", "mem_pgfault", NULL, "mem", "services.mem_pgfault", "Systemd Services Memory Minor Page Faults", "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 60, update_every, RRDSET_TYPE_STACKED);
1389 + st_mem_detailed_pgfault = rrdset_create_localhost("services", "mem_pgfault", NULL, "mem"
1390 + , "services.mem_pgfault"
1391 + , "Systemd Services Memory Minor Page Faults", "MB/s",
1392 + CHART_PRIORITY_SYSTEMD_SERVICES + 60, update_every, RRDSET_TYPE_STACKED);
1393 }
1394 else
1395 rrdset_next(st_mem_detailed_pgfault);
@@ -1378,7 +1397,11 @@ void update_services_charts(int update_every,
1397 if(unlikely(!st_mem_detailed_pgmajfault)) {
1398 st_mem_detailed_pgmajfault = rrdset_find_bytype_localhost("services", "mem_pgmajfault");
1399 if(likely(!st_mem_detailed_pgmajfault))
1381 - st_mem_detailed_pgmajfault = rrdset_create("services", "mem_pgmajfault", NULL, "mem", "services.mem_pgmajfault", "Systemd Services Memory Major Page Faults", "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 70, update_every, RRDSET_TYPE_STACKED);
1400 + st_mem_detailed_pgmajfault = rrdset_create_localhost("services", "mem_pgmajfault", NULL, "mem"
1401 + , "services.mem_pgmajfault"
1402 + , "Systemd Services Memory Major Page Faults"
1403 + , "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 70
1404 + , update_every, RRDSET_TYPE_STACKED);
1405 }
1406 else
1407 rrdset_next(st_mem_detailed_pgmajfault);
@@ -1386,7 +1409,10 @@ void update_services_charts(int update_every,
1409 if(unlikely(!st_mem_detailed_pgpgin)) {
1410 st_mem_detailed_pgpgin = rrdset_find_bytype_localhost("services", "mem_pgpgin");
1411 if(likely(!st_mem_detailed_pgpgin))
1389 - st_mem_detailed_pgpgin = rrdset_create("services", "mem_pgpgin", NULL, "mem", "services.mem_pgpgin", "Systemd Services Memory Charging Activity", "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 80, update_every, RRDSET_TYPE_STACKED);
1412 + st_mem_detailed_pgpgin = rrdset_create_localhost("services", "mem_pgpgin", NULL, "mem"
1413 + , "services.mem_pgpgin"
1414 + , "Systemd Services Memory Charging Activity", "MB/s",
1415 + CHART_PRIORITY_SYSTEMD_SERVICES + 80, update_every, RRDSET_TYPE_STACKED);
1416 }
1417 else
1418 rrdset_next(st_mem_detailed_pgpgin);
@@ -1394,7 +1420,11 @@ void update_services_charts(int update_every,
1420 if(unlikely(!st_mem_detailed_pgpgout)) {
1421 st_mem_detailed_pgpgout = rrdset_find_bytype_localhost("services", "mem_pgpgout");
1422 if(likely(!st_mem_detailed_pgpgout))
1397 - st_mem_detailed_pgpgout = rrdset_create("services", "mem_pgpgout", NULL, "mem", "services.mem_pgpgout", "Systemd Services Memory Uncharging Activity", "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 90, update_every, RRDSET_TYPE_STACKED);
1423 + st_mem_detailed_pgpgout = rrdset_create_localhost("services", "mem_pgpgout", NULL, "mem"
1424 + , "services.mem_pgpgout"
1425 + , "Systemd Services Memory Uncharging Activity"
1426 + , "MB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 90
1427 + , update_every, RRDSET_TYPE_STACKED);
1428 }
1429 else
1430 rrdset_next(st_mem_detailed_pgpgout);
@@ -1404,7 +1434,9 @@ void update_services_charts(int update_every,
1434 if(unlikely(!st_mem_failcnt)) {
1435 st_mem_failcnt = rrdset_find_bytype_localhost("services", "mem_failcnt");
1436 if(likely(!st_mem_failcnt))
1407 - st_mem_failcnt = rrdset_create("services", "mem_failcnt", NULL, "mem", "services.mem_failcnt", "Systemd Services Memory Limit Failures", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 110, update_every, RRDSET_TYPE_STACKED);
1437 + st_mem_failcnt = rrdset_create_localhost("services", "mem_failcnt", NULL, "mem", "services.mem_failcnt"
1438 + , "Systemd Services Memory Limit Failures", "MB",
1439 + CHART_PRIORITY_SYSTEMD_SERVICES + 110, update_every, RRDSET_TYPE_STACKED);
1440 }
1441 else
1442 rrdset_next(st_mem_failcnt);
@@ -1414,7 +1446,9 @@ void update_services_charts(int update_every,
1446 if(unlikely(!st_swap_usage)) {
1447 st_swap_usage = rrdset_find_bytype_localhost("services", "swap_usage");
1448 if(likely(!st_swap_usage))
1417 - st_swap_usage = rrdset_create("services", "swap_usage", NULL, "swap", "services.swap_usage", "Systemd Services Swap Memory Used", "MB", CHART_PRIORITY_SYSTEMD_SERVICES + 100, update_every, RRDSET_TYPE_STACKED);
1449 + st_swap_usage = rrdset_create_localhost("services", "swap_usage", NULL, "swap", "services.swap_usage"
1450 + , "Systemd Services Swap Memory Used", "MB",
1451 + CHART_PRIORITY_SYSTEMD_SERVICES + 100, update_every, RRDSET_TYPE_STACKED);
1452 }
1453 else
1454 rrdset_next(st_swap_usage);
@@ -1424,7 +1458,9 @@ void update_services_charts(int update_every,
1458 if(unlikely(!st_io_read)) {
1459 st_io_read = rrdset_find_bytype_localhost("services", "io_read");
1460 if(likely(!st_io_read))
1427 - st_io_read = rrdset_create("services", "io_read", NULL, "disk", "services.io_read", "Systemd Services Disk Read Bandwidth", "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 120, update_every, RRDSET_TYPE_STACKED);
1461 + st_io_read = rrdset_create_localhost("services", "io_read", NULL, "disk", "services.io_read"
1462 + , "Systemd Services Disk Read Bandwidth", "KB/s",
1463 + CHART_PRIORITY_SYSTEMD_SERVICES + 120, update_every, RRDSET_TYPE_STACKED);
1464 }
1465 else
1466 rrdset_next(st_io_read);
@@ -1432,7 +1468,9 @@ void update_services_charts(int update_every,
1468 if(unlikely(!st_io_write)) {
1469 st_io_write = rrdset_find_bytype_localhost("services", "io_write");
1470 if(likely(!st_io_write))
1435 - st_io_write = rrdset_create("services", "io_write", NULL, "disk", "services.io_write", "Systemd Services Disk Write Bandwidth", "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 130, update_every, RRDSET_TYPE_STACKED);
1471 + st_io_write = rrdset_create_localhost("services", "io_write", NULL, "disk", "services.io_write"
1472 + , "Systemd Services Disk Write Bandwidth", "KB/s",
1473 + CHART_PRIORITY_SYSTEMD_SERVICES + 130, update_every, RRDSET_TYPE_STACKED);
1474 }
1475 else
1476 rrdset_next(st_io_write);
@@ -1442,7 +1480,10 @@ void update_services_charts(int update_every,
1480 if(unlikely(!st_io_serviced_read)) {
1481 st_io_serviced_read = rrdset_find_bytype_localhost("services", "io_ops_read");
1482 if(likely(!st_io_serviced_read))
1445 - st_io_serviced_read = rrdset_create("services", "io_ops_read", NULL, "disk", "services.io_ops_read", "Systemd Services Disk Read Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 140, update_every, RRDSET_TYPE_STACKED);
1483 + st_io_serviced_read = rrdset_create_localhost("services", "io_ops_read", NULL, "disk"
1484 + , "services.io_ops_read"
1485 + , "Systemd Services Disk Read Operations", "operations/s",
1486 + CHART_PRIORITY_SYSTEMD_SERVICES + 140, update_every, RRDSET_TYPE_STACKED);
1487 }
1488 else
1489 rrdset_next(st_io_serviced_read);
@@ -1450,7 +1491,11 @@ void update_services_charts(int update_every,
1491 if(unlikely(!st_io_serviced_write)) {
1492 st_io_serviced_write = rrdset_find_bytype_localhost("services", "io_ops_write");
1493 if(likely(!st_io_serviced_write))
1453 - st_io_serviced_write = rrdset_create("services", "io_ops_write", NULL, "disk", "services.io_ops_write", "Systemd Services Disk Write Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 150, update_every, RRDSET_TYPE_STACKED);
1494 + st_io_serviced_write = rrdset_create_localhost("services", "io_ops_write", NULL, "disk"
1495 + , "services.io_ops_write"
1496 + , "Systemd Services Disk Write Operations"
1497 + , "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 150
1498 + , update_every, RRDSET_TYPE_STACKED);
1499 }
1500 else
1501 rrdset_next(st_io_serviced_write);
@@ -1460,7 +1505,10 @@ void update_services_charts(int update_every,
1505 if(unlikely(!st_throttle_io_read)) {
1506 st_throttle_io_read = rrdset_find_bytype_localhost("services", "throttle_io_read");
1507 if(likely(!st_throttle_io_read))
1463 - st_throttle_io_read = rrdset_create("services", "throttle_io_read", NULL, "disk", "services.throttle_io_read", "Systemd Services Throttle Disk Read Bandwidth", "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 160, update_every, RRDSET_TYPE_STACKED);
1508 + st_throttle_io_read = rrdset_create_localhost("services", "throttle_io_read", NULL, "disk"
1509 + , "services.throttle_io_read"
1510 + , "Systemd Services Throttle Disk Read Bandwidth", "KB/s",
1511 + CHART_PRIORITY_SYSTEMD_SERVICES + 160, update_every, RRDSET_TYPE_STACKED);
1512 }
1513 else
1514 rrdset_next(st_throttle_io_read);
@@ -1468,7 +1516,11 @@ void update_services_charts(int update_every,
1516 if(unlikely(!st_throttle_io_write)) {
1517 st_throttle_io_write = rrdset_find_bytype_localhost("services", "throttle_io_write");
1518 if(likely(!st_throttle_io_write))
1471 - st_throttle_io_write = rrdset_create("services", "throttle_io_write", NULL, "disk", "services.throttle_io_write", "Systemd Services Throttle Disk Write Bandwidth", "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 170, update_every, RRDSET_TYPE_STACKED);
1519 + st_throttle_io_write = rrdset_create_localhost("services", "throttle_io_write", NULL, "disk"
1520 + , "services.throttle_io_write"
1521 + , "Systemd Services Throttle Disk Write Bandwidth"
1522 + , "KB/s", CHART_PRIORITY_SYSTEMD_SERVICES + 170
1523 + , update_every, RRDSET_TYPE_STACKED);
1524 }
1525 else
1526 rrdset_next(st_throttle_io_write);
@@ -1478,7 +1530,11 @@ void update_services_charts(int update_every,
1530 if(unlikely(!st_throttle_ops_read)) {
1531 st_throttle_ops_read = rrdset_find_bytype_localhost("services", "throttle_io_ops_read");
1532 if(likely(!st_throttle_ops_read))
1481 - st_throttle_ops_read = rrdset_create("services", "throttle_io_ops_read", NULL, "disk", "services.throttle_io_ops_read", "Systemd Services Throttle Disk Read Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 180, update_every, RRDSET_TYPE_STACKED);
1533 + st_throttle_ops_read = rrdset_create_localhost("services", "throttle_io_ops_read", NULL, "disk"
1534 + , "services.throttle_io_ops_read"
1535 + , "Systemd Services Throttle Disk Read Operations"
1536 + , "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 180
1537 + , update_every, RRDSET_TYPE_STACKED);
1538 }
1539 else
1540 rrdset_next(st_throttle_ops_read);
@@ -1486,7 +1542,11 @@ void update_services_charts(int update_every,
1542 if(unlikely(!st_throttle_ops_write)) {
1543 st_throttle_ops_write = rrdset_find_bytype_localhost("services", "throttle_io_ops_write");
1544 if(likely(!st_throttle_ops_write))
1489 - st_throttle_ops_write = rrdset_create("services", "throttle_io_ops_write", NULL, "disk", "services.throttle_io_ops_write", "Systemd Services Throttle Disk Write Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 190, update_every, RRDSET_TYPE_STACKED);
1545 + st_throttle_ops_write = rrdset_create_localhost("services", "throttle_io_ops_write", NULL, "disk"
1546 + , "services.throttle_io_ops_write"
1547 + , "Systemd Services Throttle Disk Write Operations"
1548 + , "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 190
1549 + , update_every, RRDSET_TYPE_STACKED);
1550 }
1551 else
1552 rrdset_next(st_throttle_ops_write);
@@ -1496,7 +1556,11 @@ void update_services_charts(int update_every,
1556 if(unlikely(!st_queued_ops_read)) {
1557 st_queued_ops_read = rrdset_find_bytype_localhost("services", "queued_io_ops_read");
1558 if(likely(!st_queued_ops_read))
1499 - st_queued_ops_read = rrdset_create("services", "queued_io_ops_read", NULL, "disk", "services.queued_io_ops_read", "Systemd Services Queued Disk Read Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 200, update_every, RRDSET_TYPE_STACKED);
1559 + st_queued_ops_read = rrdset_create_localhost("services", "queued_io_ops_read", NULL, "disk"
1560 + , "services.queued_io_ops_read"
1561 + , "Systemd Services Queued Disk Read Operations"
1562 + , "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 200
1563 + , update_every, RRDSET_TYPE_STACKED);
1564 }
1565 else
1566 rrdset_next(st_queued_ops_read);
@@ -1504,7 +1568,11 @@ void update_services_charts(int update_every,
1568 if(unlikely(!st_queued_ops_write)) {
1569 st_queued_ops_write = rrdset_find_bytype_localhost("services", "queued_io_ops_write");
1570 if(likely(!st_queued_ops_write))
1507 - st_queued_ops_write = rrdset_create("services", "queued_io_ops_write", NULL, "disk", "services.queued_io_ops_write", "Systemd Services Queued Disk Write Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 210, update_every, RRDSET_TYPE_STACKED);
1571 + st_queued_ops_write = rrdset_create_localhost("services", "queued_io_ops_write", NULL, "disk"
1572 + , "services.queued_io_ops_write"
1573 + , "Systemd Services Queued Disk Write Operations"
1574 + , "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 210
1575 + , update_every, RRDSET_TYPE_STACKED);
1576 }
1577 else
1578 rrdset_next(st_queued_ops_write);
@@ -1514,7 +1582,11 @@ void update_services_charts(int update_every,
1582 if(unlikely(!st_merged_ops_read)) {
1583 st_merged_ops_read = rrdset_find_bytype_localhost("services", "merged_io_ops_read");
1584 if(likely(!st_merged_ops_read))
1517 - st_merged_ops_read = rrdset_create("services", "merged_io_ops_read", NULL, "disk", "services.merged_io_ops_read", "Systemd Services Merged Disk Read Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 220, update_every, RRDSET_TYPE_STACKED);
1585 + st_merged_ops_read = rrdset_create_localhost("services", "merged_io_ops_read", NULL, "disk"
1586 + , "services.merged_io_ops_read"
1587 + , "Systemd Services Merged Disk Read Operations"
1588 + , "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 220
1589 + , update_every, RRDSET_TYPE_STACKED);
1590 }
1591 else
1592 rrdset_next(st_merged_ops_read);
@@ -1522,7 +1594,11 @@ void update_services_charts(int update_every,
1594 if(unlikely(!st_merged_ops_write)) {
1595 st_merged_ops_write = rrdset_find_bytype_localhost("services", "merged_io_ops_write");
1596 if(likely(!st_merged_ops_write))
1525 - st_merged_ops_write = rrdset_create("services", "merged_io_ops_write", NULL, "disk", "services.merged_io_ops_write", "Systemd Services Merged Disk Write Operations", "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 230, update_every, RRDSET_TYPE_STACKED);
1597 + st_merged_ops_write = rrdset_create_localhost("services", "merged_io_ops_write", NULL, "disk"
1598 + , "services.merged_io_ops_write"
1599 + , "Systemd Services Merged Disk Write Operations"
1600 + , "operations/s", CHART_PRIORITY_SYSTEMD_SERVICES + 230
1601 + , update_every, RRDSET_TYPE_STACKED);
1602 }
1603 else
1604 rrdset_next(st_merged_ops_write);
@@ -1784,7 +1860,8 @@ void update_cgroup_charts(int update_every) {
1860 , "cpu");
1861 if(likely(!cg->st_cpu)) {
1862 snprintfz(title, CHART_TITLE_MAX, "CPU Usage (%d%% = %d core%s) for cgroup %s", (processors * 100), processors, (processors > 1) ? "s" : "", cg->chart_title);
1787 - cg->st_cpu = rrdset_create(type, "cpu", NULL, "cpu", "cgroup.cpu", title, "%", CHART_PRIORITY_CONTAINERS, update_every, RRDSET_TYPE_STACKED);
1863 + cg->st_cpu = rrdset_create_localhost(type, "cpu", NULL, "cpu", "cgroup.cpu", title, "%"
1864 + , CHART_PRIORITY_CONTAINERS, update_every, RRDSET_TYPE_STACKED);
1865 }
1866 rrddim_add(cg->st_cpu, "user", NULL, 100, hz, RRD_ALGORITHM_INCREMENTAL);
1867 rrddim_add(cg->st_cpu, "system", NULL, 100, hz, RRD_ALGORITHM_INCREMENTAL);
@@ -1806,7 +1883,9 @@ void update_cgroup_charts(int update_every) {
1883 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "cpu_per_core");
1884 if(likely(!cg->st_cpu_per_core)) {
1885 snprintfz(title, CHART_TITLE_MAX, "CPU Usage (%d%% = %d core%s) Per Core for cgroup %s", (processors * 100), processors, (processors > 1) ? "s" : "", cg->chart_title);
1809 - cg->st_cpu_per_core = rrdset_create(type, "cpu_per_core", NULL, "cpu", "cgroup.cpu_per_core", title, "%", CHART_PRIORITY_CONTAINERS + 100, update_every, RRDSET_TYPE_STACKED);
1886 + cg->st_cpu_per_core = rrdset_create_localhost(type, "cpu_per_core", NULL, "cpu"
1887 + , "cgroup.cpu_per_core", title, "%",
1888 + CHART_PRIORITY_CONTAINERS + 100, update_every, RRDSET_TYPE_STACKED);
1889 }
1890 for(i = 0; i < cg->cpuacct_usage.cpus; i++) {
1891 snprintfz(id, CHART_TITLE_MAX, "cpu%u", i);
@@ -1829,7 +1908,8 @@ void update_cgroup_charts(int update_every) {
1908 , "mem");
1909 if(likely(!cg->st_mem)) {
1910 snprintfz(title, CHART_TITLE_MAX, "Memory Usage for cgroup %s", cg->chart_title);
1832 - cg->st_mem = rrdset_create(type, "mem", NULL, "mem", "cgroup.mem", title, "MB", CHART_PRIORITY_CONTAINERS + 210, update_every, RRDSET_TYPE_STACKED);
1911 + cg->st_mem = rrdset_create_localhost(type, "mem", NULL, "mem", "cgroup.mem", title, "MB",
1912 + CHART_PRIORITY_CONTAINERS + 210, update_every, RRDSET_TYPE_STACKED);
1913 }
1914
1915 rrddim_add(cg->st_mem, "cache", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -1855,7 +1935,9 @@ void update_cgroup_charts(int update_every) {
1935 , "writeback");
1936 if(likely(!cg->st_writeback)) {
1937 snprintfz(title, CHART_TITLE_MAX, "Writeback Memory for cgroup %s", cg->chart_title);
1858 - cg->st_writeback = rrdset_create(type, "writeback", NULL, "mem", "cgroup.writeback", title, "MB", CHART_PRIORITY_CONTAINERS + 300, update_every, RRDSET_TYPE_AREA);
1938 + cg->st_writeback = rrdset_create_localhost(type, "writeback", NULL, "mem", "cgroup.writeback", title
1939 + , "MB", CHART_PRIORITY_CONTAINERS + 300, update_every
1940 + , RRDSET_TYPE_AREA);
1941 }
1942
1943 if(cg->memory.detailed_has_dirty)
@@ -1875,7 +1957,9 @@ void update_cgroup_charts(int update_every) {
1957 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem_activity");
1958 if(likely(!cg->st_mem_activity)) {
1959 snprintfz(title, CHART_TITLE_MAX, "Memory Activity for cgroup %s", cg->chart_title);
1878 - cg->st_mem_activity = rrdset_create(type, "mem_activity", NULL, "mem", "cgroup.mem_activity", title, "MB/s", CHART_PRIORITY_CONTAINERS + 400, update_every, RRDSET_TYPE_LINE);
1960 + cg->st_mem_activity = rrdset_create_localhost(type, "mem_activity", NULL, "mem"
1961 + , "cgroup.mem_activity", title, "MB/s",
1962 + CHART_PRIORITY_CONTAINERS + 400, update_every, RRDSET_TYPE_LINE);
1963 }
1964 rrddim_add(cg->st_mem_activity, "pgpgin", "in", system_page_size, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
1965 rrddim_add(cg->st_mem_activity, "pgpgout", "out", -system_page_size, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -1892,7 +1976,9 @@ void update_cgroup_charts(int update_every) {
1976 , "pgfaults");
1977 if(likely(!cg->st_pgfaults)) {
1978 snprintfz(title, CHART_TITLE_MAX, "Memory Page Faults for cgroup %s", cg->chart_title);
1895 - cg->st_pgfaults = rrdset_create(type, "pgfaults", NULL, "mem", "cgroup.pgfaults", title, "MB/s", CHART_PRIORITY_CONTAINERS + 500, update_every, RRDSET_TYPE_LINE);
1979 + cg->st_pgfaults = rrdset_create_localhost(type, "pgfaults", NULL, "mem", "cgroup.pgfaults", title
1980 + , "MB/s", CHART_PRIORITY_CONTAINERS + 500, update_every
1981 + , RRDSET_TYPE_LINE);
1982 }
1983 rrddim_add(cg->st_pgfaults, "pgfault", NULL, system_page_size, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
1984 rrddim_add(cg->st_pgfaults, "pgmajfault", "swap", -system_page_size, 1024 * 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -1911,7 +1997,9 @@ void update_cgroup_charts(int update_every) {
1997 , "mem_usage");
1998 if(likely(!cg->st_mem_usage)) {
1999 snprintfz(title, CHART_TITLE_MAX, "Used Memory %sfor cgroup %s", (cgroup_used_memory_without_cache && cg->memory.updated_detailed)?"without Cache ":"", cg->chart_title);
1914 - cg->st_mem_usage = rrdset_create(type, "mem_usage", NULL, "mem", "cgroup.mem_usage", title, "MB", CHART_PRIORITY_CONTAINERS + 200, update_every, RRDSET_TYPE_STACKED);
2000 + cg->st_mem_usage = rrdset_create_localhost(type, "mem_usage", NULL, "mem", "cgroup.mem_usage", title
2001 + , "MB", CHART_PRIORITY_CONTAINERS + 200, update_every
2002 + , RRDSET_TYPE_STACKED);
2003 }
2004 rrddim_add(cg->st_mem_usage, "ram", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
2005 rrddim_add(cg->st_mem_usage, "swap", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -1930,7 +2018,9 @@ void update_cgroup_charts(int update_every) {
2018 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "mem_failcnt");
2019 if(likely(!cg->st_mem_failcnt)) {
2020 snprintfz(title, CHART_TITLE_MAX, "Memory Limit Failures for cgroup %s", cg->chart_title);
1933 - cg->st_mem_failcnt = rrdset_create(type, "mem_failcnt", NULL, "mem", "cgroup.mem_failcnt", title, "count", CHART_PRIORITY_CONTAINERS + 250, update_every, RRDSET_TYPE_LINE);
2021 + cg->st_mem_failcnt = rrdset_create_localhost(type, "mem_failcnt", NULL, "mem", "cgroup.mem_failcnt"
2022 + , title, "count", CHART_PRIORITY_CONTAINERS + 250
2023 + , update_every, RRDSET_TYPE_LINE);
2024 }
2025 rrddim_add(cg->st_mem_failcnt, "failures", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2026 }
@@ -1946,7 +2036,8 @@ void update_cgroup_charts(int update_every) {
2036 cg->st_io = rrdset_find_bytype_localhost(cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "io");
2037 if(likely(!cg->st_io)) {
2038 snprintfz(title, CHART_TITLE_MAX, "I/O Bandwidth (all disks) for cgroup %s", cg->chart_title);
1949 - cg->st_io = rrdset_create(type, "io", NULL, "disk", "cgroup.io", title, "KB/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_AREA);
2039 + cg->st_io = rrdset_create_localhost(type, "io", NULL, "disk", "cgroup.io", title, "KB/s",
2040 + CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_AREA);
2041 }
2042 rrddim_add(cg->st_io, "read", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
2043 rrddim_add(cg->st_io, "write", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -1965,7 +2056,9 @@ void update_cgroup_charts(int update_every) {
2056 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "serviced_ops");
2057 if(likely(!cg->st_serviced_ops)) {
2058 snprintfz(title, CHART_TITLE_MAX, "Serviced I/O Operations (all disks) for cgroup %s", cg->chart_title);
1968 - cg->st_serviced_ops = rrdset_create(type, "serviced_ops", NULL, "disk", "cgroup.serviced_ops", title, "operations/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_LINE);
2059 + cg->st_serviced_ops = rrdset_create_localhost(type, "serviced_ops", NULL, "disk"
2060 + , "cgroup.serviced_ops", title, "operations/s",
2061 + CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_LINE);
2062 }
2063 rrddim_add(cg->st_serviced_ops, "read", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2064 rrddim_add(cg->st_serviced_ops, "write", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -1984,7 +2077,9 @@ void update_cgroup_charts(int update_every) {
2077 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "throttle_io");
2078 if(likely(!cg->st_throttle_io)) {
2079 snprintfz(title, CHART_TITLE_MAX, "Throttle I/O Bandwidth (all disks) for cgroup %s", cg->chart_title);
1987 - cg->st_throttle_io = rrdset_create(type, "throttle_io", NULL, "disk", "cgroup.throttle_io", title, "KB/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_AREA);
2080 + cg->st_throttle_io = rrdset_create_localhost(type, "throttle_io", NULL, "disk", "cgroup.throttle_io"
2081 + , title, "KB/s", CHART_PRIORITY_CONTAINERS + 1200
2082 + , update_every, RRDSET_TYPE_AREA);
2083 }
2084 rrddim_add(cg->st_throttle_io, "read", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
2085 rrddim_add(cg->st_throttle_io, "write", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -2003,7 +2098,11 @@ void update_cgroup_charts(int update_every) {
2098 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "throttle_serviced_ops");
2099 if(likely(!cg->st_throttle_serviced_ops)) {
2100 snprintfz(title, CHART_TITLE_MAX, "Throttle Serviced I/O Operations (all disks) for cgroup %s", cg->chart_title);
2006 - cg->st_throttle_serviced_ops = rrdset_create(type, "throttle_serviced_ops", NULL, "disk", "cgroup.throttle_serviced_ops", title, "operations/s", CHART_PRIORITY_CONTAINERS + 1200, update_every, RRDSET_TYPE_LINE);
2101 + cg->st_throttle_serviced_ops = rrdset_create_localhost(type, "throttle_serviced_ops", NULL, "disk"
2102 + , "cgroup.throttle_serviced_ops", title
2103 + , "operations/s", CHART_PRIORITY_CONTAINERS +
2104 + 1200, update_every
2105 + , RRDSET_TYPE_LINE);
2106 }
2107 rrddim_add(cg->st_throttle_serviced_ops, "read", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
2108 rrddim_add(cg->st_throttle_serviced_ops, "write", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -2022,7 +2121,9 @@ void update_cgroup_charts(int update_every) {
2121 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "queued_ops");
2122 if(likely(!cg->st_queued_ops)) {
2123 snprintfz(title, CHART_TITLE_MAX, "Queued I/O Operations (all disks) for cgroup %s", cg->chart_title);
2025 - cg->st_queued_ops = rrdset_create(type, "queued_ops", NULL, "disk", "cgroup.queued_ops", title, "operations", CHART_PRIORITY_CONTAINERS + 2000, update_every, RRDSET_TYPE_LINE);
2124 + cg->st_queued_ops = rrdset_create_localhost(type, "queued_ops", NULL, "disk", "cgroup.queued_ops"
2125 + , title, "operations", CHART_PRIORITY_CONTAINERS + 2000
2126 + , update_every, RRDSET_TYPE_LINE);
2127 }
2128 rrddim_add(cg->st_queued_ops, "read", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
2129 rrddim_add(cg->st_queued_ops, "write", NULL, -1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -2041,7 +2142,10 @@ void update_cgroup_charts(int update_every) {
2142 cgroup_chart_type(type, cg->chart_id, RRD_ID_LENGTH_MAX), "merged_ops");
2143 if(likely(!cg->st_merged_ops)) {
2144 snprintfz(title, CHART_TITLE_MAX, "Merged I/O Operations (all disks) for cgroup %s", cg->chart_title);
2044 - cg->st_merged_ops = rrdset_create(type, "merged_ops", NULL, "disk", "cgroup.merged_ops", title, "operations/s", CHART_PRIORITY_CONTAINERS + 2100, update_every, RRDSET_TYPE_LINE);
2145 + cg->st_merged_ops = rrdset_create_localhost(type, "merged_ops", NULL, "disk", "cgroup.merged_ops"
2146 + , title, "operations/s", CHART_PRIORITY_CONTAINERS +
2147 + 2100, update_every
2148 + , RRDSET_TYPE_LINE);
2149 }
2150 rrddim_add(cg->st_merged_ops, "read", NULL, 1, 1024, RRD_ALGORITHM_INCREMENTAL);
2151 rrddim_add(cg->st_merged_ops, "write", NULL, -1, 1024, RRD_ALGORITHM_INCREMENTAL);
@@ -2125,7 +2229,9 @@ void *cgroups_main(void *ptr) {
2229 if(unlikely(!stcpu_thread)) {
2230 stcpu_thread = rrdset_find_localhost("netdata.plugin_cgroups_cpu");
2231 if(unlikely(!stcpu_thread))
2128 - stcpu_thread = rrdset_create("netdata", "plugin_cgroups_cpu", NULL, "cgroups", NULL, "NetData CGroups Plugin CPU usage", "milliseconds/s", 132000, cgroup_update_every, RRDSET_TYPE_STACKED);
2232 + stcpu_thread = rrdset_create_localhost("netdata", "plugin_cgroups_cpu", NULL, "cgroups", NULL
2233 + , "NetData CGroups Plugin CPU usage", "milliseconds/s"
2234 + , 132000, cgroup_update_every, RRDSET_TYPE_STACKED);
2235
2236 rrddim_add(stcpu_thread, "user", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
2237 rrddim_add(stcpu_thread, "system", NULL, 1, 1000, RRD_ALGORITHM_INCREMENTAL);
src/sys_kernel_mm_ksm.c
+6 -3
@@ -92,7 +92,8 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
92
93 st = rrdset_find_localhost("mem.ksm");
94 if(!st) {
95 - st = rrdset_create("mem", "ksm", NULL, "ksm", NULL, "Kernel Same Page Merging", "MB", 5000, update_every, RRDSET_TYPE_AREA);
95 + st = rrdset_create_localhost("mem", "ksm", NULL, "ksm", NULL, "Kernel Same Page Merging", "MB", 5000
96 + , update_every, RRDSET_TYPE_AREA);
97
98 rrddim_add(st, "shared", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
99 rrddim_add(st, "unshared", NULL, -1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -111,7 +112,8 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
112
113 st = rrdset_find_localhost("mem.ksm_savings");
114 if(!st) {
114 - st = rrdset_create("mem", "ksm_savings", NULL, "ksm", NULL, "Kernel Same Page Merging Savings", "MB", 5001, update_every, RRDSET_TYPE_AREA);
115 + st = rrdset_create_localhost("mem", "ksm_savings", NULL, "ksm", NULL, "Kernel Same Page Merging Savings", "MB"
116 + , 5001, update_every, RRDSET_TYPE_AREA);
117
118 rrddim_add(st, "savings", NULL, -1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
119 rrddim_add(st, "offered", NULL, 1, 1024 * 1024, RRD_ALGORITHM_ABSOLUTE);
@@ -124,7 +126,8 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
126
127 st = rrdset_find_localhost("mem.ksm_ratios");
128 if(!st) {
127 - st = rrdset_create("mem", "ksm_ratios", NULL, "ksm", NULL, "Kernel Same Page Merging Effectiveness", "percentage", 5002, update_every, RRDSET_TYPE_LINE);
129 + st = rrdset_create_localhost("mem", "ksm_ratios", NULL, "ksm", NULL, "Kernel Same Page Merging Effectiveness"
130 + , "percentage", 5002, update_every, RRDSET_TYPE_LINE);
131
132 rrddim_add(st, "savings", NULL, 1, 10000, RRD_ALGORITHM_ABSOLUTE);
133 }
src/unit_test.c
+6 -3
@@ -891,7 +891,8 @@ int run_test(struct test *test)
891 snprintfz(name, 100, "unittest-%s", test->name);
892
893 // create the chart
894 - RRDSET *st = rrdset_create("netdata", name, name, "netdata", NULL, "Unit Testing", "a value", 1, test->update_every, RRDSET_TYPE_LINE);
894 + RRDSET *st = rrdset_create_localhost("netdata", name, name, "netdata", NULL, "Unit Testing", "a value", 1
895 + , test->update_every, RRDSET_TYPE_LINE);
896 RRDDIM *rd = rrddim_add(st, "dim1", NULL, test->multiplier, test->divisor, test->algorithm);
897
898 RRDDIM *rd2 = NULL;
@@ -977,7 +978,8 @@ int run_test(struct test *test)
978
979 static int test_variable_renames(void) {
980 fprintf(stderr, "Creating chart\n");
980 - RRDSET *st = rrdset_create("chart", "ID", NULL, "family", "context", "Unit Testing", "a value", 1, 1, RRDSET_TYPE_LINE);
981 + RRDSET *st = rrdset_create_localhost("chart", "ID", NULL, "family", "context", "Unit Testing", "a value", 1, 1
982 + , RRDSET_TYPE_LINE);
983 fprintf(stderr, "Created chart with id '%s', name '%s'\n", st->id, st->name);
984
985 fprintf(stderr, "Creating dimension DIM1\n");
@@ -1097,7 +1099,8 @@ int unit_test(long delay, long shift)
1099 int do_abst = 0;
1100 int do_absi = 0;
1101
1100 - RRDSET *st = rrdset_create("netdata", name, name, "netdata", NULL, "Unit Testing", "a value", 1, 1, RRDSET_TYPE_LINE);
1102 + RRDSET *st = rrdset_create_localhost("netdata", name, name, "netdata", NULL, "Unit Testing", "a value", 1, 1
1103 + , RRDSET_TYPE_LINE);
1104 st->debug = 1;
1105
1106 RRDDIM *rdabs = NULL;