Merge pull request #268 from linkernetworks/phstsai/VX-276

[Bug] VX-276: Modify field name of docker version, and add Hugepages byte field
linkernetworks · Aug 22, 2018 · b3d00c5 · b3d00c5
2 parents 0bb00c8 + 63d72f0
commit b3d00c5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/entity/metrics_node.go b/src/entity/metrics_node.go
@@ -43,6 +43,7 @@ type NodeResourceMetrics struct {
 	MemoryLimits         float32 `json:"memoryLimits"`
 	MemoryTotalHugepages float32 `json:"memoryTotalHugepages"`
 	MemoryFreeHugepages  float32 `json:"memoryFreeHugepages"`
+	MemoryHugepageSize   float32 `json:"memoryHugepagesSize"`
 	AllocatableCPU       float32 `json:"allocatableCPU"`
 	AllocatableMemory    float32 `json:"allocatableMemory"`
 	AllocatablePods      float32 `json:"allocatablePods"`
@@ -58,7 +59,7 @@ type NodeDetailMetrics struct {
 	Status            string            `json:"status"`
 	OS                string            `json:"os"`
 	KernelVersion     string            `json:"kernelVersion"`
-	ContainerVersion  string            `json:"containerVersion"`
+	DockerVersion     string            `json:"dockerVersion"`
 	KubeproxyVersion  string            `json:"kubeproxyVersion"`
 	KubernetesVersion string            `json:"kubernetesVersion"`
 	Labels            map[string]string `json:"labels"`

diff --git a/src/prometheuscontroller/controller.go b/src/prometheuscontroller/controller.go
@@ -595,7 +595,7 @@ func GetNode(sp *serviceprovider.Container, id string) (entity.NodeMetrics, erro
 		case "kube_node_info":
 			node.Detail.Hostname = id
 			node.Detail.KernelVersion = string(result.Metric["kernel_version"])
-			node.Detail.ContainerVersion = strings.Split(string(result.Metric["container_runtime_version"]), "//")[1]
+			node.Detail.DockerVersion = strings.Split(string(result.Metric["container_runtime_version"]), "//")[1]
 			node.Detail.KubeproxyVersion = string(result.Metric["kubeproxy_version"])
 			node.Detail.OS = string(result.Metric["os_image"])
 			node.Detail.KubernetesVersion = string(result.Metric["kubelet_version"])
@@ -713,7 +713,8 @@ func GetNode(sp *serviceprovider.Container, id string) (entity.NodeMetrics, erro
 	expression = Expression{}
 	expression.Metrics = []string{
 		"node_memory_HugePages_Total",
-		"node_memory_HugePages_Free"}
+		"node_memory_HugePages_Free",
+		"node_memory_Hugepagesize_bytes"}
 	expression.QueryLabels = map[string]string{"node": id}
 
 	str = basicExpr(expression.Metrics)
@@ -730,6 +731,9 @@ func GetNode(sp *serviceprovider.Container, id string) (entity.NodeMetrics, erro
 
 		case "node_memory_HugePages_Free":
 			node.Resource.MemoryFreeHugepages = float32(result.Value)
+
+		case "node_memory_Hugepagesize_bytes":
+			node.Resource.MemoryHugepageSize = float32(result.Value)
 		}
 	}