Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bug] VX-276: Modify field name of docker version, and add Hugepages byte field #268

Merged
merged 1 commit into from
Aug 22, 2018
Merged

[Bug] VX-276: Modify field name of docker version, and add Hugepages byte field #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/entity/metrics_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand All @@ -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"`
Expand Down
8 changes: 6 additions & 2 deletions src/prometheuscontroller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down Expand Up @@ -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)
Expand All @@ -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)
}
}

Expand Down