Merge pull request #208 from linkernetworks/phstsai/VX-235

[Task] VX-235: Get the dpdk interface in node-exporter
linkernetworks · Aug 1, 2018 · e5b8d29 · e5b8d29
2 parents f35655f + b672316
commit e5b8d29
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 41 deletions.
diff --git a/API.md b/API.md
@@ -857,87 +857,80 @@ Response Data:
    {
     "name": "cni0",
     "default": false,
+    "dpdk": false,
     "type": "virtual",
     "pciID": ""
    },
    {
     "name": "docker0",
     "default": false,
+    "dpdk": false,
     "type": "virtual",
     "pciID": ""
    },
    {
-    "name": "enp0s8",
-    "default": false,
-    "type": "physical",
-    "pciID": "0000:00:08.0"
-   },
-   {
-    "name": "flannel.1",
-    "default": false,
-    "type": "virtual",
-    "pciID": ""
-   },
-   {
-    "name": "lo",
+    "name": "dpdk0",
     "default": false,
+    "dpdk": true,
     "type": "virtual",
-    "pciID": ""
+    "pciID": "0000:00:11.0"
    },
    {
-    "name": "veth0756b817",
+    "name": "dpdk1",
     "default": false,
+    "dpdk": true,
     "type": "virtual",
-    "pciID": ""
+    "pciID": "0000:00:12.0"
    },
    {
-    "name": "veth0ee29e7",
+    "name": "enp0s10",
     "default": false,
-    "type": "virtual",
-    "pciID": ""
+    "dpdk": false,
+    "type": "physical",
+    "pciID": "0000:00:0a.0"
    },
    {
-    "name": "veth1fd22c92",
+    "name": "enp0s16",
     "default": false,
-    "type": "virtual",
-    "pciID": ""
+    "dpdk": false,
+    "type": "physical",
+    "pciID": "0000:00:10.0"
    },
    {
-    "name": "veth22ed2ac7",
+    "name": "enp0s8",
     "default": false,
-    "type": "virtual",
-    "pciID": ""
+    "dpdk": false,
+    "type": "physical",
+    "pciID": "0000:00:08.0"
    },
    {
-    "name": "veth256ca549",
+    "name": "enp0s9",
     "default": false,
-    "type": "virtual",
-    "pciID": ""
+    "dpdk": false,
+    "type": "physical",
+    "pciID": "0000:00:09.0"
    },
    {
-    "name": "veth7da58df2",
+    "name": "flannel.1",
     "default": false,
+    "dpdk": false,
     "type": "virtual",
     "pciID": ""
    },
    {
-    "name": "vethbd37bcbc",
+    "name": "lo",
     "default": false,
+    "dpdk": false,
     "type": "virtual",
     "pciID": ""
    },
    {
-    "name": "vethddeea13c",
+    "name": "veth67bb7a60",
     "default": false,
+    "dpdk": false,
     "type": "virtual",
     "pciID": ""
-   },
-   {
-    "name": "enp0s3",
-    "default": true,
-    "type": "physical",
-    "pciID": "0000:00:03.0"
-   }
+   } ...
   ]
  }
 ```
@@ -1002,6 +995,11 @@ Response Data:
   ],
   "nics": {
    "eth0": {
+    "default": false,
+    "dpdk": false,
+    "type": "virtual",
+    "ip": "10.244.0.1/24",
+    "pciID": "",
     "nicNetworkTraffic": {
      "receiveBytesTotal": [
       {

diff --git a/deploy/helm/apps/charts/prometheus/charts/node-exporter/values.yaml b/deploy/helm/apps/charts/prometheus/charts/node-exporter/values.yaml
@@ -1,2 +1,2 @@
 image:
-  tag: latest
+  tag: 1.0.0
diff --git a/deploy/helm/apps/charts/prometheus/values.yaml b/deploy/helm/apps/charts/prometheus/values.yaml
@@ -22,5 +22,5 @@ kube-state-metrics:
     tag: develop
 node-exporter:
   image:
-    tag: develop
+    tag: 1.0.0
 
diff --git a/deploy/kubernetes/apps/monitoring/node-exporter/node-exporter.yaml b/deploy/kubernetes/apps/monitoring/node-exporter/node-exporter.yaml
@@ -16,7 +16,7 @@ spec:
       serviceAccountName: prometheus
       containers:
       - name:  node-exporter
-        image: sdnvortex/node-exporter:latest
+        image: sdnvortex/node-exporter:1.0.0
         ports:
           - name: http-metrics
             containerPort: 9100

diff --git a/src/entity/metrics_node.go b/src/entity/metrics_node.go
@@ -19,6 +19,7 @@ type NICNetworkTrafficMetrics struct {
 // NICMetrics is the structure for NIC metrics
 type NICMetrics struct {
 	Default           bool                     `json:"default"`
+	DPDK              bool                     `json:"dpdk"`
 	Type              string                   `json:"type"`
 	IP                string                   `json:"ip"`
 	PCIID             string                   `json:"pciID"`
@@ -29,6 +30,7 @@ type NICMetrics struct {
 type NICOverviewMetrics struct {
 	Name    string `json:"name"`
 	Default bool   `json:"default"`
+	DPDK    bool   `json:"dpdk"`
 	Type    string `json:"type"`
 	PCIID   string `json:"pciID"`
 }

diff --git a/src/prometheuscontroller/controller.go b/src/prometheuscontroller/controller.go
@@ -137,6 +137,11 @@ func ListNodeNICs(sp *serviceprovider.Container, id string) (entity.NodeNICsMetr
 			return nicList, err
 		}
 		nic.Default = defaultValue
+		dpdkValue, err := strconv.ParseBool(string(result.Metric["dpdk"]))
+		if err != nil {
+			return nicList, err
+		}
+		nic.DPDK = dpdkValue
 
 		nicList.NICs = append(nicList.NICs, nic)
 	}
@@ -588,6 +593,11 @@ func GetNode(sp *serviceprovider.Container, id string) (entity.NodeMetrics, erro
 				return node, err
 			}
 			nic.Default = defaultValue
+			dpdkValue, err := strconv.ParseBool(string(result.Metric["dpdk"]))
+			if err != nil {
+				return node, err
+			}
+			nic.DPDK = dpdkValue
 			nic.Type = string(result.Metric["type"])
 			nic.IP = string(result.Metric["ip_address"])
 			nic.PCIID = string(result.Metric["pci_id"])