Freifunk-Troisdorf/yanic
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TASK] influxdb: add site tag to node

Browse Source
This commit is contained in:
Julian 2017-11-20 12:22:52 +01:00 committed by Geno
parent 9720835e60
commit 136b42b468
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
database/influxdb/node.go
View File

@ -49,6 +49,9 @@ func (conn *Connection) InsertNode(node *runtime.Node) {
if nodeinfo := node.Nodeinfo; nodeinfo != nil { if nodeinfo := node.Nodeinfo; nodeinfo != nil {
tags.SetString("hostname", nodeinfo.Hostname) tags.SetString("hostname", nodeinfo.Hostname)
if nodeinfo.System.SiteCode != "" {
tags.SetString("site", nodeinfo.System.SiteCode)
}
if owner := nodeinfo.Owner; owner != nil { if owner := nodeinfo.Owner; owner != nil {
tags.SetString("owner", owner.Contact) tags.SetString("owner", owner.Contact)
} }

4
database/influxdb/node_test.go
View File

@ -51,6 +51,9 @@ func TestToInflux(t *testing.T) {
Owner: &data.Owner{ Owner: &data.Owner{
Contact: "nobody", Contact: "nobody",
}, },
System: data.System{
SiteCode: "ffxx",
},
Wireless: &data.Wireless{ Wireless: &data.Wireless{
TxPower24: 3, TxPower24: 3,
Channel24: 4, Channel24: 4,
@ -128,6 +131,7 @@ func TestToInflux(t *testing.T) {
assert.EqualValues("deadbeef", tags["nodeid"]) assert.EqualValues("deadbeef", tags["nodeid"])
assert.EqualValues("nobody", tags["owner"]) assert.EqualValues("nobody", tags["owner"])
assert.EqualValues("testing", tags["autoupdater"]) assert.EqualValues("testing", tags["autoupdater"])
assert.EqualValues("ffxx", tags["site"])
assert.EqualValues(0.5, fields["load"]) assert.EqualValues(0.5, fields["load"])
assert.EqualValues(0, fields["neighbours.lldp"]) assert.EqualValues(0, fields["neighbours.lldp"])
assert.EqualValues(1, fields["neighbours.batadv"]) assert.EqualValues(1, fields["neighbours.batadv"])