From 136b42b468bff04cf75450a42e127d1cf0130476 Mon Sep 17 00:00:00 2001 From: Julian Date: Mon, 20 Nov 2017 12:22:52 +0100 Subject: [PATCH] [TASK] influxdb: add site tag to node --- database/influxdb/node.go | 3 +++ database/influxdb/node_test.go | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/database/influxdb/node.go b/database/influxdb/node.go index 1395b39..114feac 100644 --- a/database/influxdb/node.go +++ b/database/influxdb/node.go @@ -49,6 +49,9 @@ func (conn *Connection) InsertNode(node *runtime.Node) { if nodeinfo := node.Nodeinfo; nodeinfo != nil { tags.SetString("hostname", nodeinfo.Hostname) + if nodeinfo.System.SiteCode != "" { + tags.SetString("site", nodeinfo.System.SiteCode) + } if owner := nodeinfo.Owner; owner != nil { tags.SetString("owner", owner.Contact) } diff --git a/database/influxdb/node_test.go b/database/influxdb/node_test.go index dc6194b..916c6fb 100644 --- a/database/influxdb/node_test.go +++ b/database/influxdb/node_test.go @@ -51,6 +51,9 @@ func TestToInflux(t *testing.T) { Owner: &data.Owner{ Contact: "nobody", }, + System: data.System{ + SiteCode: "ffxx", + }, Wireless: &data.Wireless{ TxPower24: 3, Channel24: 4, @@ -128,6 +131,7 @@ func TestToInflux(t *testing.T) { assert.EqualValues("deadbeef", tags["nodeid"]) assert.EqualValues("nobody", tags["owner"]) assert.EqualValues("testing", tags["autoupdater"]) + assert.EqualValues("ffxx", tags["site"]) assert.EqualValues(0.5, fields["load"]) assert.EqualValues(0, fields["neighbours.lldp"]) assert.EqualValues(1, fields["neighbours.batadv"])