Updating dependency github.com/google/cadvisor to version 6a8d614

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

vendor/github.com/google/cadvisor/machine/BUILD

@@ -5,23 +5,22 @@ go_library(
     srcs = [
         "info.go",
         "machine.go",
-        "machine_no_libipmctl.go",
         "operatingsystem_unix.go",
         "operatingsystem_windows.go",
     ],
-    cgo = True,
     importmap = "k8s.io/kubernetes/vendor/github.com/google/cadvisor/machine",
     importpath = "github.com/google/cadvisor/machine",
     visibility = ["//visibility:public"],
     deps = [
         "//vendor/github.com/google/cadvisor/fs:go_default_library",
         "//vendor/github.com/google/cadvisor/info/v1:go_default_library",
+        "//vendor/github.com/google/cadvisor/nvm:go_default_library",
         "//vendor/github.com/google/cadvisor/utils:go_default_library",
         "//vendor/github.com/google/cadvisor/utils/cloudinfo:go_default_library",
         "//vendor/github.com/google/cadvisor/utils/sysfs:go_default_library",
         "//vendor/github.com/google/cadvisor/utils/sysinfo:go_default_library",
         "//vendor/golang.org/x/sys/unix:go_default_library",
-        "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/klog/v2:go_default_library",
     ] + select({
         "@io_bazel_rules_go//go/platform:windows": [
             "//vendor/golang.org/x/sys/windows/registry:go_default_library",

vendor/github.com/google/cadvisor/machine/info.go

@@ -20,14 +20,16 @@ import (
 	"io/ioutil"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
+	"github.com/google/cadvisor/nvm"
 	"github.com/google/cadvisor/utils/cloudinfo"
 	"github.com/google/cadvisor/utils/sysfs"
 	"github.com/google/cadvisor/utils/sysinfo"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"golang.org/x/sys/unix"
 )
@@ -35,8 +37,8 @@ import (
 const hugepagesDirectory = "/sys/kernel/mm/hugepages/"
 const memoryControllerPath = "/sys/devices/system/edac/mc/"
 
-var machineIdFilePath = flag.String("machine_id_file", "/etc/machine-id,/var/lib/dbus/machine-id", "Comma-separated list of files to check for machine-id. Use the first one that exists.")
-var bootIdFilePath = flag.String("boot_id_file", "/proc/sys/kernel/random/boot_id", "Comma-separated list of files to check for boot-id. Use the first one that exists.")
+var machineIDFilePath = flag.String("machine_id_file", "/etc/machine-id,/var/lib/dbus/machine-id", "Comma-separated list of files to check for machine-id. Use the first one that exists.")
+var bootIDFilePath = flag.String("boot_id_file", "/proc/sys/kernel/random/boot_id", "Comma-separated list of files to check for boot-id. Use the first one that exists.")
 
 func getInfoFromFiles(filePaths string) string {
 	if len(filePaths) == 0 {
@@ -77,7 +79,7 @@ func Info(sysFs sysfs.SysFs, fsInfo fs.FsInfo, inHostNamespace bool) (*info.Mach
 		return nil, err
 	}
 
-	nvmInfo, err := GetNVMInfo()
+	nvmInfo, err := nvm.GetInfo()
 	if err != nil {
 		return nil, err
 	}
@@ -118,6 +120,7 @@ func Info(sysFs sysfs.SysFs, fsInfo fs.FsInfo, inHostNamespace bool) (*info.Mach
 	instanceID := realCloudInfo.GetInstanceID()
 
 	machineInfo := &info.MachineInfo{
+		Timestamp:        time.Now(),
 		NumCores:         numCores,
 		NumPhysicalCores: GetPhysicalCores(cpuinfo),
 		NumSockets:       GetSockets(cpuinfo),
@@ -129,9 +132,9 @@ func Info(sysFs sysfs.SysFs, fsInfo fs.FsInfo, inHostNamespace bool) (*info.Mach
 		DiskMap:          diskMap,
 		NetworkDevices:   netDevices,
 		Topology:         topology,
-		MachineID:        getInfoFromFiles(filepath.Join(rootFs, *machineIdFilePath)),
+		MachineID:        getInfoFromFiles(filepath.Join(rootFs, *machineIDFilePath)),
 		SystemUUID:       systemUUID,
-		BootID:           getInfoFromFiles(filepath.Join(rootFs, *bootIdFilePath)),
+		BootID:           getInfoFromFiles(filepath.Join(rootFs, *bootIDFilePath)),
 		CloudProvider:    cloudProvider,
 		InstanceType:     instanceType,
 		InstanceID:       instanceID,

vendor/github.com/google/cadvisor/machine/machine.go

@@ -33,18 +33,16 @@ import (
 	"github.com/google/cadvisor/utils/sysfs"
 	"github.com/google/cadvisor/utils/sysinfo"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"golang.org/x/sys/unix"
 )
 
 var (
-	cpuRegExp     = regexp.MustCompile(`^processor\s*:\s*([0-9]+)$`)
-	coreRegExp    = regexp.MustCompile(`(?m)^core id\s*:\s*([0-9]+)$`)
-	nodeRegExp    = regexp.MustCompile(`(?m)^physical id\s*:\s*([0-9]+)$`)
-	nodeBusRegExp = regexp.MustCompile(`^node([0-9]+)$`)
+	coreRegExp = regexp.MustCompile(`(?m)^core id\s*:\s*([0-9]+)$`)
+	nodeRegExp = regexp.MustCompile(`(?m)^physical id\s*:\s*([0-9]+)$`)
 	// Power systems have a different format so cater for both
-	cpuClockSpeedMHz     = regexp.MustCompile(`(?:cpu MHz|clock)\s*:\s*([0-9]+\.[0-9]+)(?:MHz)?`)
+	cpuClockSpeedMHz     = regexp.MustCompile(`(?:cpu MHz|CPU MHz|clock)\s*:\s*([0-9]+\.[0-9]+)(?:MHz)?`)
 	memoryCapacityRegexp = regexp.MustCompile(`MemTotal:\s*([0-9]+) kB`)
 	swapCapacityRegexp   = regexp.MustCompile(`SwapTotal:\s*([0-9]+) kB`)
 
@@ -52,10 +50,9 @@ var (
 	isMemoryController = regexp.MustCompile("mc[0-9]+")
 	isDimm             = regexp.MustCompile("dimm[0-9]+")
 	machineArch        = getMachineArch()
+	maxFreqFile        = "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"
 )
 
-const maxFreqFile = "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"
-const nodePath = "/sys/devices/system/node"
 const sysFsCPUCoreID = "core_id"
 const sysFsCPUPhysicalPackageID = "physical_package_id"
 const sysFsCPUTopology = "topology"
@@ -171,10 +168,10 @@ func GetMachineMemoryByType(edacPath string) (map[string]*info.MemoryInfo, error
 				continue
 			}
 			memType, err := ioutil.ReadFile(path.Join(edacPath, controller, dimm, memTypeFileName))
-			readableMemType := strings.TrimSpace(string(memType))
 			if err != nil {
 				return map[string]*info.MemoryInfo{}, err
 			}
+			readableMemType := strings.TrimSpace(string(memType))
 			if _, exists := memory[readableMemType]; !exists {
 				memory[readableMemType] = &info.MemoryInfo{}
 			}
@@ -260,18 +257,6 @@ func getUniqueCPUPropertyCount(cpuBusPath string, propertyName string) int {
 	return len(uniques)
 }
 
-func extractValue(s string, r *regexp.Regexp) (bool, int, error) {
-	matches := r.FindSubmatch([]byte(s))
-	if len(matches) == 2 {
-		val, err := strconv.ParseInt(string(matches[1]), 10, 32)
-		if err != nil {
-			return false, -1, err
-		}
-		return true, int(val), nil
-	}
-	return false, -1, nil
-}
-
 // getUniqueMatchesCount returns number of unique matches in given argument using provided regular expression
 func getUniqueMatchesCount(s string, r *regexp.Regexp) int {
 	matches := r.FindAllString(s, -1)

vendor/github.com/google/cadvisor/machine/machine_libipmctl.go

@@ -1,98 +0,0 @@
-// +build libipmctl,cgo
-
-// Copyright 2020 Google Inc. 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 machine
-
-// #cgo pkg-config: libipmctl
-// #include <nvm_management.h>
-import "C"
-import (
-	"fmt"
-
-	info "github.com/google/cadvisor/info/v1"
-
-	"k8s.io/klog"
-)
-
-// getNVMAvgPowerBudget retrieves configured power budget
-// (in watts) for NVM devices. When libipmct is not available
-// zero is returned.
-func getNVMAvgPowerBudget() (uint, error) {
-	// Get number of devices on the platform
-	// see: https://github.com/intel/ipmctl/blob/v01.00.00.3497/src/os/nvm_api/nvm_management.h#L1478
-	var count C.uint
-	err := C.nvm_get_number_of_devices(&count)
-	if err != C.NVM_SUCCESS {
-		klog.Warningf("Unable to get number of NVM devices. Status code: %d", err)
-		return uint(0), fmt.Errorf("Unable to get number of NVM devices. Status code: %d", err)
-	}
-
-	// Load basic device information for all the devices
-	// to obtain UID of the first one.
-	var devices = make([]C.struct_device_discovery, count)
-	err = C.nvm_get_devices(&devices[0], C.uchar(count))
-	if err != C.NVM_SUCCESS {
-		klog.Warningf("Unable to get all NVM devices. Status code: %d", err)
-		return uint(0), fmt.Errorf("Unable to get all NVM devices. Status code: %d", err)
-	}
-
-	// Power budget is same for all the devices
-	// so we can rely on any of them.
-	var device C.struct_device_details
-	err = C.nvm_get_device_details(&devices[0].uid[0], &device)
-	if err != C.NVM_SUCCESS {
-		uid := C.GoString(&devices[0].uid[0])
-		klog.Warningf("Unable to get details of NVM device %q. Status code: %d", uid, err)
-		return uint(0), fmt.Errorf("Unable to get details of NVM device %q. Status code: %d", uid, err)
-	}
-
-	return uint(device.avg_power_budget / 1000), nil
-}
-
-// getNVMCapacities retrieves the total NVM capacity in bytes for memory mode and app direct mode
-func getNVMCapacities() (uint64, uint64, error) {
-	var caps C.struct_device_capacities
-	err := C.nvm_get_nvm_capacities(&caps)
-	if err != C.NVM_SUCCESS {
-		klog.Warningf("Unable to get NVM capacity. Status code: %d", err)
-		return uint64(0), uint64(0), fmt.Errorf("Unable to get NVM capacity. Status code: %d", err)
-	}
-	return uint64(caps.memory_capacity), uint64(caps.app_direct_capacity), nil
-}
-
-// GetNVMInfo returns information specific for non-volatile memory modules
-func GetNVMInfo() (info.NVMInfo, error) {
-	nvmInfo := info.NVMInfo{}
-	// Initialize libipmctl library.
-	cErr := C.nvm_init()
-	if cErr != C.NVM_SUCCESS {
-		klog.Warningf("libipmctl initialization failed with status %d", cErr)
-		return info.NVMInfo{}, fmt.Errorf("libipmctl initialization failed with status %d", cErr)
-	}
-	defer C.nvm_uninit()
-
-	var err error
-	nvmInfo.MemoryModeCapacity, nvmInfo.AppDirectModeCapacity, err = getNVMCapacities()
-	if err != nil {
-		return info.NVMInfo{}, fmt.Errorf("Unable to get NVM capacities, err: %s", err)
-	}
-
-	nvmInfo.AvgPowerBudget, err = getNVMAvgPowerBudget()
-	if err != nil {
-		return info.NVMInfo{}, fmt.Errorf("Unable to get NVM average power budget, err: %s", err)
-	}
-	return nvmInfo, nil
-}

vendor/github.com/google/cadvisor/machine/machine_no_libipmctl.go

@@ -1,25 +0,0 @@
-// +build !libipmctl !cgo
-
-// Copyright 2020 Google Inc. 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 machine
-
-import info "github.com/google/cadvisor/info/v1"
-
-// GetNVMInfo returns information specific for non-volatile memory modules.
-// When libipmct is not available zero value is returned.
-func GetNVMInfo() (info.NVMInfo, error) {
-	return info.NVMInfo{}, nil
-}

vendor/github.com/google/cadvisor/machine/operatingsystem_unix.go

@@ -37,19 +37,18 @@ func getOperatingSystem() (string, error) {
 			return "", err
 		}
 		return string(osName), nil
-	} else {
-		bytes, err := ioutil.ReadFile("/etc/os-release")
-		if err != nil && os.IsNotExist(err) {
-			// /usr/lib/os-release in stateless systems like Clear Linux
-			bytes, err = ioutil.ReadFile("/usr/lib/os-release")
-		}
-		if err != nil {
-			return "", fmt.Errorf("error opening file : %v", err)
-		}
-		line := rex.FindAllStringSubmatch(string(bytes), -1)
-		if len(line) > 0 {
-			return strings.Trim(line[0][2], "\""), nil
-		}
-		return "Linux", nil
 	}
+	bytes, err := ioutil.ReadFile("/etc/os-release")
+	if err != nil && os.IsNotExist(err) {
+		// /usr/lib/os-release in stateless systems like Clear Linux
+		bytes, err = ioutil.ReadFile("/usr/lib/os-release")
+	}
+	if err != nil {
+		return "", fmt.Errorf("error opening file : %v", err)
+	}
+	line := rex.FindAllStringSubmatch(string(bytes), -1)
+	if len(line) > 0 {
+		return strings.Trim(line[0][2], "\""), nil
+	}
+	return "Linux", nil
 }