prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't fail fetching machine information when not available

Browse Source
This commit is contained in:
Victor Marmol 2015-03-12 14:48:12 -07:00
parent cf9c76c06c
commit aa8697140d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manager/machine.go
View File

@ -243,28 +243,27 @@ func getMachineInfo(sysFs sysfs.SysFs, fsInfo fs.FsInfo) (*info.MachineInfo, err
filesystems, err := fsInfo.GetGlobalFsInfo() filesystems, err := fsInfo.GetGlobalFsInfo()
if err != nil { if err != nil {
return nil, err glog.Errorf("Failed to get global filesystem information: %v", err)
} }
diskMap, err := sysinfo.GetBlockDeviceInfo(sysFs) diskMap, err := sysinfo.GetBlockDeviceInfo(sysFs)
if err != nil { if err != nil {
return nil, err glog.Errorf("Failed to get disk map: %v", err)
} }
netDevices, err := sysinfo.GetNetworkDevices(sysFs) netDevices, err := sysinfo.GetNetworkDevices(sysFs)
if err != nil { if err != nil {
return nil, err glog.Errorf("Failed to get network devices: %v", err)
} }
topology, numCores, err := getTopology(sysFs, string(cpuinfo)) topology, numCores, err := getTopology(sysFs, string(cpuinfo))
if err != nil { if err != nil {
return nil, err glog.Errorf("Failed to get topology information: %v", err)
} }
systemUUID, err := sysinfo.GetSystemUUID(sysFs) systemUUID, err := sysinfo.GetSystemUUID(sysFs)
if err != nil { if err != nil {
glog.Errorf("Failed to get system UUID: %v", err) glog.Errorf("Failed to get system UUID: %v", err)
systemUUID = ""
} }
machineInfo := &info.MachineInfo{ machineInfo := &info.MachineInfo{