Merge pull request #104 from linkernetworks/phstsai/pciID

DEV: Add pci id column
linkernetworks · Jul 16, 2018 · 1b9319b · 1b9319b
2 parents 816c364 + afc940e
commit 1b9319b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/entity/metrics_node.go b/src/entity/metrics_node.go
@@ -11,13 +11,15 @@ type NICMetrics struct {
 	Default           string                   `json:"default"`
 	Type              string                   `json:"type"`
 	IP                string                   `json:"ip"`
+	PCIID             string                   `json:"pciID"`
 	NICNetworkTraffic NICNetworkTrafficMetrics `json:"nicNetworkTraffic"`
 }
 
 type NICOverviewMetrics struct {
 	Name    string `json:"name"`
 	Default string `json:"default"`
 	Type    string `json:"type"`
+	PCIID   string `json:"pciID"`
 }
 
 type NodeResourceMetrics struct {

diff --git a/src/prometheuscontroller/expression.go b/src/prometheuscontroller/expression.go
@@ -38,6 +38,7 @@ func ListNodeNICs(sp *serviceprovider.Container, id string) (entity.NodeNICsMetr
 		nic.Name = string(result.Metric["device"])
 		nic.Default = string(result.Metric["default"])
 		nic.Type = string(result.Metric["type"])
+		nic.PCIID = string(result.Metric["pci_id"])
 		nicList.NICs = append(nicList.NICs, nic)
 	}
 
@@ -358,6 +359,7 @@ func GetNode(sp *serviceprovider.Container, id string) (entity.NodeMetrics, erro
 			nic.Default = string(result.Metric["default"])
 			nic.Type = string(result.Metric["type"])
 			nic.IP = string(result.Metric["ip_address"])
+			nic.PCIID = string(result.Metric["pci_id"])
 			nic.NICNetworkTraffic = entity.NICNetworkTrafficMetrics{}
 			node.NICs[string(result.Metric["device"])] = nic