[BUGFIX] use available memory for usage estimation

Fix memory usage estimation following this commit: freifunk-gluon/gluon#1517
skorpy2009 · Aug 25, 2018 · 07f48ab · 07f48ab
1 parent 6815f3b
commit 07f48ab
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/data/statistics.go b/data/statistics.go
@@ -87,7 +87,8 @@ type Memory struct {
 	Cached  int64 `json:"cached"`
 	Total   int64 `json:"total"`
 	Buffers int64 `json:"buffers"`
-	Free    int64 `json:"free"`
+	Free    int64 `json:"free,omitempty"`
+	Available    int64 `json:"available,omitempty"`
 }
 
 // SwitchPort struct

diff --git a/database/graphite/node.go b/database/graphite/node.go
@@ -104,6 +104,7 @@ func (c *Connection) InsertNode(node *runtime.Node) {
 	addField("memory.cached", stats.Memory.Cached)
 	addField("memory.free", stats.Memory.Free)
 	addField("memory.total", stats.Memory.Total)
+	addField("memory.available", stats.Memory.Available)
 
 	c.addPoint(fields)
 }
diff --git a/database/influxdb/node.go b/database/influxdb/node.go
@@ -45,6 +45,7 @@ func (conn *Connection) InsertNode(node *runtime.Node) {
 		"memory.cached":  stats.Memory.Cached,
 		"memory.free":    stats.Memory.Free,
 		"memory.total":   stats.Memory.Total,
+		"memory.available":   stats.Memory.Available,
 	}
 
 	if nodeinfo := node.Nodeinfo; nodeinfo != nil {

diff --git a/output/meshviewer-ffrgb/struct.go b/output/meshviewer-ffrgb/struct.go
@@ -126,10 +126,15 @@ func NewNode(nodes *runtime.Nodes, n *runtime.Node) *Node {
 		/* The Meshviewer could not handle absolute memory output
 		 * calc the used memory as a float which 100% equal 1.0
 		 * calc is coppied from node statuspage (look discussion:
-		 * https://github.com/FreifunkBremen/yanic/issues/35)
+		 * https://github.com/FreifunkBremen/yanic/issues/35 and
+		 * https://github.com/freifunk-gluon/gluon/pull/1517)
 		 */
 		if statistic.Memory.Total > 0 {
-			usage := 1 - (float64(statistic.Memory.Free)+float64(statistic.Memory.Buffers)+float64(statistic.Memory.Cached))/float64(statistic.Memory.Total)
+			if statistic.Memory.Available > 0 {
+				usage := 1 - float64(statistic.Memory.Available)/float64(statistic.Memory.Total)
+			} else {
+				usage := 1 - (float64(stats.Memory.Free)+float64(stats.Memory.Buffers)+float64(stats.Memory.Cached))/float64(stats.Memory.Total)
+			}
 			node.MemoryUsage = &usage
 		}
 

diff --git a/output/meshviewer/node.go b/output/meshviewer/node.go
@@ -71,10 +71,15 @@ func NewStatistics(stats *data.Statistics, isOnline bool) *Statistics {
 	/* The Meshviewer could not handle absolute memory output
 	 * calc the used memory as a float which 100% equal 1.0
 	 * calc is coppied from node statuspage (look discussion:
-	 * https://github.com/FreifunkBremen/yanic/issues/35)
+	 * https://github.com/FreifunkBremen/yanic/issues/35 and
+	 * https://github.com/freifunk-gluon/gluon/pull/1517)
 	 */
 	if stats.Memory.Total > 0 {
-		usage := 1 - (float64(stats.Memory.Free)+float64(stats.Memory.Buffers)+float64(stats.Memory.Cached))/float64(stats.Memory.Total)
+		if statistic.Memory.Available > 0 {
+			usage := 1 - float64(statistic.Memory.Available)/float64(statistic.Memory.Total)
+		} else {
+			usage := 1 - (float64(stats.Memory.Free)+float64(stats.Memory.Buffers)+float64(stats.Memory.Cached))/float64(stats.Memory.Total)
+		}
 		output.MemoryUsage = &usage
 	}