diff options
| author | Vladimir Kobal <vlad@prokk.net> | 2018-12-17 13:20:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 13:20:51 +0200 |
| commit | 989604bada2a5d075d3025fe8a85b77cede9c586 (patch) | |
| tree | 561b478e6efc6291574f88aa81c11c928fd90f20 /collectors/macos.plugin | |
| parent | 928d4c50f6174a170318625ec69bcbfe968797c0 (diff) | |
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
Diffstat (limited to 'collectors/macos.plugin')
| -rw-r--r-- | collectors/macos.plugin/macos_fw.c | 14 | ||||
| -rw-r--r-- | collectors/macos.plugin/macos_mach_smi.c | 12 | ||||
| -rw-r--r-- | collectors/macos.plugin/macos_sysctl.c | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/collectors/macos.plugin/macos_fw.c b/collectors/macos.plugin/macos_fw.c index 5d0ba929e6..f253489a5b 100644 --- a/collectors/macos.plugin/macos_fw.c +++ b/collectors/macos.plugin/macos_fw.c @@ -154,7 +154,7 @@ int do_macos_iokit(int update_every, usec_t dt) { , diskstat.name , "disk.io" , "Disk I/O Bandwidth" - , "kilobytes/s" + , "KiB/s" , "macos" , "iokit" , 2000 @@ -306,7 +306,7 @@ int do_macos_iokit(int update_every, usec_t dt) { , diskstat.name , "disk.await" , "Average Completed I/O Operation Time" - , "ms per operation" + , "milliseconds/operation" , "macos" , "iokit" , 2005 @@ -337,7 +337,7 @@ int do_macos_iokit(int update_every, usec_t dt) { , diskstat.name , "disk.avgsz" , "Average Completed I/O Operation Bandwidth" - , "kilobytes per operation" + , "KiB/operation" , "macos" , "iokit" , 2006 @@ -368,7 +368,7 @@ int do_macos_iokit(int update_every, usec_t dt) { , diskstat.name , "disk.svctm" , "Average Service Time" - , "ms per operation" + , "milliseconds/operation" , "macos" , "iokit" , 2007 @@ -410,7 +410,7 @@ int do_macos_iokit(int update_every, usec_t dt) { , "disk" , NULL , "Disk I/O" - , "kilobytes/s" + , "KiB/s" , "macos" , "iokit" , 150 @@ -463,7 +463,7 @@ int do_macos_iokit(int update_every, usec_t dt) { , mntbuf[i].f_mntonname , "disk.space" , title - , "GB" + , "GiB" , "macos" , "iokit" , 2023 @@ -496,7 +496,7 @@ int do_macos_iokit(int update_every, usec_t dt) { , mntbuf[i].f_mntonname , "disk.inodes" , title - , "Inodes" + , "inodes" , "macos" , "iokit" , 2024 diff --git a/collectors/macos.plugin/macos_mach_smi.c b/collectors/macos.plugin/macos_mach_smi.c index 1c43d624c6..800b2ce56b 100644 --- a/collectors/macos.plugin/macos_mach_smi.c +++ b/collectors/macos.plugin/macos_mach_smi.c @@ -90,7 +90,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) { } // -------------------------------------------------------------------- - + if (likely(do_ram || do_swapio || do_pgfaults)) { #if (defined __MAC_OS_X_VERSION_MIN_REQUIRED && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060) count = sizeof(vm_statistics64_data_t); @@ -118,7 +118,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) { , "ram" , NULL , "System RAM" - , "MB" + , "MiB" , "macos" , "mach_smi" , 200 @@ -165,7 +165,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) { , "swap" , NULL , "Swap I/O" - , "kilobytes/s" + , "KiB/s" , "macos" , "mach_smi" , 250 @@ -196,7 +196,7 @@ int do_macos_mach_smi(int update_every, usec_t dt) { , "system" , NULL , "Memory Page Faults" - , "page faults/s" + , "faults/s" , "macos" , "mach_smi" , NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS @@ -233,8 +233,8 @@ int do_macos_mach_smi(int update_every, usec_t dt) { rrdset_done(st); } } - } - + } + // -------------------------------------------------------------------- return 0; diff --git a/collectors/macos.plugin/macos_sysctl.c b/collectors/macos.plugin/macos_sysctl.c index 6b443c04a3..a8af72e694 100644 --- a/collectors/macos.plugin/macos_sysctl.c +++ b/collectors/macos.plugin/macos_sysctl.c @@ -279,7 +279,7 @@ int do_macos_sysctl(int update_every, usec_t dt) { , "swap" , NULL , "System Swap" - , "MB" + , "MiB" , "macos" , "sysctl" , 201 @@ -965,7 +965,7 @@ int do_macos_sysctl(int update_every, usec_t dt) { } } } - + // -------------------------------------------------------------------- if (likely(do_ip6_packets || do_ip6_fragsout || do_ip6_fragsin || do_ip6_errors)) { |