forked from kubernetes/kubernetes
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request kubernetes#50396 from bobbypage/stats
Automatic merge from submit-queue (batch tested with PRs 52168, 48939, 51889, 52051, 50396). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Add Windows Server Containers Stats and Metrics to Kubelet **What this PR does / why we need it**: This PR implements stats for Windows Server Containers. This adds the ability to monitor Windows Server containers via the existing stats/summary endpoint inside the kubelet. Windows metrics can now be ingested into heapster and monitored using existing tools (like Grafana). Previously, the /stats/summary api would consistently crash the kubelet on Windows server containers. This PR implements a new package "winstats" which reads windows server metrics from a combination of windows specific perf counters as well as docker stats. The "winstats" package exports functions that return CAdvisor data structures, which the existing summary api can read. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes kubernetes#49398 This PR addresses my plan to implement windows server container stats kubernetes#49398 . **Release note**: ```release-note Add monitoring of Windows Server containers metrics in the kubelet via the stats/summary endpoint. ```
- Loading branch information
Showing
50 changed files
with
11,149 additions
and
4 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
package(default_visibility = ["//visibility:public"]) | ||
|
||
licenses(["notice"]) | ||
|
||
filegroup( | ||
name = "package-srcs", | ||
srcs = glob(["**"]), | ||
tags = ["automanaged"], | ||
visibility = ["//visibility:private"], | ||
) | ||
|
||
filegroup( | ||
name = "all-srcs", | ||
srcs = [":package-srcs"], | ||
tags = ["automanaged"], | ||
) | ||
|
||
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") | ||
|
||
go_library( | ||
name = "go_default_library", | ||
srcs = [ | ||
"winstats.go", | ||
] + select({ | ||
"@io_bazel_rules_go//go/platform:windows_amd64": [ | ||
"perfcounter_nodestats.go", | ||
"perfcounters.go", | ||
], | ||
"//conditions:default": [], | ||
}), | ||
deps = [ | ||
"//vendor/github.com/google/cadvisor/info/v1:go_default_library", | ||
"//vendor/github.com/google/cadvisor/info/v2:go_default_library", | ||
] + select({ | ||
"@io_bazel_rules_go//go/platform:windows_amd64": [ | ||
"//vendor/github.com/golang/glog:go_default_library", | ||
"//vendor/github.com/lxn/win:go_default_library", | ||
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", | ||
], | ||
"//conditions:default": [], | ||
}), | ||
) | ||
|
||
go_test( | ||
name = "go_default_test", | ||
srcs = ["winstats_test.go"], | ||
library = ":go_default_library", | ||
deps = [ | ||
"//vendor/github.com/google/cadvisor/info/v1:go_default_library", | ||
"//vendor/github.com/google/cadvisor/info/v2:go_default_library", | ||
"//vendor/github.com/stretchr/testify/assert:go_default_library", | ||
], | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
// +build windows | ||
|
||
/* | ||
Copyright 2017 The Kubernetes Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package winstats | ||
|
||
import ( | ||
"errors" | ||
"os" | ||
"os/exec" | ||
"runtime" | ||
"strings" | ||
"sync" | ||
"time" | ||
|
||
"github.com/golang/glog" | ||
cadvisorapi "github.com/google/cadvisor/info/v1" | ||
"github.com/lxn/win" | ||
"k8s.io/apimachinery/pkg/util/wait" | ||
) | ||
|
||
// NewPerfCounterClient creates a client using perf counters | ||
func NewPerfCounterClient() (Client, error) { | ||
return newClient(&perfCounterNodeStatsClient{}) | ||
} | ||
|
||
// perfCounterNodeStatsClient is a client that provides Windows Stats via PerfCounters | ||
type perfCounterNodeStatsClient struct { | ||
nodeMetrics | ||
mu sync.RWMutex // mu protects nodeMetrics | ||
nodeInfo | ||
} | ||
|
||
func (p *perfCounterNodeStatsClient) startMonitoring() error { | ||
memory, err := getPhysicallyInstalledSystemMemoryBytes() | ||
if err != nil { | ||
return err | ||
} | ||
|
||
version, err := exec.Command("cmd", "/C", "ver").Output() | ||
if err != nil { | ||
return err | ||
} | ||
|
||
osImageVersion := strings.TrimSpace(string(version)) | ||
kernelVersion := extractVersionNumber(osImageVersion) | ||
p.nodeInfo = nodeInfo{ | ||
kernelVersion: kernelVersion, | ||
osImageVersion: osImageVersion, | ||
memoryPhysicalCapacityBytes: memory, | ||
startTime: time.Now(), | ||
} | ||
|
||
cpuCounter, err := newPerfCounter(cpuQuery) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
memWorkingSetCounter, err := newPerfCounter(memoryPrivWorkingSetQuery) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
memCommittedBytesCounter, err := newPerfCounter(memoryCommittedBytesQuery) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
go wait.Forever(func() { | ||
p.collectMetricsData(cpuCounter, memWorkingSetCounter, memCommittedBytesCounter) | ||
}, perfCounterUpdatePeriod) | ||
|
||
return nil | ||
} | ||
|
||
func (p *perfCounterNodeStatsClient) getMachineInfo() (*cadvisorapi.MachineInfo, error) { | ||
hostname, err := os.Hostname() | ||
if err != nil { | ||
return nil, err | ||
} | ||
|
||
return &cadvisorapi.MachineInfo{ | ||
NumCores: runtime.NumCPU(), | ||
MemoryCapacity: p.nodeInfo.memoryPhysicalCapacityBytes, | ||
MachineID: hostname, | ||
}, nil | ||
} | ||
|
||
func (p *perfCounterNodeStatsClient) getVersionInfo() (*cadvisorapi.VersionInfo, error) { | ||
return &cadvisorapi.VersionInfo{ | ||
KernelVersion: p.nodeInfo.kernelVersion, | ||
ContainerOsVersion: p.nodeInfo.osImageVersion, | ||
}, nil | ||
} | ||
|
||
func (p *perfCounterNodeStatsClient) getNodeMetrics() (nodeMetrics, error) { | ||
p.mu.RLock() | ||
defer p.mu.RUnlock() | ||
return p.nodeMetrics, nil | ||
} | ||
|
||
func (p *perfCounterNodeStatsClient) getNodeInfo() nodeInfo { | ||
return p.nodeInfo | ||
} | ||
|
||
func (p *perfCounterNodeStatsClient) collectMetricsData(cpuCounter, memWorkingSetCounter, memCommittedBytesCounter *perfCounter) { | ||
cpuValue, err := cpuCounter.getData() | ||
if err != nil { | ||
glog.Errorf("Unable to get cpu perf counter data; err: %v", err) | ||
return | ||
} | ||
|
||
memWorkingSetValue, err := memWorkingSetCounter.getData() | ||
if err != nil { | ||
glog.Errorf("Unable to get memWorkingSet perf counter data; err: %v", err) | ||
return | ||
} | ||
|
||
memCommittedBytesValue, err := memCommittedBytesCounter.getData() | ||
if err != nil { | ||
glog.Errorf("Unable to get memCommittedBytes perf counter data; err: %v", err) | ||
return | ||
} | ||
|
||
p.mu.Lock() | ||
defer p.mu.Unlock() | ||
p.nodeMetrics = nodeMetrics{ | ||
cpuUsageCoreNanoSeconds: p.convertCPUValue(cpuValue), | ||
memoryPrivWorkingSetBytes: memWorkingSetValue, | ||
memoryCommittedBytes: memCommittedBytesValue, | ||
timeStamp: time.Now(), | ||
} | ||
} | ||
|
||
func (p *perfCounterNodeStatsClient) convertCPUValue(cpuValue uint64) uint64 { | ||
cpuCores := runtime.NumCPU() | ||
// This converts perf counter data which is cpu percentage for all cores into nanoseconds. | ||
// The formula is (cpuPercentage / 100.0) * #cores * 1e+9 (nano seconds). More info here: | ||
// https://github.com/kubernetes/heapster/issues/650 | ||
newValue := p.nodeMetrics.cpuUsageCoreNanoSeconds + uint64((float64(cpuValue)/100.0)*float64(cpuCores)*1e9) | ||
return newValue | ||
} | ||
|
||
func getPhysicallyInstalledSystemMemoryBytes() (uint64, error) { | ||
var physicalMemoryKiloBytes uint64 | ||
|
||
if ok := win.GetPhysicallyInstalledSystemMemory(&physicalMemoryKiloBytes); !ok { | ||
return 0, errors.New("unable to read physical memory") | ||
} | ||
|
||
return physicalMemoryKiloBytes * 1024, nil // convert kilobytes to bytes | ||
} |
Oops, something went wrong.