@cryptotaxi247 / netdata-1 / commits / 989604bad

Make units compliant with IEC standard (#4985)

* Change GB to GiB * Change MB to MiB in apps.plugin * Change MB to MiB in cgroups.plugin * Change MB to MiB in freebsd.plugin and macos.plugin * Change MB to MiB in proc.plugin * Change KB to KiB * Change kB to KiB for divisor 1024 * Fix units for memory.failcnt * Fix other units * Change CPU time percentage * Change kilobytes to KiB in apps.plugin * Small fixes

Vladimir Kobal committed Dec 17, 2018 at 13:20 UTC 989604bada2a5d075d3025fe8a85b77cede9c586
27 files changed +167 -167
backends/backends.c
+1 -1
@@ -352,7 +352,7 @@ void *backends_main(void *ptr) {
352 rrddim_add(chart_metrics, "lost", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
353 rrddim_add(chart_metrics, "sent", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
354
355 - RRDSET *chart_bytes = rrdset_create_localhost("netdata", "backend_bytes", NULL, "backend", NULL, "Netdata Backend Data Size", "KB", "backends", NULL, 130610, global_backend_update_every, RRDSET_TYPE_AREA);
355 + RRDSET *chart_bytes = rrdset_create_localhost("netdata", "backend_bytes", NULL, "backend", NULL, "Netdata Backend Data Size", "KiB", "backends", NULL, 130610, global_backend_update_every, RRDSET_TYPE_AREA);
356 rrddim_add(chart_bytes, "buffered", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
357 rrddim_add(chart_bytes, "lost", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
358 rrddim_add(chart_bytes, "sent", NULL, 1, 1024, RRD_ALGORITHM_ABSOLUTE);
collectors/apps.plugin/apps_plugin.c
+14 -14
@@ -1038,8 +1038,8 @@ static inline int read_proc_pid_status(struct pid_stat *p, void *ptr) {
1038
1039 p->uid = proc_info->ki_uid;
1040 p->gid = proc_info->ki_groups[0];
1041 - p->status_vmsize = proc_info->ki_size / 1024; // in kB
1042 - p->status_vmrss = proc_info->ki_rssize * pagesize / 1024; // in kB
1041 + p->status_vmsize = proc_info->ki_size / 1024; // in KiB
1042 + p->status_vmrss = proc_info->ki_rssize * pagesize / 1024; // in KiB
1043 // TODO: what about shared and swap memory on FreeBSD?
1044 return 1;
1045 #else
@@ -3196,7 +3196,7 @@ static void send_collected_data_to_netdata(struct target *root, const char *type
3196 }
3197 send_END();
3198 #endif
3199 -
3199 +
3200 send_BEGIN(type, "minor_faults", dt);
3201 for (w = root; w ; w = w->next) {
3202 if(unlikely(w->exposed))
@@ -3290,19 +3290,19 @@ static void send_charts_updates_to_netdata(struct target *root, const char *type
3290
3291 // we have something new to show
3292 // update the charts
3293 - fprintf(stdout, "CHART %s.cpu '' '%s CPU Time (%d%% = %d core%s)' 'cpu time %%' cpu %s.cpu stacked 20001 %d\n", type, title, (processors * 100), processors, (processors>1)?"s":"", type, update_every);
3293 + fprintf(stdout, "CHART %s.cpu '' '%s CPU Time (%d%% = %d core%s)' 'percentage' cpu %s.cpu stacked 20001 %d\n", type, title, (processors * 100), processors, (processors>1)?"s":"", type, update_every);
3294 for (w = root; w ; w = w->next) {
3295 if(unlikely(w->exposed))
3296 fprintf(stdout, "DIMENSION %s '' absolute 1 %llu %s\n", w->name, system_hz * RATES_DETAIL / 100, w->hidden ? "hidden" : "");
3297 }
3298
3299 - fprintf(stdout, "CHART %s.mem '' '%s Real Memory (w/o shared)' 'MB' mem %s.mem stacked 20003 %d\n", type, title, type, update_every);
3299 + fprintf(stdout, "CHART %s.mem '' '%s Real Memory (w/o shared)' 'MiB' mem %s.mem stacked 20003 %d\n", type, title, type, update_every);
3300 for (w = root; w ; w = w->next) {
3301 if(unlikely(w->exposed))
3302 fprintf(stdout, "DIMENSION %s '' absolute %ld %ld\n", w->name, 1L, 1024L);
3303 }
3304
3305 - fprintf(stdout, "CHART %s.vmem '' '%s Virtual Memory Size' 'MB' mem %s.vmem stacked 20005 %d\n", type, title, type, update_every);
3305 + fprintf(stdout, "CHART %s.vmem '' '%s Virtual Memory Size' 'MiB' mem %s.vmem stacked 20005 %d\n", type, title, type, update_every);
3306 for (w = root; w ; w = w->next) {
3307 if(unlikely(w->exposed))
3308 fprintf(stdout, "DIMENSION %s '' absolute %ld %ld\n", w->name, 1L, 1024L);
@@ -3320,20 +3320,20 @@ static void send_charts_updates_to_netdata(struct target *root, const char *type
3320 fprintf(stdout, "DIMENSION %s '' absolute 1 1\n", w->name);
3321 }
3322
3323 - fprintf(stdout, "CHART %s.cpu_user '' '%s CPU User Time (%d%% = %d core%s)' 'cpu time %%' cpu %s.cpu_user stacked 20020 %d\n", type, title, (processors * 100), processors, (processors>1)?"s":"", type, update_every);
3323 + fprintf(stdout, "CHART %s.cpu_user '' '%s CPU User Time (%d%% = %d core%s)' 'percentage' cpu %s.cpu_user stacked 20020 %d\n", type, title, (processors * 100), processors, (processors>1)?"s":"", type, update_every);
3324 for (w = root; w ; w = w->next) {
3325 if(unlikely(w->exposed))
3326 fprintf(stdout, "DIMENSION %s '' absolute 1 %llu\n", w->name, system_hz * RATES_DETAIL / 100LLU);
3327 }
3328
3329 - fprintf(stdout, "CHART %s.cpu_system '' '%s CPU System Time (%d%% = %d core%s)' 'cpu time %%' cpu %s.cpu_system stacked 20021 %d\n", type, title, (processors * 100), processors, (processors>1)?"s":"", type, update_every);
3329 + fprintf(stdout, "CHART %s.cpu_system '' '%s CPU System Time (%d%% = %d core%s)' 'percentage' cpu %s.cpu_system stacked 20021 %d\n", type, title, (processors * 100), processors, (processors>1)?"s":"", type, update_every);
3330 for (w = root; w ; w = w->next) {
3331 if(unlikely(w->exposed))
3332 fprintf(stdout, "DIMENSION %s '' absolute 1 %llu\n", w->name, system_hz * RATES_DETAIL / 100LLU);
3333 }
3334
3335 if(show_guest_time) {
3336 - fprintf(stdout, "CHART %s.cpu_guest '' '%s CPU Guest Time (%d%% = %d core%s)' 'cpu time %%' cpu %s.cpu_system stacked 20022 %d\n", type, title, (processors * 100), processors, (processors > 1) ? "s" : "", type, update_every);
3336 + fprintf(stdout, "CHART %s.cpu_guest '' '%s CPU Guest Time (%d%% = %d core%s)' 'percentage' cpu %s.cpu_system stacked 20022 %d\n", type, title, (processors * 100), processors, (processors > 1) ? "s" : "", type, update_every);
3337 for (w = root; w; w = w->next) {
3338 if(unlikely(w->exposed))
3339 fprintf(stdout, "DIMENSION %s '' absolute 1 %llu\n", w->name, system_hz * RATES_DETAIL / 100LLU);
@@ -3341,7 +3341,7 @@ static void send_charts_updates_to_netdata(struct target *root, const char *type
3341 }
3342
3343 #ifndef __FreeBSD__
3344 - fprintf(stdout, "CHART %s.swap '' '%s Swap Memory' 'MB' swap %s.swap stacked 20011 %d\n", type, title, type, update_every);
3344 + fprintf(stdout, "CHART %s.swap '' '%s Swap Memory' 'MiB' swap %s.swap stacked 20011 %d\n", type, title, type, update_every);
3345 for (w = root; w ; w = w->next) {
3346 if(unlikely(w->exposed))
3347 fprintf(stdout, "DIMENSION %s '' absolute %ld %ld\n", w->name, 1L, 1024L);
@@ -3373,25 +3373,25 @@ static void send_charts_updates_to_netdata(struct target *root, const char *type
3373 fprintf(stdout, "DIMENSION %s '' absolute 1 %llu\n", w->name, RATES_DETAIL);
3374 }
3375 #else
3376 - fprintf(stdout, "CHART %s.preads '' '%s Disk Reads' 'kilobytes/s' disk %s.preads stacked 20002 %d\n", type, title, type, update_every);
3376 + fprintf(stdout, "CHART %s.preads '' '%s Disk Reads' 'KiB/s' disk %s.preads stacked 20002 %d\n", type, title, type, update_every);
3377 for (w = root; w ; w = w->next) {
3378 if(unlikely(w->exposed))
3379 fprintf(stdout, "DIMENSION %s '' absolute 1 %llu\n", w->name, 1024LLU * RATES_DETAIL);
3380 }
3381
3382 - fprintf(stdout, "CHART %s.pwrites '' '%s Disk Writes' 'kilobytes/s' disk %s.pwrites stacked 20002 %d\n", type, title, type, update_every);
3382 + fprintf(stdout, "CHART %s.pwrites '' '%s Disk Writes' 'KiB/s' disk %s.pwrites stacked 20002 %d\n", type, title, type, update_every);
3383 for (w = root; w ; w = w->next) {
3384 if(unlikely(w->exposed))
3385 fprintf(stdout, "DIMENSION %s '' absolute 1 %llu\n", w->name, 1024LLU * RATES_DETAIL);
3386 }
3387
3388 - fprintf(stdout, "CHART %s.lreads '' '%s Disk Logical Reads' 'kilobytes/s' disk %s.lreads stacked 20042 %d\n", type, title, type, update_every);
3388 + fprintf(stdout, "CHART %s.lreads '' '%s Disk Logical Reads' 'KiB/s' disk %s.lreads stacked 20042 %d\n", type, title, type, update_every);
3389 for (w = root; w ; w = w->next) {
3390 if(unlikely(w->exposed))
3391 fprintf(stdout, "DIMENSION %s '' absolute 1 %llu\n", w->name, 1024LLU * RATES_DETAIL);
3392 }
3393
3394 - fprintf(stdout, "CHART %s.lwrites '' '%s I/O Logical Writes' 'kilobytes/s' disk %s.lwrites stacked 20042 %d\n", type, title, type, update_every);
3394 + fprintf(stdout, "CHART %s.lwrites '' '%s I/O Logical Writes' 'KiB/s' disk %s.lwrites stacked 20042 %d\n", type, title, type, update_every);
3395 for (w = root; w ; w = w->next) {
3396 if(unlikely(w->exposed))
3397 fprintf(stdout, "DIMENSION %s '' absolute 1 %llu\n", w->name, 1024LLU * RATES_DETAIL);
collectors/cgroups.plugin/sys_fs_cgroup.c
+22 -22
@@ -1489,7 +1489,7 @@ void update_systemd_services_charts(
1489 , "services.mem_usage"
1490 , (cgroup_used_memory_without_cache) ? "Systemd Services Used Memory without Cache"
1491 : "Systemd Services Used Memory"
1492 - , "MB"
1492 + , "MiB"
1493 , PLUGIN_CGROUPS_NAME
1494 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1495 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 10
@@ -1512,7 +1512,7 @@ void update_systemd_services_charts(
1512 , "mem"
1513 , "services.mem_rss"
1514 , "Systemd Services RSS Memory"
1515 - , "MB"
1515 + , "MiB"
1516 , PLUGIN_CGROUPS_NAME
1517 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1518 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 20
@@ -1533,7 +1533,7 @@ void update_systemd_services_charts(
1533 , "mem"
1534 , "services.mem_mapped"
1535 , "Systemd Services Mapped Memory"
1536 - , "MB"
1536 + , "MiB"
1537 , PLUGIN_CGROUPS_NAME
1538 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1539 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 30
@@ -1554,7 +1554,7 @@ void update_systemd_services_charts(
1554 , "mem"
1555 , "services.mem_cache"
1556 , "Systemd Services Cache Memory"
1557 - , "MB"
1557 + , "MiB"
1558 , PLUGIN_CGROUPS_NAME
1559 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1560 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 40
@@ -1575,7 +1575,7 @@ void update_systemd_services_charts(
1575 , "mem"
1576 , "services.mem_writeback"
1577 , "Systemd Services Writeback Memory"
1578 - , "MB"
1578 + , "MiB"
1579 , PLUGIN_CGROUPS_NAME
1580 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1581 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 50
@@ -1596,7 +1596,7 @@ void update_systemd_services_charts(
1596 , "mem"
1597 , "services.mem_pgfault"
1598 , "Systemd Services Memory Minor Page Faults"
1599 - , "MB/s"
1599 + , "MiB/s"
1600 , PLUGIN_CGROUPS_NAME
1601 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1602 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 60
@@ -1616,7 +1616,7 @@ void update_systemd_services_charts(
1616 , "mem"
1617 , "services.mem_pgmajfault"
1618 , "Systemd Services Memory Major Page Faults"
1619 - , "MB/s"
1619 + , "MiB/s"
1620 , PLUGIN_CGROUPS_NAME
1621 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1622 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 70
@@ -1637,7 +1637,7 @@ void update_systemd_services_charts(
1637 , "mem"
1638 , "services.mem_pgpgin"
1639 , "Systemd Services Memory Charging Activity"
1640 - , "MB/s"
1640 + , "MiB/s"
1641 , PLUGIN_CGROUPS_NAME
1642 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1643 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 80
@@ -1658,7 +1658,7 @@ void update_systemd_services_charts(
1658 , "mem"
1659 , "services.mem_pgpgout"
1660 , "Systemd Services Memory Uncharging Activity"
1661 - , "MB/s"
1661 + , "MiB/s"
1662 , PLUGIN_CGROUPS_NAME
1663 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1664 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 90
@@ -1681,7 +1681,7 @@ void update_systemd_services_charts(
1681 , "mem"
1682 , "services.mem_failcnt"
1683 , "Systemd Services Memory Limit Failures"
1684 - , "MB"
1684 + , "failures"
1685 , PLUGIN_CGROUPS_NAME
1686 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1687 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 110
@@ -1704,7 +1704,7 @@ void update_systemd_services_charts(
1704 , "swap"
1705 , "services.swap_usage"
1706 , "Systemd Services Swap Memory Used"
1707 - , "MB"
1707 + , "MiB"
1708 , PLUGIN_CGROUPS_NAME
1709 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1710 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 100
@@ -1727,7 +1727,7 @@ void update_systemd_services_charts(
1727 , "disk"
1728 , "services.io_read"
1729 , "Systemd Services Disk Read Bandwidth"
1730 - , "KB/s"
1730 + , "KiB/s"
1731 , PLUGIN_CGROUPS_NAME
1732 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1733 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 120
@@ -1748,7 +1748,7 @@ void update_systemd_services_charts(
1748 , "disk"
1749 , "services.io_write"
1750 , "Systemd Services Disk Write Bandwidth"
1751 - , "KB/s"
1751 + , "KiB/s"
1752 , PLUGIN_CGROUPS_NAME
1753 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1754 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 130
@@ -1815,7 +1815,7 @@ void update_systemd_services_charts(
1815 , "disk"
1816 , "services.throttle_io_read"
1817 , "Systemd Services Throttle Disk Read Bandwidth"
1818 - , "KB/s"
1818 + , "KiB/s"
1819 , PLUGIN_CGROUPS_NAME
1820 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1821 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 160
@@ -1836,7 +1836,7 @@ void update_systemd_services_charts(
1836 , "disk"
1837 , "services.throttle_io_write"
1838 , "Systemd Services Throttle Disk Write Bandwidth"
1839 - , "KB/s"
1839 + , "KiB/s"
1840 , PLUGIN_CGROUPS_NAME
1841 , PLUGIN_CGROUPS_MODULE_SYSTEMD_NAME
1842 , NETDATA_CHART_PRIO_CGROUPS_SYSTEMD + 170
@@ -2317,7 +2317,7 @@ void update_cgroup_charts(int update_every) {
2317 , "mem"
2318 , "cgroup.mem"
2319 , title
2320 - , "MB"
2320 + , "MiB"
2321 , PLUGIN_CGROUPS_NAME
2322 , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2323 , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 210
@@ -2357,7 +2357,7 @@ void update_cgroup_charts(int update_every) {
2357 , "mem"
2358 , "cgroup.writeback"
2359 , title
2360 - , "MB"
2360 + , "MiB"
2361 , PLUGIN_CGROUPS_NAME
2362 , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2363 , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 300
@@ -2389,7 +2389,7 @@ void update_cgroup_charts(int update_every) {
2389 , "mem"
2390 , "cgroup.mem_activity"
2391 , title
2392 - , "MB/s"
2392 + , "MiB/s"
2393 , PLUGIN_CGROUPS_NAME
2394 , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2395 , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 400
@@ -2417,7 +2417,7 @@ void update_cgroup_charts(int update_every) {
2417 , "mem"
2418 , "cgroup.pgfaults"
2419 , title
2420 - , "MB/s"
2420 + , "MiB/s"
2421 , PLUGIN_CGROUPS_NAME
2422 , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2423 , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 500
@@ -2447,7 +2447,7 @@ void update_cgroup_charts(int update_every) {
2447 , "mem"
2448 , "cgroup.mem_usage"
2449 , title
2450 - , "MB"
2450 + , "MiB"
2451 , PLUGIN_CGROUPS_NAME
2452 , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2453 , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 200
@@ -2505,7 +2505,7 @@ void update_cgroup_charts(int update_every) {
2505 , "disk"
2506 , "cgroup.io"
2507 , title
2508 - , "KB/s"
2508 + , "KiB/s"
2509 , PLUGIN_CGROUPS_NAME
2510 , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2511 , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 1200
@@ -2565,7 +2565,7 @@ void update_cgroup_charts(int update_every) {
2565 , "disk"
2566 , "cgroup.throttle_io"
2567 , title
2568 - , "KB/s"
2568 + , "KiB/s"
2569 , PLUGIN_CGROUPS_NAME
2570 , PLUGIN_CGROUPS_MODULE_CGROUPS_NAME
2571 , NETDATA_CHART_PRIO_CGROUPS_CONTAINERS + 1200
collectors/diskspace.plugin/plugin_diskspace.c
+2 -2
@@ -263,7 +263,7 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
263 , family
264 , "disk.space"
265 , title
266 - , "GB"
266 + , "GiB"
267 , PLUGIN_DISKSPACE_NAME
268 , NULL
269 , NETDATA_CHART_PRIO_DISKSPACE_SPACE
@@ -303,7 +303,7 @@ static inline void do_disk_space_stats(struct mountinfo *mi, int update_every) {
303 , family
304 , "disk.inodes"
305 , title
306 - , "Inodes"
306 + , "inodes"
307 , PLUGIN_DISKSPACE_NAME
308 , NULL
309 , NETDATA_CHART_PRIO_DISKSPACE_INODES
collectors/freebsd.plugin/freebsd_devstat.c
+24 -24
@@ -360,10 +360,10 @@ int do_kern_devstat(int update_every, usec_t dt) {
360 disk,
361 "disk.io",
362 "Disk I/O Bandwidth",
363 - "kilobytes/s",
364 - "freebsd.plugin",
363 + "KiB/s",
364 + "freebsd.plugin",
365 "devstat",
366 - NETDATA_CHART_PRIO_DISK_IO,
366 + NETDATA_CHART_PRIO_DISK_IO,
367 update_every,
368 RRDSET_TYPE_AREA
369 );
@@ -398,9 +398,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
398 "disk.ops",
399 "Disk Completed I/O Operations",
400 "operations/s",
401 - "freebsd.plugin",
402 - "devstat",
403 - NETDATA_CHART_PRIO_DISK_OPS,
401 + "freebsd.plugin",
402 + "devstat",
403 + NETDATA_CHART_PRIO_DISK_OPS,
404 update_every,
405 RRDSET_TYPE_LINE
406 );
@@ -437,9 +437,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
437 "disk.qops",
438 "Disk Current I/O Operations",
439 "operations",
440 - "freebsd.plugin",
440 + "freebsd.plugin",
441 "devstat",
442 - NETDATA_CHART_PRIO_DISK_QOPS,
442 + NETDATA_CHART_PRIO_DISK_QOPS,
443 update_every,
444 RRDSET_TYPE_LINE
445 );
@@ -466,9 +466,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
466 "disk.util",
467 "Disk Utilization Time",
468 "% of time working",
469 - "freebsd.plugin",
469 + "freebsd.plugin",
470 "devstat",
471 - NETDATA_CHART_PRIO_DISK_UTIL,
471 + NETDATA_CHART_PRIO_DISK_UTIL,
472 update_every,
473 RRDSET_TYPE_AREA
474 );
@@ -499,9 +499,9 @@ int do_kern_devstat(int update_every, usec_t dt) {
499 "disk.iotime",
500 "Disk Total I/O Time",
501 "milliseconds/s",
502 - "freebsd.plugin",
502 + "freebsd.plugin",
503 "devstat",
504 - NETDATA_CHART_PRIO_DISK_IOTIME,
504 + NETDATA_CHART_PRIO_DISK_IOTIME,
505 update_every,
506 RRDSET_TYPE_LINE
507 );
@@ -546,10 +546,10 @@ int do_kern_devstat(int update_every, usec_t dt) {
546 disk,
547 "disk.await",
548 "Average Completed I/O Operation Time",
549 - "ms per operation",
550 - "freebsd.plugin",
549 + "milliseconds/operation",
550 + "freebsd.plugin",
551 "devstat",
552 - NETDATA_CHART_PRIO_DISK_AWAIT,
552 + NETDATA_CHART_PRIO_DISK_AWAIT,
553 update_every,
554 RRDSET_TYPE_LINE
555 );
@@ -611,10 +611,10 @@ int do_kern_devstat(int update_every, usec_t dt) {
611 disk,
612 "disk.avgsz",
613 "Average Completed I/O Operation Bandwidth",
614 - "kilobytes per operation",
615 - "freebsd.plugin",
614 + "KiB/operation",
615 + "freebsd.plugin",
616 "devstat",
617 - NETDATA_CHART_PRIO_DISK_AVGSZ,
617 + NETDATA_CHART_PRIO_DISK_AVGSZ,
618 update_every,
619 RRDSET_TYPE_AREA
620 );
@@ -668,10 +668,10 @@ int do_kern_devstat(int update_every, usec_t dt) {
668 disk,
669 "disk.svctm",
670 "Average Service Time",
671 - "ms per operation",
672 - "freebsd.plugin",
671 + "milliseconds/operation",
672 + "freebsd.plugin",
673 "devstat",
674 - NETDATA_CHART_PRIO_DISK_SVCTM,
674 + NETDATA_CHART_PRIO_DISK_SVCTM,
675 update_every,
676 RRDSET_TYPE_LINE
677 );
@@ -728,10 +728,10 @@ int do_kern_devstat(int update_every, usec_t dt) {
728 "disk",
729 NULL,
730 "Disk I/O",
731 - "kilobytes/s",
732 - "freebsd.plugin",
731 + "KiB/s",
732 + "freebsd.plugin",
733 "devstat",
734 - NETDATA_CHART_PRIO_SYSTEM_IO,
734 + NETDATA_CHART_PRIO_SYSTEM_IO,
735 update_every,
736 RRDSET_TYPE_AREA
737 );
collectors/freebsd.plugin/freebsd_getifaddrs.c
+25 -25
@@ -156,7 +156,7 @@ int do_getifaddrs(int update_every, usec_t dt) {
156 enable_new_interfaces = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS,
157 "enable new interfaces detected at runtime",
158 CONFIG_BOOLEAN_AUTO);
159 -
159 +
160 do_bandwidth_net = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "total bandwidth for physical interfaces",
161 CONFIG_BOOLEAN_AUTO);
162 do_packets_net = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "total packets for physical interfaces",
@@ -229,7 +229,7 @@ int do_getifaddrs(int update_every, usec_t dt) {
229 // --------------------------------------------------------------------
230
231 if (likely(do_bandwidth_net)) {
232 -
232 +
233 iftot.ift_ibytes = iftot.ift_obytes = 0;
234 for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
235 if (ifa->ifa_addr->sa_family != AF_LINK)
@@ -239,10 +239,10 @@ int do_getifaddrs(int update_every, usec_t dt) {
239 iftot.ift_ibytes += IFA_DATA(ibytes);
240 iftot.ift_obytes += IFA_DATA(obytes);
241 }
242 -
242 +
243 static RRDSET *st = NULL;
244 static RRDDIM *rd_in = NULL, *rd_out = NULL;
245 -
245 +
246 if (unlikely(!st)) {
247 st = rrdset_create_localhost("system",
248 "net",
@@ -251,23 +251,23 @@ int do_getifaddrs(int update_every, usec_t dt) {
251 NULL,
252 "Network Traffic",
253 "kilobits/s",
254 - "freebsd.plugin",
254 + "freebsd.plugin",
255 "getifaddrs",
256 - NETDATA_CHART_PRIO_SYSTEM_NET,
256 + NETDATA_CHART_PRIO_SYSTEM_NET,
257 update_every,
258 RRDSET_TYPE_AREA
259 );
260 -
260 +
261 rd_in = rrddim_add(st, "InOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
262 rd_out = rrddim_add(st, "OutOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
263 } else
264 rrdset_next(st);
265 -
265 +
266 rrddim_set_by_pointer(st, rd_in, iftot.ift_ibytes);
267 rrddim_set_by_pointer(st, rd_out, iftot.ift_obytes);
268 rrdset_done(st);
269 }
270 -
270 +
271 // --------------------------------------------------------------------
272
273 if (likely(do_packets_net)) {
@@ -295,9 +295,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
295 NULL,
296 "Network Packets",
297 "packets/s",
298 - "freebsd.plugin",
298 + "freebsd.plugin",
299 "getifaddrs",
300 - NETDATA_CHART_PRIO_SYSTEM_PACKETS,
300 + NETDATA_CHART_PRIO_SYSTEM_PACKETS,
301 update_every,
302 RRDSET_TYPE_LINE
303 );
@@ -340,9 +340,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
340 NULL,
341 "IPv4 Bandwidth",
342 "kilobits/s",
343 - "freebsd.plugin",
343 + "freebsd.plugin",
344 "getifaddrs",
345 - NETDATA_CHART_PRIO_SYSTEM_IPV4,
345 + NETDATA_CHART_PRIO_SYSTEM_IPV4,
346 update_every,
347 RRDSET_TYPE_AREA
348 );
@@ -379,9 +379,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
379 NULL,
380 "IPv6 Bandwidth",
381 "kilobits/s",
382 - "freebsd.plugin",
382 + "freebsd.plugin",
383 "getifaddrs",
384 - NETDATA_CHART_PRIO_SYSTEM_IPV6,
384 + NETDATA_CHART_PRIO_SYSTEM_IPV6,
385 update_every,
386 RRDSET_TYPE_AREA
387 );
@@ -449,9 +449,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
449 "net.net",
450 "Bandwidth",
451 "kilobits/s",
452 - "freebsd.plugin",
452 + "freebsd.plugin",
453 "getifaddrs",
454 - NETDATA_CHART_PRIO_FIRST_NET_IFACE,
454 + NETDATA_CHART_PRIO_FIRST_NET_IFACE,
455 update_every,
456 RRDSET_TYPE_AREA
457 );
@@ -478,9 +478,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
478 "net.packets",
479 "Packets",
480 "packets/s",
481 - "freebsd.plugin",
481 + "freebsd.plugin",
482 "getifaddrs",
483 - NETDATA_CHART_PRIO_FIRST_NET_PACKETS,
483 + NETDATA_CHART_PRIO_FIRST_NET_PACKETS,
484 update_every,
485 RRDSET_TYPE_LINE
486 );
@@ -517,9 +517,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
517 "net.errors",
518 "Interface Errors",
519 "errors/s",
520 - "freebsd.plugin",
520 + "freebsd.plugin",
521 "getifaddrs",
522 - NETDATA_CHART_PRIO_FIRST_NET_ERRORS,
522 + NETDATA_CHART_PRIO_FIRST_NET_ERRORS,
523 update_every,
524 RRDSET_TYPE_LINE
525 );
@@ -551,9 +551,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
551 "net.drops",
552 "Interface Drops",
553 "drops/s",
554 - "freebsd.plugin",
554 + "freebsd.plugin",
555 "getifaddrs",
556 - NETDATA_CHART_PRIO_FIRST_NET_DROPS,
556 + NETDATA_CHART_PRIO_FIRST_NET_DROPS,
557 update_every,
558 RRDSET_TYPE_LINE
559 );
@@ -586,9 +586,9 @@ int do_getifaddrs(int update_every, usec_t dt) {
586 "net.events",
587 "Network Interface Events",
588 "events/s",
589 - "freebsd.plugin",
589 + "freebsd.plugin",
590 "getifaddrs",
591 - NETDATA_CHART_PRIO_FIRST_NET_EVENTS,
591 + NETDATA_CHART_PRIO_FIRST_NET_EVENTS,
592 update_every,
593 RRDSET_TYPE_LINE
594 );
collectors/freebsd.plugin/freebsd_getmntinfo.c
+6 -6
@@ -226,10 +226,10 @@ int do_getmntinfo(int update_every, usec_t dt) {
226 mntbuf[i].f_mntonname,
227 "disk.space",
228 title,
229 - "GB",
230 - "freebsd.plugin",
229 + "GiB",
230 + "freebsd.plugin",
231 "getmntinfo",
232 - NETDATA_CHART_PRIO_DISKSPACE_SPACE,
232 + NETDATA_CHART_PRIO_DISKSPACE_SPACE,
233 update_every,
234 RRDSET_TYPE_STACKED
235 );
@@ -265,10 +265,10 @@ int do_getmntinfo(int update_every, usec_t dt) {
265 mntbuf[i].f_mntonname,
266 "disk.inodes",
267 title,
268 - "Inodes",
269 - "freebsd.plugin",
268 + "inodes",
269 + "freebsd.plugin",
270 "getmntinfo",
271 - NETDATA_CHART_PRIO_DISKSPACE_INODES,
271 + NETDATA_CHART_PRIO_DISKSPACE_INODES,
272 update_every,
273 RRDSET_TYPE_STACKED
274 );
collectors/freebsd.plugin/freebsd_ipfw.c
+4 -4
@@ -197,7 +197,7 @@ int do_ipfw(int update_every, usec_t dt) {
197 NULL,
198 "Packets",
199 "packets/s",
200 - "freebsd.plugin",
200 + "freebsd.plugin",
201 "ipfw",
202 NETDATA_CHART_PRIO_IPFW_PACKETS,
203 update_every,
@@ -214,7 +214,7 @@ int do_ipfw(int update_every, usec_t dt) {
214 NULL,
215 "Bytes",
216 "bytes/s",
217 - "freebsd.plugin",
217 + "freebsd.plugin",
218 "ipfw",
219 NETDATA_CHART_PRIO_IPFW_BYTES,
220 update_every,
@@ -318,7 +318,7 @@ int do_ipfw(int update_every, usec_t dt) {
318 NULL,
319 "Active rules",
320 "rules",
321 - "freebsd.plugin",
321 + "freebsd.plugin",
322 "ipfw",
323 NETDATA_CHART_PRIO_IPFW_ACTIVE,
324 update_every,
@@ -335,7 +335,7 @@ int do_ipfw(int update_every, usec_t dt) {
335 NULL,
336 "Expired rules",
337 "rules",
338 - "freebsd.plugin",
338 + "freebsd.plugin",
339 "ipfw",
340 NETDATA_CHART_PRIO_IPFW_EXPIRED,
341 update_every,
collectors/freebsd.plugin/freebsd_sysctl.c
+7 -7
@@ -276,7 +276,7 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
276 "system",
277 NULL,
278 "Committed (Allocated) Memory",
279 - "MB",
279 + "MiB",
280 "freebsd.plugin",
281 "vm.vmtotal",
282 NETDATA_CHART_PRIO_MEM_SYSTEM_COMMITTED,
@@ -936,7 +936,7 @@ int do_vm_swap_info(int update_every, usec_t dt) {
936 "swap",
937 NULL,
938 "System Swap",
939 - "MB",
939 + "MiB",
940 "freebsd.plugin",
941 "vm.swap_info",
942 NETDATA_CHART_PRIO_SYSTEM_SWAP,
@@ -1000,7 +1000,7 @@ int do_system_ram(int update_every, usec_t dt) {
1000 "ram",
1001 NULL,
1002 "System RAM",
1003 - "MB",
1003 + "MiB",
1004 "freebsd.plugin",
1005 "system.ram",
1006 NETDATA_CHART_PRIO_SYSTEM_RAM,
@@ -1067,7 +1067,7 @@ int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) {
1067 "swap",
1068 NULL,
1069 "Swap I/O",
1070 - "kilobytes/s",
1070 + "KiB/s",
1071 "freebsd.plugin",
1072 "vm.stats.vm.v_swappgs",
1073 NETDATA_CHART_PRIO_SYSTEM_SWAPIO,
@@ -1327,7 +1327,7 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
1327 "ipc shared memory",
1328 NULL,
1329 "IPC Shared Memory Segments Size",
1330 - "kilobytes",
1330 + "KiB",
1331 "freebsd.plugin",
1332 "kern.ipc.shm",
1333 NETDATA_CHART_PRIO_SYSTEM_IPC_SHARED_MEM_SIZE,
@@ -2034,7 +2034,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
2034 rrddim_set_by_pointer(st, rd_failed, tcpstat.tcps_sc_zonefail);
2035 rrdset_done(st);
2036 }
2037 -
2037 +
2038 // --------------------------------------------------------------------
2039
2040 if(do_tcpext_listen == CONFIG_BOOLEAN_YES || (do_tcpext_listen == CONFIG_BOOLEAN_AUTO && tcpstat.tcps_listendrop)) {
@@ -2668,7 +2668,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
2668 NULL,
2669 "IPv6 Fragments Sent",
2670 "packets/s",
2671 - "freebsd.plugin",
2671 + "freebsd.plugin",
2672 "net.inet6.ip6.stats",
2673 3010,
2674 update_every,
collectors/macos.plugin/macos_fw.c
+7 -7
@@ -154,7 +154,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
154 , diskstat.name
155 , "disk.io"
156 , "Disk I/O Bandwidth"
157 - , "kilobytes/s"
157 + , "KiB/s"
158 , "macos"
159 , "iokit"
160 , 2000
@@ -306,7 +306,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
306 , diskstat.name
307 , "disk.await"
308 , "Average Completed I/O Operation Time"
309 - , "ms per operation"
309 + , "milliseconds/operation"
310 , "macos"
311 , "iokit"
312 , 2005
@@ -337,7 +337,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
337 , diskstat.name
338 , "disk.avgsz"
339 , "Average Completed I/O Operation Bandwidth"
340 - , "kilobytes per operation"
340 + , "KiB/operation"
341 , "macos"
342 , "iokit"
343 , 2006
@@ -368,7 +368,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
368 , diskstat.name
369 , "disk.svctm"
370 , "Average Service Time"
371 - , "ms per operation"
371 + , "milliseconds/operation"
372 , "macos"
373 , "iokit"
374 , 2007
@@ -410,7 +410,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
410 , "disk"
411 , NULL
412 , "Disk I/O"
413 - , "kilobytes/s"
413 + , "KiB/s"
414 , "macos"
415 , "iokit"
416 , 150
@@ -463,7 +463,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
463 , mntbuf[i].f_mntonname
464 , "disk.space"
465 , title
466 - , "GB"
466 + , "GiB"
467 , "macos"
468 , "iokit"
469 , 2023
@@ -496,7 +496,7 @@ int do_macos_iokit(int update_every, usec_t dt) {
496 , mntbuf[i].f_mntonname
497 , "disk.inodes"
498 , title
499 - , "Inodes"
499 + , "inodes"
500 , "macos"
501 , "iokit"
502 , 2024
collectors/macos.plugin/macos_mach_smi.c
+6 -6
@@ -90,7 +90,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
90 }
91
92 // --------------------------------------------------------------------
93 -
93 +
94 if (likely(do_ram || do_swapio || do_pgfaults)) {
95 #if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060)
96 count = sizeof(vm_statistics64_data_t);
@@ -118,7 +118,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
118 , "ram"
119 , NULL
120 , "System RAM"
121 - , "MB"
121 + , "MiB"
122 , "macos"
123 , "mach_smi"
124 , 200
@@ -165,7 +165,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
165 , "swap"
166 , NULL
167 , "Swap I/O"
168 - , "kilobytes/s"
168 + , "KiB/s"
169 , "macos"
170 , "mach_smi"
171 , 250
@@ -196,7 +196,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
196 , "system"
197 , NULL
198 , "Memory Page Faults"
199 - , "page faults/s"
199 + , "faults/s"
200 , "macos"
201 , "mach_smi"
202 , NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS
@@ -233,8 +233,8 @@ int do_macos_mach_smi(int update_every, usec_t dt) {
233 rrdset_done(st);
234 }
235 }
236 - }
237 -
236 + }
237 +
238 // --------------------------------------------------------------------
239
240 return 0;
collectors/macos.plugin/macos_sysctl.c
+2 -2
@@ -279,7 +279,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
279 , "swap"
280 , NULL
281 , "System Swap"
282 - , "MB"
282 + , "MiB"
283 , "macos"
284 , "sysctl"
285 , 201
@@ -965,7 +965,7 @@ int do_macos_sysctl(int update_every, usec_t dt) {
965 }
966 }
967 }
968 -
968 +
969 // --------------------------------------------------------------------
970
971 if (likely(do_ip6_packets || do_ip6_fragsout || do_ip6_fragsin || do_ip6_errors)) {
collectors/proc.plugin/proc_diskstats.c
+10 -10
@@ -798,7 +798,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
798 global_bcache_priority_stats_update_every = (int)config_get_number(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "bcache priority stats update every", global_bcache_priority_stats_update_every);
799
800 global_cleanup_removed_disks = config_get_boolean(CONFIG_SECTION_PLUGIN_PROC_DISKSTATS, "remove charts of removed disks" , global_cleanup_removed_disks);
801 -
801 +
802 char buffer[FILENAME_MAX + 1];
803
804 snprintfz(buffer, FILENAME_MAX, "%s%s", netdata_configured_host_prefix, "/sys/block/%s");
@@ -960,7 +960,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
960 , family
961 , "disk.io"
962 , "Disk I/O Bandwidth"
963 - , "kilobytes/s"
963 + , "KiB/s"
964 , PLUGIN_PROC_NAME
965 , PLUGIN_PROC_MODULE_DISKSTATS_NAME
966 , NETDATA_CHART_PRIO_DISK_IO
@@ -1055,7 +1055,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1055 , family
1056 , "disk.backlog"
1057 , "Disk Backlog"
1058 - , "backlog (ms)"
1058 + , "milliseconds"
1059 , PLUGIN_PROC_NAME
1060 , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1061 , NETDATA_CHART_PRIO_DISK_BACKLOG
@@ -1186,7 +1186,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1186 , family
1187 , "disk.await"
1188 , "Average Completed I/O Operation Time"
1189 - , "ms per operation"
1189 + , "milliseconds/operation"
1190 , PLUGIN_PROC_NAME
1191 , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1192 , NETDATA_CHART_PRIO_DISK_AWAIT
@@ -1217,7 +1217,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1217 , family
1218 , "disk.avgsz"
1219 , "Average Completed I/O Operation Bandwidth"
1220 - , "kilobytes per operation"
1220 + , "KiB/operation"
1221 , PLUGIN_PROC_NAME
1222 , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1223 , NETDATA_CHART_PRIO_DISK_AVGSZ
@@ -1248,7 +1248,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1248 , family
1249 , "disk.svctm"
1250 , "Average Service Time"
1251 - , "ms per operation"
1251 + , "milliseconds/operation"
1252 , PLUGIN_PROC_NAME
1253 , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1254 , NETDATA_CHART_PRIO_DISK_SVCTM
@@ -1385,7 +1385,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1385 , family
1386 , "disk.bcache_rates"
1387 , "BCache Rates"
1388 - , "KB/s"
1388 + , "KiB/s"
1389 , PLUGIN_PROC_NAME
1390 , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1391 , NETDATA_CHART_PRIO_BCACHE_RATES
@@ -1412,7 +1412,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1412 , family
1413 , "disk.bcache_size"
1414 , "BCache Cache Sizes"
1415 - , "MB"
1415 + , "MiB"
1416 , PLUGIN_PROC_NAME
1417 , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1418 , NETDATA_CHART_PRIO_BCACHE_SIZE
@@ -1437,7 +1437,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1437 , family
1438 , "disk.bcache_usage"
1439 , "BCache Cache Usage"
1440 - , "percent"
1440 + , "percentage"
1441 , PLUGIN_PROC_NAME
1442 , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1443 , NETDATA_CHART_PRIO_BCACHE_USAGE
@@ -1563,7 +1563,7 @@ int do_proc_diskstats(int update_every, usec_t dt) {
1563 , "disk"
1564 , NULL
1565 , "Disk I/O"
1566 - , "kilobytes/s"
1566 + , "KiB/s"
1567 , PLUGIN_PROC_NAME
1568 , PLUGIN_PROC_MODULE_DISKSTATS_NAME
1569 , NETDATA_CHART_PRIO_SYSTEM_IO
collectors/proc.plugin/proc_mdstat.c
+2 -2
@@ -573,10 +573,10 @@ int do_proc_mdstat(int update_every, usec_t dt) {
573 "mdstat"
574 , id
575 , NULL
576 - , family
576 + , family
577 , "md.rate"
578 , "Operation Speed"
579 - , "KB/s"
579 + , "KiB/s"
580 , PLUGIN_PROC_NAME
581 , PLUGIN_PROC_MODULE_MDSTAT_NAME
582 , NETDATA_CHART_PRIO_MDSTAT_SPEED + raid_idx * 10
collectors/proc.plugin/proc_meminfo.c
+10 -10
@@ -162,7 +162,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
162 , "ram"
163 , NULL
164 , "System RAM"
165 - , "MB"
165 + , "MiB"
166 , PLUGIN_PROC_NAME
167 , PLUGIN_PROC_MODULE_MEMINFO_NAME
168 , NETDATA_CHART_PRIO_SYSTEM_RAM
@@ -197,7 +197,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
197 , "system"
198 , NULL
199 , "Available RAM for applications"
200 - , "MB"
200 + , "MiB"
201 , PLUGIN_PROC_NAME
202 , PLUGIN_PROC_MODULE_MEMINFO_NAME
203 , NETDATA_CHART_PRIO_MEM_SYSTEM_AVAILABLE
@@ -233,7 +233,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
233 , "swap"
234 , NULL
235 , "System Swap"
236 - , "MB"
236 + , "MiB"
237 , PLUGIN_PROC_NAME
238 , PLUGIN_PROC_MODULE_MEMINFO_NAME
239 , NETDATA_CHART_PRIO_SYSTEM_SWAP
@@ -270,7 +270,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
270 , "ecc"
271 , NULL
272 , "Corrupted Memory, detected by ECC"
273 - , "MB"
273 + , "MiB"
274 , PLUGIN_PROC_NAME
275 , PLUGIN_PROC_MODULE_MEMINFO_NAME
276 , NETDATA_CHART_PRIO_MEM_HW
@@ -303,7 +303,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
303 , "system"
304 , NULL
305 , "Committed (Allocated) Memory"
306 - , "MB"
306 + , "MiB"
307 , PLUGIN_PROC_NAME
308 , PLUGIN_PROC_MODULE_MEMINFO_NAME
309 , NETDATA_CHART_PRIO_MEM_SYSTEM_COMMITTED
@@ -336,7 +336,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
336 , "kernel"
337 , NULL
338 , "Writeback Memory"
339 - , "MB"
339 + , "MiB"
340 , PLUGIN_PROC_NAME
341 , PLUGIN_PROC_MODULE_MEMINFO_NAME
342 , NETDATA_CHART_PRIO_MEM_KERNEL
@@ -376,7 +376,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
376 , "kernel"
377 , NULL
378 , "Memory Used by Kernel"
379 - , "MB"
379 + , "MiB"
380 , PLUGIN_PROC_NAME
381 , PLUGIN_PROC_MODULE_MEMINFO_NAME
382 , NETDATA_CHART_PRIO_MEM_KERNEL + 1
@@ -415,7 +415,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
415 , "slab"
416 , NULL
417 , "Reclaimable Kernel Memory"
418 - , "MB"
418 + , "MiB"
419 , PLUGIN_PROC_NAME
420 , PLUGIN_PROC_MODULE_MEMINFO_NAME
421 , NETDATA_CHART_PRIO_MEM_SLAB
@@ -452,7 +452,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
452 , "hugepages"
453 , NULL
454 , "Dedicated HugePages Memory"
455 - , "MB"
455 + , "MiB"
456 , PLUGIN_PROC_NAME
457 , PLUGIN_PROC_MODULE_MEMINFO_NAME
458 , NETDATA_CHART_PRIO_MEM_HUGEPAGES + 1
@@ -493,7 +493,7 @@ int do_proc_meminfo(int update_every, usec_t dt) {
493 , "hugepages"
494 , NULL
495 , "Transparent HugePages Memory"
496 - , "MB"
496 + , "MiB"
497 , PLUGIN_PROC_NAME
498 , PLUGIN_PROC_MODULE_MEMINFO_NAME
499 , NETDATA_CHART_PRIO_MEM_HUGEPAGES
collectors/proc.plugin/proc_net_rpc_nfsd.c
+1 -1
@@ -657,7 +657,7 @@ int do_proc_net_rpc_nfsd(int update_every, usec_t dt) {
657 , "threads"
658 , NULL
659 , "NFS Server Threads Full Count"
660 - , "ops/s"
660 + , "events"
661 , PLUGIN_PROC_NAME
662 , PLUGIN_PROC_MODULE_NFSD_NAME
663 , NETDATA_CHART_PRIO_NFSD_THREADS_FULLCNT
collectors/proc.plugin/proc_net_sockstat.c
+3 -3
@@ -305,7 +305,7 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
305 , "tcp"
306 , NULL
307 , "IPv4 TCP Sockets Memory"
308 - , "KB"
308 + , "KiB"
309 , PLUGIN_PROC_NAME
310 , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
311 , NETDATA_CHART_PRIO_IPV4_TCP_MEM
@@ -369,7 +369,7 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
369 , "udp"
370 , NULL
371 , "IPv4 UDP Sockets Memory"
372 - , "KB"
372 + , "KiB"
373 , PLUGIN_PROC_NAME
374 , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
375 , NETDATA_CHART_PRIO_IPV4_UDP_MEM
@@ -497,7 +497,7 @@ int do_proc_net_sockstat(int update_every, usec_t dt) {
497 , "fragments"
498 , NULL
499 , "IPv4 FRAG Sockets Memory"
500 - , "KB"
500 + , "KiB"
501 , PLUGIN_PROC_NAME
502 , PLUGIN_PROC_MODULE_NET_SOCKSTAT_NAME
503 , NETDATA_CHART_PRIO_IPV4_FRAGMENTS_MEM
collectors/proc.plugin/proc_net_stat_synproxy.c
+1 -1
@@ -101,7 +101,7 @@ int do_proc_net_stat_synproxy(int update_every, usec_t dt) {
101 , RRD_TYPE_NET_STAT_SYNPROXY
102 , NULL
103 , "SYNPROXY SYN Packets received"
104 - , "SYN/s"
104 + , "packets/s"
105 , PLUGIN_PROC_NAME
106 , PLUGIN_PROC_MODULE_SYNPROXY_NAME
107 , NETDATA_CHART_PRIO_SYNPROXY_SYN_RECEIVED
collectors/proc.plugin/proc_stat.c
+2 -2
@@ -1000,8 +1000,8 @@ int do_proc_stat(int update_every, usec_t dt) {
1000 , NULL
1001 , "cpuidle"
1002 , "cpuidle.cpuidle"
1003 - , "C-state residency"
1004 - , "time%"
1003 + , "C-state residency time"
1004 + , "percentage"
1005 , PLUGIN_PROC_NAME
1006 , PLUGIN_PROC_MODULE_STAT_NAME
1007 , NETDATA_CHART_PRIO_CPUIDLE + core
collectors/proc.plugin/proc_vmstat.c
+3 -3
@@ -105,7 +105,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
105 , "swap"
106 , NULL
107 , "Swap I/O"
108 - , "kilobytes/s"
108 + , "KiB/s"
109 , PLUGIN_PROC_NAME
110 , PLUGIN_PROC_MODULE_VMSTAT_NAME
111 , NETDATA_CHART_PRIO_SYSTEM_SWAPIO
@@ -137,7 +137,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
137 , "disk"
138 , NULL
139 , "Memory Paged from/to disk"
140 - , "kilobytes/s"
140 + , "KiB/s"
141 , PLUGIN_PROC_NAME
142 , PLUGIN_PROC_MODULE_VMSTAT_NAME
143 , NETDATA_CHART_PRIO_SYSTEM_PGPGIO
@@ -169,7 +169,7 @@ int do_proc_vmstat(int update_every, usec_t dt) {
169 , "system"
170 , NULL
171 , "Memory Page Faults"
172 - , "page faults/s"
172 + , "faults/s"
173 , PLUGIN_PROC_NAME
174 , PLUGIN_PROC_MODULE_VMSTAT_NAME
175 , NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS
collectors/proc.plugin/sys_fs_btrfs.c
+4 -4
@@ -558,7 +558,7 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
558 , node->label
559 , "btrfs.disk"
560 , title
561 - , "MB"
561 + , "MiB"
562 , PLUGIN_PROC_NAME
563 , PLUGIN_PROC_MODULE_BTRFS_NAME
564 , NETDATA_CHART_PRIO_BTRFS_DISK
@@ -614,7 +614,7 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
614 , node->label
615 , "btrfs.data"
616 , title
617 - , "MB"
617 + , "MiB"
618 , PLUGIN_PROC_NAME
619 , PLUGIN_PROC_MODULE_BTRFS_NAME
620 , NETDATA_CHART_PRIO_BTRFS_DATA
@@ -655,7 +655,7 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
655 , node->label
656 , "btrfs.metadata"
657 , title
658 - , "MB"
658 + , "MiB"
659 , PLUGIN_PROC_NAME
660 , PLUGIN_PROC_MODULE_BTRFS_NAME
661 , NETDATA_CHART_PRIO_BTRFS_METADATA
@@ -698,7 +698,7 @@ int do_sys_fs_btrfs(int update_every, usec_t dt) {
698 , node->label
699 , "btrfs.system"
700 , title
701 - , "MB"
701 + , "MiB"
702 , PLUGIN_PROC_NAME
703 , PLUGIN_PROC_MODULE_BTRFS_NAME
704 , NETDATA_CHART_PRIO_BTRFS_SYSTEM
collectors/proc.plugin/sys_kernel_mm_ksm.c
+2 -2
@@ -105,7 +105,7 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
105 , "ksm"
106 , NULL
107 , "Kernel Same Page Merging"
108 - , "MB"
108 + , "MiB"
109 , PLUGIN_PROC_NAME
110 , PLUGIN_PROC_MODULE_KSM_NAME
111 , NETDATA_CHART_PRIO_MEM_KSM
@@ -145,7 +145,7 @@ int do_sys_kernel_mm_ksm(int update_every, usec_t dt) {
145 , "ksm"
146 , NULL
147 , "Kernel Same Page Merging Savings"
148 - , "MB"
148 + , "MiB"
149 , PLUGIN_PROC_NAME
150 , PLUGIN_PROC_MODULE_KSM_NAME
151 , NETDATA_CHART_PRIO_MEM_KSM_SAVINGS
collectors/proc.plugin/zfs_common.c
+3 -3
@@ -46,7 +46,7 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
46 , ZFS_FAMILY_SIZE
47 , NULL
48 , "ZFS ARC Size"
49 - , "MB"
49 + , "MiB"
50 , plugin
51 , module
52 , NETDATA_CHART_PRIO_ZFS_ARC_SIZE
@@ -84,7 +84,7 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
84 , ZFS_FAMILY_SIZE
85 , NULL
86 , "ZFS L2 ARC Size"
87 - , "MB"
87 + , "MiB"
88 , plugin
89 , module
90 , NETDATA_CHART_PRIO_ZFS_L2_SIZE
@@ -166,7 +166,7 @@ void generate_charts_arcstats(const char *plugin, const char *module, int update
166 , ZFS_FAMILY_ACCESSES
167 , NULL
168 , "ZFS ARC L2 Read/Write Rate"
169 - , "kilobytes/s"
169 + , "KiB/s"
170 , plugin
171 , module
172 , NETDATA_CHART_PRIO_ZFS_IO
collectors/statsd.plugin/statsd.c
+1 -1
@@ -2383,7 +2383,7 @@ void *statsd_main(void *ptr) {
2383 , "statsd"
2384 , NULL
2385 , "statsd server TCP connected sockets"
2386 - , "connected"
2386 + , "sockets"
2387 , PLUGIN_STATSD_NAME
2388 , "stats"
2389 , 132016
daemon/global_statistics.c
+1 -1
@@ -382,7 +382,7 @@ void global_statistics_charts(void) {
382 , "netdata"
383 , NULL
384 , "NetData API Response Time"
385 - , "ms/request"
385 + , "milliseconds/request"
386 , "netdata"
387 , "stats"
388 , 130400
libnetdata/libnetdata.c
+1 -1
@@ -50,7 +50,7 @@ static inline void print_allocations(const char *file, const char *function, con
50 type, size
51 );
52
53 - fprintf(stderr, "%s iteration %zu MEMORY ALLOCATIONS: (%04lu@%-40.40s:%-40.40s): Allocated %zd KB (%+zd B), mmapped %zd KB (%+zd B): %s : malloc %zd (%+zd), calloc %zd (%+zd), realloc %zd (%+zd), strdup %zd (%+zd), free %zd (%+zd)\n",
53 + fprintf(stderr, "%s iteration %zu MEMORY ALLOCATIONS: (%04lu@%-40.40s:%-40.40s): Allocated %zd KiB (%+zd B), mmapped %zd KiB (%+zd B): %s : malloc %zd (%+zd), calloc %zd (%+zd), realloc %zd (%+zd), strdup %zd (%+zd), free %zd (%+zd)\n",
54 netdata_thread_tag(),
55 log_thread_memory_allocations,
56 line, file, function,
registry/registry.c
+3 -3
@@ -131,7 +131,7 @@ static inline int registry_person_url_callback_verify_machine_exists(void *entry
131 int registry_request_hello_json(RRDHOST *host, struct web_client *w) {
132 registry_json_header(host, w, "hello", REGISTRY_STATUS_OK);
133
134 - buffer_sprintf(w->response.data,
134 + buffer_sprintf(w->response.data,
135 ",\n\t\"registry\": \"%s\",\n\t\"cloud_base_url\": \"%s\"",
136 registry.registry_to_announce,
137 registry.cloud_base_url);
@@ -334,7 +334,7 @@ void registry_statistics(void) {
334 , "registry"
335 , NULL
336 , "NetData Registry Sessions"
337 - , "session"
337 + , "sessions"
338 , "registry"
339 , "stats"
340 , 131000
@@ -392,7 +392,7 @@ void registry_statistics(void) {
392 , "registry"
393 , NULL
394 , "NetData Registry Memory"
395 - , "KB"
395 + , "KiB"
396 , "registry"
397 , "stats"
398 , 131300