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

Add psr option when ps containers

Browse Source
This commit is contained in:
mjace 2019-08-15 23:49:33 -07:00
parent 107e5aa4c3
commit 52f9cd97ce
4 changed files with 56 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/internal/pages/assets/js/containers.js
View File

@ -606,11 +606,11 @@ function drawProcesses(isRoot, rootDir, processInfo) {
}
var titles = [
'User', 'PID', 'PPID', 'Start Time', 'CPU %', 'MEM %', 'RSS',
'Virtual Size', 'Status', 'Running Time', 'Command'
'Virtual Size', 'Status', 'Running Time', 'Command', 'PSR'
];
var titleTypes = [
'string', 'number', 'number', 'string', 'number', 'number', 'number',
'number', 'string', 'string', 'string'
'number', 'string', 'string', 'string', 'number'
];
var sortIndex = 4;
if (isRoot) {
@ -647,6 +647,7 @@ function drawProcesses(isRoot, rootDir, processInfo) {
cgroup.substr(0, 30) + ' </a>';
elements.push({v: cgroup, f: cgroupLink});
}
elements.push(processInfo[i].psr);
data.push(elements);
}
drawTable(titles, titleTypes, data, 'processes-top', 25, sortIndex);

122
cmd/internal/pages/static/assets.go
View File

File diff suppressed because one or more lines are too long

1
info/v2/container.go
View File

@ -275,6 +275,7 @@ type ProcessInfo struct {
CgroupPath string `json:"cgroup_path"`
Cmd string `json:"cmd"`
FdCount int `json:"fd_count"`
Psr int `json:"psr"`
}
type TcpStat struct {

12
manager/container.go
View File

@ -286,12 +286,12 @@ func (cd *containerData) GetProcessList(cadvisorContainer string, inHostNamespac
if !inHostNamespace {
rootfs = "/rootfs"
}
format := "user,pid,ppid,stime,pcpu,pmem,rss,vsz,stat,time,comm,cgroup"
format := "user,pid,ppid,stime,pcpu,pmem,rss,vsz,stat,time,comm,psr,cgroup"
out, err := cd.getPsOutput(inHostNamespace, format)
if err != nil {
return nil, err
}
expectedFields := 12
expectedFields := 13
processes := []v2.ProcessInfo{}
lines := strings.Split(string(out), "\n")
for _, line := range lines[1:] {
@ -330,7 +330,12 @@ func (cd *containerData) GetProcessList(cadvisorContainer string, inHostNamespac
}
// convert to bytes
vs *= 1024
cgroup, err := cd.getCgroupPath(fields[11])
psr, err := strconv.Atoi(fields[11])
if err != nil {
return nil, fmt.Errorf("invalid pid %q: %v", fields[1], err)
}
cgroup, err := cd.getCgroupPath(fields[12])
if err != nil {
return nil, fmt.Errorf("could not parse cgroup path from %q: %v", fields[11], err)
}
@ -368,6 +373,7 @@ func (cd *containerData) GetProcessList(cadvisorContainer string, inHostNamespac
Cmd: fields[10],
CgroupPath: cgroupPath,
FdCount: fdCount,
Psr: psr,
})
}
}