feat(data): handle gluon target information

Author: herbetom

config_example.toml

@@ -213,7 +213,7 @@ password = ""
 # Tagging of the data (optional)
 [database.connection.influxdb.tags]
 # Tags used by Yanic would override the tags from this config
-# nodeid, hostname, owner, model, firmware_base, firmware_release,frequency11g and frequency11a are tags which are already used
+# nodeid, hostname, owner, model, firmware_base, firmware_release, firmware_target, firmware_subtarget, firmware_image_name, frequency11g and frequency11a are tags which are already used
 #tagname1 = "tagvalue 1"
 # some useful e.g.:
 #system   = "productive"
@@ -255,7 +255,7 @@ global = "yanic-persistent"
 # Tagging of the data (optional)
 [database.connection.influxdb2.tags]
 # Tags used by Yanic would override the tags from this config
-# nodeid, hostname, owner, model, firmware_base, firmware_release,frequency11g and frequency11a are tags which are already used
+# nodeid, hostname, owner, model, firmware_base, firmware_release, firmware_target, firmware_subtarget, firmware_image_name, frequency11g and frequency11a are tags which are already used
 #tagname1 = "tagvalue 1"
 # some useful e.g.:
 #system   = "productive"

data/nodeinfo.go

@@ -75,8 +75,11 @@ type Software struct {
 		PublicKey string `json:"public_key,omitempty"`
 	} `json:"fastd,omitempty"`
 	Firmware *struct {
-		Base    string `json:"base,omitempty"`
-		Release string `json:"release,omitempty"`
+		Base      string `json:"base,omitempty"`
+		Release   string `json:"release,omitempty"`
+		Target    string `json:"target,omitempty"`
+		Subtarget string `json:"subtarget,omitempty"`
+		ImageName string `json:"image_name,omitempty"`
 	} `json:"firmware,omitempty"`
 	StatusPage *struct {
 		API int `json:"api"`

data/nodeinfo_test.go

@@ -34,6 +34,9 @@ func TestNodeinfo(t *testing.T) {
 
 	assert.Equal("gluon-v2016.1.2", obj.Software.Firmware.Base)
 	assert.Equal("2016.1.2+bremen1", obj.Software.Firmware.Release)
+	assert.Equal("mpc85xx", obj.Software.Firmware.Target)
+	assert.Equal("p1010", obj.Software.Firmware.Subtarget)
+	assert.Equal("tp-link-tl-wdr4900-v1", obj.Software.Firmware.ImageName)
 
 	assert.Equal("TP-Link TL-WDR4900 v1", obj.Hardware.Model)
 }

data/testdata/nodeinfo.json

@@ -14,7 +14,10 @@
     },
     "firmware": {
       "base": "gluon-v2016.1.2",
-      "release": "2016.1.2+bremen1"
+      "release": "2016.1.2+bremen1",
+      "target": "mpc85xx",
+      "subtarget": "p1010",
+      "image_name": "tp-link-tl-wdr4900-v1"
     },
     "status-page": {
       "api": 1

database/influxdb/global_test.go

@@ -135,8 +135,11 @@ func createTestNodes() *runtime.Nodes {
 		},
 	}
 	nodeData.Nodeinfo.Software.Firmware = &struct {
-		Base    string `json:"base,omitempty"`
-		Release string `json:"release,omitempty"`
+		Base      string `json:"base,omitempty"`
+		Release   string `json:"release,omitempty"`
+		Target    string `json:"target,omitempty"`
+		Subtarget string `json:"subtarget,omitempty"`
+		ImageName string `json:"image_name,omitempty"`
 	}{
 		Release: "2016.1.6+entenhausen1",
 	}

database/influxdb/node.go

@@ -84,6 +84,9 @@ func (conn *Connection) InsertNode(node *runtime.Node) {
 		if nodeinfo.Software.Firmware != nil {
 			tags.SetString("firmware_base", nodeinfo.Software.Firmware.Base)
 			tags.SetString("firmware_release", nodeinfo.Software.Firmware.Release)
+			tags.SetString("firmware_target", nodeinfo.Software.Firmware.Target)
+			tags.SetString("firmware_subtarget", nodeinfo.Software.Firmware.Subtarget)
+			tags.SetString("firmware_image_name", nodeinfo.Software.Firmware.ImageName)
 		}
 		if nodeinfo.Software.Autoupdater != nil && nodeinfo.Software.Autoupdater.Enabled {
 			tags.SetString("autoupdater", nodeinfo.Software.Autoupdater.Branch)

database/influxdb/node_test.go

@@ -118,10 +118,16 @@ func TestToInflux(t *testing.T) {
 					Enabled: false,
 				},
 				Firmware: &struct {
-					Base    string `json:"base,omitempty"`
-					Release string `json:"release,omitempty"`
+					Base      string `json:"base,omitempty"`
+					Release   string `json:"release,omitempty"`
+					Target    string `json:"target,omitempty"`
+					Subtarget string `json:"subtarget,omitempty"`
+					ImageName string `json:"image_name,omitempty"`
 				}{
 					Base: "gluon",
+					Target: "x86",
+					Subtarget: "64",
+					ImageName: "x86-64",
 				},
 			},
 		},

database/influxdb2/node.go

@@ -74,6 +74,9 @@ func (conn *Connection) InsertNode(node *runtime.Node) {
 		if nodeinfo.Software.Firmware != nil {
 			p.AddTag("firmware_base", nodeinfo.Software.Firmware.Base)
 			p.AddTag("firmware_release", nodeinfo.Software.Firmware.Release)
+			p.AddTag("firmware_target", nodeinfo.Software.Firmware.Target)
+			p.AddTag("firmware_subtarget", nodeinfo.Software.Firmware.Subtarget)
+			p.AddTag("firmware_image_name", nodeinfo.Software.Firmware.ImageName)
 		}
 		if nodeinfo.Software.Autoupdater != nil && nodeinfo.Software.Autoupdater.Enabled {
 			p.AddTag("autoupdater", nodeinfo.Software.Autoupdater.Branch)

output/geojson/geojson_test.go

@@ -86,8 +86,11 @@ func createTestNodes() *runtime.Nodes {
 		},
 	}
 	nodeData.Nodeinfo.Software.Firmware = &struct {
-		Base    string `json:"base,omitempty"`
-		Release string `json:"release,omitempty"`
+		Base      string `json:"base,omitempty"`
+		Release   string `json:"release,omitempty"`
+		Target    string `json:"target,omitempty"`
+		Subtarget string `json:"subtarget,omitempty"`
+		ImageName string `json:"image_name,omitempty"`
 	}{
 		Release: "2019.1~exp42",
 	}

output/meshviewer-ffrgb/struct.go

@@ -50,8 +50,11 @@ type Node struct {
 
 // Firmware out of software
 type Firmware struct {
-	Base    string `json:"base,omitempty"`
-	Release string `json:"release,omitempty"`
+	Base      string `json:"base,omitempty"`
+	Release   string `json:"release,omitempty"`
+	Target    string `json:"target,omitempty"`
+	Subtarget string `json:"subtarget,omitempty"`
+	ImageName string `json:"image_name,omitempty"`
 }
 
 // Autoupdater