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

Use cgroups proto for prom metrics

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-09-05 13:05:54 -04:00
parent 0973a084cf
commit ed45952826
9 changed files with 92 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
metrics/cgroups/cgroups.go
View File

@@ -6,6 +6,7 @@ import (
"github.com/containerd/cgroups"
eventsapi "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/linux"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/plugin"
@@ -49,10 +50,11 @@ type cgroupsMonitor struct {
func (m *cgroupsMonitor) Monitor(c runtime.Task) error {
info := c.Info()
if err := m.collector.Add(info.ID, info.Namespace, c); err != nil {
t := c.(*linux.Task)
if err := m.collector.Add(info.ID, info.Namespace, t.Cgroup()); err != nil {
return err
}
return m.oom.Add(info.ID, info.Namespace, cg, m.trigger)
return m.oom.Add(info.ID, info.Namespace, t.Cgroup(), m.trigger)
}
func (m *cgroupsMonitor) Stop(c runtime.Task) error {