add global measurment for autoupdater

FreifunkBremen · Nov 8, 2017 · 529e347 · 529e347
1 parent de92339
commit 529e347
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 11 deletions.
diff --git a/database/influxdb/database.go b/database/influxdb/database.go
@@ -12,13 +12,14 @@ import (
 )
 
 const (
-	MeasurementLink            = "link"     // Measurement for per-link statistics
-	MeasurementNode            = "node"     // Measurement for per-node statistics
-	MeasurementGlobal          = "global"   // Measurement for summarized global statistics
-	CounterMeasurementFirmware = "firmware" // Measurement for firmware statistics
-	CounterMeasurementModel    = "model"    // Measurement for model statistics
-	batchMaxSize               = 500
-	batchTimeout               = 5 * time.Second
+	MeasurementLink               = "link"        // Measurement for per-link statistics
+	MeasurementNode               = "node"        // Measurement for per-node statistics
+	MeasurementGlobal             = "global"      // Measurement for summarized global statistics
+	CounterMeasurementFirmware    = "firmware"    // Measurement for firmware statistics
+	CounterMeasurementModel       = "model"       // Measurement for model statistics
+	CounterMeasurementAutoupdater = "autoupdater" // Measurement for autoupdater
+	batchMaxSize                  = 500
+	batchTimeout                  = 5 * time.Second
 )
 
 type Connection struct {

diff --git a/database/influxdb/global.go b/database/influxdb/global.go
@@ -12,6 +12,7 @@ func (conn *Connection) InsertGlobals(stats *runtime.GlobalStats, time time.Time
 	conn.addPoint(MeasurementGlobal, nil, GlobalStatsFields(stats), time)
 	conn.addCounterMap(CounterMeasurementModel, stats.Models, time)
 	conn.addCounterMap(CounterMeasurementFirmware, stats.Firmwares, time)
+	conn.addCounterMap(CounterMeasurementAutoupdater, stats.Autoupdater, time)
 }
 
 // GlobalStatsFields returns fields for InfluxDB

diff --git a/database/influxdb/global_test.go b/database/influxdb/global_test.go
@@ -37,6 +37,8 @@ func createTestNodes() *runtime.Nodes {
 		},
 	}
 	nodeData.Nodeinfo.Software.Firmware.Release = "2016.1.6+entenhausen1"
+	nodeData.Nodeinfo.Software.Autoupdater.Enabled = true
+	nodeData.Nodeinfo.Software.Autoupdater.Branch = "stable"
 	nodes.AddNode(nodeData)
 
 	nodes.AddNode(&runtime.Node{

diff --git a/runtime/stats.go b/runtime/stats.go
@@ -1,5 +1,7 @@
 package runtime
 
+const DISABLED_AUTOUPDATER = "disabled"
+
 // CounterMap to manage multiple values
 type CounterMap map[string]uint32
 
@@ -12,15 +14,17 @@ type GlobalStats struct {
 	Gateways      uint32
 	Nodes         uint32
 
-	Firmwares CounterMap
-	Models    CounterMap
+	Firmwares   CounterMap
+	Models      CounterMap
+	Autoupdater CounterMap
 }
 
 //NewGlobalStats returns global statistics for InfluxDB
 func NewGlobalStats(nodes *Nodes) (result *GlobalStats) {
 	result = &GlobalStats{
-		Firmwares: make(CounterMap),
-		Models:    make(CounterMap),
+		Firmwares:   make(CounterMap),
+		Models:      make(CounterMap),
+		Autoupdater: make(CounterMap),
 	}
 
 	nodes.RLock()
@@ -39,6 +43,11 @@ func NewGlobalStats(nodes *Nodes) (result *GlobalStats) {
 			if info := node.Nodeinfo; info != nil {
 				result.Models.Increment(info.Hardware.Model)
 				result.Firmwares.Increment(info.Software.Firmware.Release)
+				if info.Software.Autoupdater.Enabled {
+					result.Autoupdater.Increment(info.Software.Autoupdater.Branch)
+				} else {
+					result.Autoupdater.Increment(DISABLED_AUTOUPDATER)
+				}
 			}
 		}
 	}

diff --git a/runtime/stats_test.go b/runtime/stats_test.go
@@ -24,6 +24,10 @@ func TestGlobalStats(t *testing.T) {
 	// check firmwares
 	assert.Len(stats.Firmwares, 1)
 	assert.EqualValues(1, stats.Firmwares["2016.1.6+entenhausen1"])
+
+	// check autoupdater
+	assert.Len(stats.Autoupdater, 2)
+	assert.EqualValues(1, stats.Autoupdater["stable"])
 }
 
 func createTestNodes() *Nodes {
@@ -58,6 +62,15 @@ func createTestNodes() *Nodes {
 			Hardware: data.Hardware{
 				Model: "TP-Link 841",
 			},
+			Software: data.Software{
+				Autoupdater: struct {
+					Enabled bool   `json:"enabled,omitempty"`
+					Branch  string `json:"branch,omitempty"`
+				}{
+					Enabled: true,
+					Branch:  "stable",
+				},
+			},
 		},
 	})