github/node-problem-detector
1
0
Fork 0
mirror of https://github.com/kubernetes/node-problem-detector.git synced 2026-08-28 01:47:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for basic system metrics for Windows.

Browse Source
This commit is contained in:
Jeremy Edwards
2021-05-10 21:58:38 +00:00
parent c7ce65ddb6
commit d4933875ed
19 changed files with 660 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/exec_test.go
+2 -2
View File
@@ -28,8 +28,8 @@ func TestExec(t *testing.T) {
if runtime.GOOS == "windows" {
cmds = [][]string{
{"powershell.exe"},
{"cmd.exe", "/C", "echo", "Hello"},
{"cmd.exe", "/K", "echo", "Wait", "forever"},
{"cmd.exe", "/C", "set", "/p", "$="},
{"cmd.exe", "/K", "set", "/p", "$="},
{"testdata/hello-world.cmd"},
{"testdata/hello-world.bat"},
{"testdata/hello-world.ps1"},
pkg/util/helpers.go
-39
View File
@@ -19,13 +19,9 @@ import (
"fmt"
"time"
"github.com/cobaugh/osrelease"
"k8s.io/node-problem-detector/pkg/types"
)
var osReleasePath = "/etc/os-release"
// GenerateConditionChangeEvent generates an event for condition change.
func GenerateConditionChangeEvent(t string, status types.ConditionStatus, reason string, timestamp time.Time) types.Event {
return types.Event{
@@ -65,38 +61,3 @@ func GetStartTime(now time.Time, uptimeDuration time.Duration, lookbackStr strin
return startTime, nil
}
// GetOSVersion retrieves the version of the current operating system.
// For example: "cos 77-12293.0.0", "ubuntu 16.04.6 LTS (Xenial Xerus)".
func GetOSVersion() (string, error) {
osReleaseMap, err := osrelease.ReadFile(osReleasePath)
if err != nil {
return "", err
}
switch osReleaseMap["ID"] {
case "cos":
return getCOSVersion(osReleaseMap), nil
case "debian":
return getDebianVersion(osReleaseMap), nil
case "ubuntu":
return getDebianVersion(osReleaseMap), nil
case "centos":
return getDebianVersion(osReleaseMap), nil
case "rhel":
return getDebianVersion(osReleaseMap), nil
default:
return "", fmt.Errorf("Unsupported ID in /etc/os-release: %q", osReleaseMap["ID"])
}
}
func getCOSVersion(osReleaseMap map[string]string) string {
// /etc/os-release syntax for COS is defined here:
// https://chromium.git.corp.google.com/chromiumos/docs/+/8edec95a297edfd8f1290f0f03a8aa35795b516b/os_config.md
return fmt.Sprintf("%s %s-%s", osReleaseMap["ID"], osReleaseMap["VERSION"], osReleaseMap["BUILD_ID"])
}
func getDebianVersion(osReleaseMap map[string]string) string {
// /etc/os-release syntax for Debian is defined here:
// https://manpages.debian.org/testing/systemd/os-release.5.en.html
return fmt.Sprintf("%s %s", osReleaseMap["ID"], osReleaseMap["VERSION"])
}
pkg/util/helpers_linux.go
+44
View File
@@ -17,10 +17,15 @@ package util
import (
"fmt"
"github.com/cobaugh/osrelease"
"syscall"
"time"
)
const (
osReleasePath = "/etc/os-release"
)
// GetUptimeDuration returns the time elapsed since last boot.
func GetUptimeDuration() (time.Duration, error) {
var info syscall.Sysinfo_t
@@ -29,3 +34,42 @@ func GetUptimeDuration() (time.Duration, error) {
}
return time.Duration(info.Uptime) * time.Second, nil
}
// GetOSVersion retrieves the version of the current operating system.
// For example: "cos 77-12293.0.0", "ubuntu 16.04.6 LTS (Xenial Xerus)".
func GetOSVersion() (string, error) {
return getOSVersion(osReleasePath)
}
func getOSVersion(osReleasePath string) (string, error) {
osReleaseMap, err := osrelease.ReadFile(osReleasePath)
if err != nil {
return "", err
}
switch osReleaseMap["ID"] {
case "cos":
return getCOSVersion(osReleaseMap), nil
case "debian":
return getDebianVersion(osReleaseMap), nil
case "ubuntu":
return getDebianVersion(osReleaseMap), nil
case "centos":
return getDebianVersion(osReleaseMap), nil
case "rhel":
return getDebianVersion(osReleaseMap), nil
default:
return "", fmt.Errorf("Unsupported ID in /etc/os-release: %q", osReleaseMap["ID"])
}
}
func getCOSVersion(osReleaseMap map[string]string) string {
// /etc/os-release syntax for COS is defined here:
// https://chromium.git.corp.google.com/chromiumos/docs/+/8edec95a297edfd8f1290f0f03a8aa35795b516b/os_config.md
return fmt.Sprintf("%s %s-%s", osReleaseMap["ID"], osReleaseMap["VERSION"], osReleaseMap["BUILD_ID"])
}
func getDebianVersion(osReleaseMap map[string]string) string {
// /etc/os-release syntax for Debian is defined here:
// https://manpages.debian.org/testing/systemd/os-release.5.en.html
return fmt.Sprintf("%s %s", osReleaseMap["ID"], osReleaseMap["VERSION"])
}
pkg/util/helpers_linux_test.go
+92
View File
@@ -0,0 +1,92 @@
/*
Copyright 2021 The Kubernetes Authors All rights reserved.
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 util
import (
"testing"
)
func TestGetOSVersionLinux(t *testing.T) {
testCases := []struct {
name string
fakeOSReleasePath string
expectedOSVersion string
expectErr bool
}{
{
name: "COS",
fakeOSReleasePath: "testdata/os-release-cos",
expectedOSVersion: "cos 77-12293.0.0",
expectErr: false,
},
{
name: "Debian",
fakeOSReleasePath: "testdata/os-release-debian",
expectedOSVersion: "debian 9 (stretch)",
expectErr: false,
},
{
name: "Ubuntu",
fakeOSReleasePath: "testdata/os-release-ubuntu",
expectedOSVersion: "ubuntu 16.04.6 LTS (Xenial Xerus)",
expectErr: false,
},
{
name: "centos",
fakeOSReleasePath: "testdata/os-release-centos",
expectedOSVersion: "centos 7 (Core)",
expectErr: false,
},
{
name: "rhel",
fakeOSReleasePath: "testdata/os-release-rhel",
expectedOSVersion: "rhel 7.7 (Maipo)",
expectErr: false,
},
{
name: "Unknown",
fakeOSReleasePath: "testdata/os-release-unknown",
expectedOSVersion: "",
expectErr: true,
},
{
name: "Empty",
fakeOSReleasePath: "testdata/os-release-empty",
expectedOSVersion: "",
expectErr: true,
},
}
for _, tt := range testCases {
tc := tt
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
osVersion, err := getOSVersion(tc.fakeOSReleasePath)
if tc.expectErr && err == nil {
t.Errorf("Expect to get error, but got no returned error.")
}
if !tc.expectErr && err != nil {
t.Errorf("Expect to get no error, but got returned error: %v", err)
}
if !tc.expectErr && osVersion != tc.expectedOSVersion {
t.Errorf("Wanted: %+v. \nGot: %+v", tc.expectedOSVersion, osVersion)
}
})
}
}
pkg/util/helpers_test.go
+5 -69
View File
@@ -137,75 +137,11 @@ func TestGetStartTime(t *testing.T) {
}
func TestGetOSVersion(t *testing.T) {
testCases := []struct {
name string
fakeOSReleasePath string
expectedOSVersion string
expectErr bool
}{
{
name: "COS",
fakeOSReleasePath: "testdata/os-release-cos",
expectedOSVersion: "cos 77-12293.0.0",
expectErr: false,
},
{
name: "Debian",
fakeOSReleasePath: "testdata/os-release-debian",
expectedOSVersion: "debian 9 (stretch)",
expectErr: false,
},
{
name: "Ubuntu",
fakeOSReleasePath: "testdata/os-release-ubuntu",
expectedOSVersion: "ubuntu 16.04.6 LTS (Xenial Xerus)",
expectErr: false,
},
{
name: "centos",
fakeOSReleasePath: "testdata/os-release-centos",
expectedOSVersion: "centos 7 (Core)",
expectErr: false,
},
{
name: "rhel",
fakeOSReleasePath: "testdata/os-release-rhel",
expectedOSVersion: "rhel 7.7 (Maipo)",
expectErr: false,
},
{
name: "Unknown",
fakeOSReleasePath: "testdata/os-release-unknown",
expectedOSVersion: "",
expectErr: true,
},
{
name: "Empty",
fakeOSReleasePath: "testdata/os-release-empty",
expectedOSVersion: "",
expectErr: true,
},
ver, err := GetOSVersion()
if err != nil {
t.Errorf("cannot get os version, %s", err)
}
for _, test := range testCases {
t.Run(test.name, func(t *testing.T) {
originalOSReleasePath := osReleasePath
defer func() {
osReleasePath = originalOSReleasePath
}()
osReleasePath = test.fakeOSReleasePath
osVersion, err := GetOSVersion()
if test.expectErr && err == nil {
t.Errorf("Expect to get error, but got no returned error.")
}
if !test.expectErr && err != nil {
t.Errorf("Expect to get no error, but got returned error: %v", err)
}
if !test.expectErr && osVersion != test.expectedOSVersion {
t.Errorf("Wanted: %+v. \nGot: %+v", test.expectedOSVersion, osVersion)
}
})
if ver == "" {
t.Errorf("GetOSVersion() should not be empty string")
}
}
pkg/util/helpers_windows.go
+27
View File
@@ -16,9 +16,12 @@ limitations under the License.
package util
import (
"fmt"
"time"
"github.com/shirou/gopsutil/host"
"golang.org/x/sys/windows"
"golang.org/x/sys/windows/registry"
)
// GetUptimeDuration returns the time elapsed since last boot.
@@ -29,3 +32,27 @@ func GetUptimeDuration() (time.Duration, error) {
}
return time.Duration(ut), nil
}
// GetOSVersion retrieves the version of the current operating system.
// For example: "windows 10.0.17763.1697 (Windows Server 2016 Datacenter)".
func GetOSVersion() (string, error) {
k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
if err != nil {
return "", err
}
defer k.Close()
productName, _, err := k.GetStringValue("ProductName")
if err != nil {
productName = "windows"
}
ubr, _, err := k.GetIntegerValue("UBR")
if err != nil {
ubr = 0
}
major, minor, build := windows.RtlGetNtVersionNumbers()
return fmt.Sprintf("windows %d.%d.%d.%d (%s)", major, minor, build, ubr, productName), nil
}