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

Merge pull request #731 from bpradipt/ppc64_uuid

Browse Source 
Handle system UUID retrieval for Power(ppc64) Systems
This commit is contained in:
Rohit Jnagal 2015-05-27 22:26:08 -07:00
commit a6b21f65a2
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
utils/sysfs/sysfs.go
View File

@ -24,10 +24,11 @@ import (
) )
const ( const (
blockDir = "/sys/block" blockDir = "/sys/block"
cacheDir = "/sys/devices/system/cpu/cpu" cacheDir = "/sys/devices/system/cpu/cpu"
netDir = "/sys/class/net" netDir = "/sys/class/net"
dmiDir = "/sys/class/dmi" dmiDir = "/sys/class/dmi"
ppcDevTree = "/proc/device-tree"
) )
type CacheInfo struct { type CacheInfo struct {
@ -235,7 +236,15 @@ func (self *realSysFs) GetCacheInfo(id int, name string) (CacheInfo, error) {
func (self *realSysFs) GetSystemUUID() (string, error) { func (self *realSysFs) GetSystemUUID() (string, error) {
id, err := ioutil.ReadFile(path.Join(dmiDir, "id", "product_uuid")) id, err := ioutil.ReadFile(path.Join(dmiDir, "id", "product_uuid"))
if err != nil { if err != nil {
return "", err //If running on baremetal Power then UID is /proc/device-tree/system-id
id, err = ioutil.ReadFile(path.Join(ppcDevTree, "system-id"))
if err != nil {
//If running on a KVM guest on Power then UUID is /proc/device-tree/vm,uuid
id, err = ioutil.ReadFile(path.Join(ppcDevTree, "vm,uuid"))
if err != nil {
return "", err
}
}
} }
return strings.TrimSpace(string(id)), nil return strings.TrimSpace(string(id)), nil
} }