diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-02-08 07:31:03 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-02-08 07:31:03 +0000 |
commit | 50485bedfd9818165aa1d039d0abe95a559134b7 (patch) | |
tree | 79c7b08f67edcfb0c936e7a22931653b91189b9f /collectors/proc.plugin/proc_meminfo.c | |
parent | Releasing debian version 1.11.1+dfsg-7. (diff) | |
download | netdata-50485bedfd9818165aa1d039d0abe95a559134b7.tar.xz netdata-50485bedfd9818165aa1d039d0abe95a559134b7.zip |
Merging upstream version 1.12.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'collectors/proc.plugin/proc_meminfo.c')
-rw-r--r-- | collectors/proc.plugin/proc_meminfo.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/collectors/proc.plugin/proc_meminfo.c b/collectors/proc.plugin/proc_meminfo.c index f77159ebd..ae399c440 100644 --- a/collectors/proc.plugin/proc_meminfo.c +++ b/collectors/proc.plugin/proc_meminfo.c @@ -146,7 +146,7 @@ int do_proc_meminfo(int update_every, usec_t dt) { // -------------------------------------------------------------------- // http://stackoverflow.com/questions/3019748/how-to-reliably-measure-available-memory-in-linux - unsigned long long MemCached = Cached + Slab; + unsigned long long MemCached = Cached + SReclaimable; unsigned long long MemUsed = MemTotal - MemFree - MemCached - Buffers; if(do_ram) { @@ -162,7 +162,7 @@ int do_proc_meminfo(int update_every, usec_t dt) { , "ram" , NULL , "System RAM" - , "MB" + , "MiB" , PLUGIN_PROC_NAME , PLUGIN_PROC_MODULE_MEMINFO_NAME , NETDATA_CHART_PRIO_SYSTEM_RAM @@ -197,7 +197,7 @@ int do_proc_meminfo(int update_every, usec_t dt) { , "system" , NULL , "Available RAM for applications" - , "MB" + , "MiB" , PLUGIN_PROC_NAME , PLUGIN_PROC_MODULE_MEMINFO_NAME , NETDATA_CHART_PRIO_MEM_SYSTEM_AVAILABLE @@ -233,7 +233,7 @@ int do_proc_meminfo(int update_every, usec_t dt) { , "swap" , NULL , "System Swap" - , "MB" + , "MiB" , PLUGIN_PROC_NAME , PLUGIN_PROC_MODULE_MEMINFO_NAME , NETDATA_CHART_PRIO_SYSTEM_SWAP @@ -270,7 +270,7 @@ int do_proc_meminfo(int update_every, usec_t dt) { , "ecc" , NULL , "Corrupted Memory, detected by ECC" - , "MB" + , "MiB" , PLUGIN_PROC_NAME , PLUGIN_PROC_MODULE_MEMINFO_NAME , NETDATA_CHART_PRIO_MEM_HW @@ -303,7 +303,7 @@ int do_proc_meminfo(int update_every, usec_t dt) { , "system" , NULL , "Committed (Allocated) Memory" - , "MB" + , "MiB" , PLUGIN_PROC_NAME , PLUGIN_PROC_MODULE_MEMINFO_NAME , NETDATA_CHART_PRIO_MEM_SYSTEM_COMMITTED @@ -336,7 +336,7 @@ int do_proc_meminfo(int update_every, usec_t dt) { , "kernel" , NULL , "Writeback Memory" - , "MB" + , "MiB" , PLUGIN_PROC_NAME , PLUGIN_PROC_MODULE_MEMINFO_NAME , NETDATA_CHART_PRIO_MEM_KERNEL @@ -376,7 +376,7 @@ int do_proc_meminfo(int update_every, usec_t dt) { , "kernel" , NULL , "Memory Used by Kernel" - , "MB" + , "MiB" , PLUGIN_PROC_NAME , PLUGIN_PROC_MODULE_MEMINFO_NAME , NETDATA_CHART_PRIO_MEM_KERNEL + 1 @@ -415,7 +415,7 @@ int do_proc_meminfo(int update_every, usec_t dt) { , "slab" , NULL , "Reclaimable Kernel Memory" - , "MB" + , "MiB" , PLUGIN_PROC_NAME , PLUGIN_PROC_MODULE_MEMINFO_NAME , NETDATA_CHART_PRIO_MEM_SLAB @@ -452,7 +452,7 @@ int do_proc_meminfo(int update_every, usec_t dt) { , "hugepages" , NULL , "Dedicated HugePages Memory" - , "MB" + , "MiB" , PLUGIN_PROC_NAME , PLUGIN_PROC_MODULE_MEMINFO_NAME , NETDATA_CHART_PRIO_MEM_HUGEPAGES + 1 @@ -493,7 +493,7 @@ int do_proc_meminfo(int update_every, usec_t dt) { , "hugepages" , NULL , "Transparent HugePages Memory" - , "MB" + , "MiB" , PLUGIN_PROC_NAME , PLUGIN_PROC_MODULE_MEMINFO_NAME , NETDATA_CHART_PRIO_MEM_HUGEPAGES |