From 4d6f11b61feeb7bb50e12d23cabbe973b4752d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Menassa?= Date: Tue, 15 Sep 2015 12:58:51 +0200 Subject: [PATCH] [fix] mem_used_perc returns percentage of used mem --- plugins/system/ps/mem/mem_darwin.go | 2 +- plugins/system/ps/mem/mem_freebsd.go | 2 +- plugins/system/ps/mem/mem_linux.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/system/ps/mem/mem_darwin.go b/plugins/system/ps/mem/mem_darwin.go index 43da44d1d..d52046e5e 100644 --- a/plugins/system/ps/mem/mem_darwin.go +++ b/plugins/system/ps/mem/mem_darwin.go @@ -61,7 +61,7 @@ func VirtualMemory() (*VirtualMemoryStat, error) { ret.Available = ret.Free + ret.Buffers + ret.Cached ret.Used = ret.Total - ret.Free - ret.UsedPercent = float64(ret.Total-ret.Available) / float64(ret.Total) * 100.0 + ret.UsedPercent = float64(ret.Used) / float64(ret.Total) * 100.0 return ret, nil } diff --git a/plugins/system/ps/mem/mem_freebsd.go b/plugins/system/ps/mem/mem_freebsd.go index aa83a246d..4ceca9997 100644 --- a/plugins/system/ps/mem/mem_freebsd.go +++ b/plugins/system/ps/mem/mem_freebsd.go @@ -81,7 +81,7 @@ func VirtualMemory() (*VirtualMemoryStat, error) { ret.Available = ret.Free + ret.Buffers + ret.Cached ret.Used = ret.Total - ret.Free - ret.UsedPercent = float64(ret.Total-ret.Available) / float64(ret.Total) * 100.0 + ret.UsedPercent = float64(ret.Used) / float64(ret.Total) * 100.0 return ret, nil } diff --git a/plugins/system/ps/mem/mem_linux.go b/plugins/system/ps/mem/mem_linux.go index 42a49a2b6..8322fe3f4 100644 --- a/plugins/system/ps/mem/mem_linux.go +++ b/plugins/system/ps/mem/mem_linux.go @@ -45,7 +45,7 @@ func VirtualMemory() (*VirtualMemoryStat, error) { } ret.Available = ret.Free + ret.Buffers + ret.Cached ret.Used = ret.Total - ret.Free - ret.UsedPercent = float64(ret.Total-ret.Available) / float64(ret.Total) * 100.0 + ret.UsedPercent = float64(ret.Used) / float64(ret.Total) * 100.0 return ret, nil } @@ -63,7 +63,7 @@ func SwapMemory() (*SwapMemoryStat, error) { ret.Used = ret.Total - ret.Free //check Infinity if ret.Total != 0 { - ret.UsedPercent = float64(ret.Total-ret.Free) / float64(ret.Total) * 100.0 + ret.UsedPercent = float64(ret.Used) / float64(ret.Total) * 100.0 } else { ret.UsedPercent = 0 }