Skip to content

Commit

Permalink
Add NSpid to proc status (prometheus#557)
Browse files Browse the repository at this point in the history
* Add NSpid to proc status

Signed-off-by: Nir Levy <[email protected]>

* Support NSpid with 2 pids

Signed-off-by: Nir Levy <[email protected]>

* Support list of nspids

Signed-off-by: Nir Levy <[email protected]>

---------

Signed-off-by: Nir Levy <[email protected]>
  • Loading branch information
NirLevy98 authored and jritter committed Jul 15, 2024
1 parent 9b3ff75 commit cfe75b6
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
19 changes: 19 additions & 0 deletions proc_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ type ProcStatus struct {

// Thread group ID.
TGID int
// List of Pid namespace.
NSpids []uint64

// Peak virtual memory size.
VmPeak uint64 // nolint:revive
Expand Down Expand Up @@ -127,6 +129,8 @@ func (s *ProcStatus) fillStatus(k string, vString string, vUint uint64, vUintByt
copy(s.UIDs[:], strings.Split(vString, "\t"))
case "Gid":
copy(s.GIDs[:], strings.Split(vString, "\t"))
case "NSpid":
s.NSpids = calcNSPidsList(vString)
case "VmPeak":
s.VmPeak = vUintBytes
case "VmSize":
Expand Down Expand Up @@ -200,3 +204,18 @@ func calcCpusAllowedList(cpuString string) []uint64 {
sort.Slice(g, func(i, j int) bool { return g[i] < g[j] })
return g
}

func calcNSPidsList(nspidsString string) []uint64 {
s := strings.Split(nspidsString, " ")
var nspids []uint64

for _, nspid := range s {
nspid, _ := strconv.ParseUint(nspid, 10, 64)
if nspid == 0 {
continue
}
nspids = append(nspids, nspid)
}

return nspids
}
1 change: 1 addition & 0 deletions proc_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ func TestProcStatus(t *testing.T) {
}{
{name: "Pid", want: 26231, have: s.PID},
{name: "Tgid", want: 26231, have: s.TGID},
{name: "NSpid", want: 1, have: int(s.NSpids[0])},
{name: "VmPeak", want: 58472 * 1024, have: int(s.VmPeak)},
{name: "VmSize", want: 58440 * 1024, have: int(s.VmSize)},
{name: "VmLck", want: 0 * 1024, have: int(s.VmLck)},
Expand Down

0 comments on commit cfe75b6

Please sign in to comment.