From d269775929f176cf7b5804e1ebcb8d5e85a675ce Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Tue, 15 Mar 2016 16:01:38 -0700 Subject: [PATCH] Update cadvisor linux module to work with the cadvisor v0.22.2 Signed-off-by: Vishnu kannan --- pkg/kubelet/cadvisor/cadvisor_linux.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index 2a23053f8f7..f7691b63846 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -27,6 +27,7 @@ import ( "github.com/golang/glog" "github.com/google/cadvisor/cache/memory" + cadvisorMetrics "github.com/google/cadvisor/container" "github.com/google/cadvisor/events" cadvisorfs "github.com/google/cadvisor/fs" cadvisorhttp "github.com/google/cadvisor/http" @@ -66,7 +67,7 @@ func New(port uint) (Interface, error) { } // Create and start the cAdvisor container manager. - m, err := manager.New(memory.New(statsCacheDuration, nil), sysFs, maxHousekeepingInterval, allowDynamicHousekeeping) + m, err := manager.New(memory.New(statsCacheDuration, nil), sysFs, maxHousekeepingInterval, allowDynamicHousekeeping, cadvisorMetrics.MetricSet{cadvisorMetrics.NetworkTcpUsageMetrics: struct{}{}}) if err != nil { return nil, err }