github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add namespace to container metrics

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-06-27 10:26:02 -07:00
parent 85f61f6f51
commit 6ec84ef83c
7 changed files with 50 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
metrics/cgroups/cgroups.go
View File

@@ -3,7 +3,6 @@
package cgroups
import (
"fmt"
"time"
"github.com/containerd/cgroups"
@@ -44,12 +43,8 @@ type cgroupsMonitor struct {
events chan<- *plugin.Event
}
func getID(t plugin.Task) string {
return fmt.Sprintf("%s-%s", t.Info().Namespace, t.Info().ID)
}
func (m *cgroupsMonitor) Monitor(c plugin.Task) error {
id := getID(c)
info := c.Info()
state, err := c.State(m.context)
if err != nil {
return err
@@ -58,14 +53,15 @@ func (m *cgroupsMonitor) Monitor(c plugin.Task) error {
if err != nil {
return err
}
if err := m.collector.Add(id, cg); err != nil {
if err := m.collector.Add(info.ID, info.Namespace, cg); err != nil {
return err
}
return m.oom.Add(id, cg, m.trigger)
return m.oom.Add(info.ID, info.Namespace, cg, m.trigger)
}
func (m *cgroupsMonitor) Stop(c plugin.Task) error {
m.collector.Remove(getID(c))
info := c.Info()
m.collector.Remove(info.ID, info.Namespace)
return nil
}