From a663e835c43585090981ae82638cd6216c467c2a Mon Sep 17 00:00:00 2001 From: Vishnu kannan Date: Wed, 6 Apr 2016 11:52:44 -0700 Subject: [PATCH] Fix --disable_metrics parsing to accept empty string as input. Signed-off-by: Vishnu kannan --- cadvisor.go | 4 ++++ cadvisor_test.go | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/cadvisor.go b/cadvisor.go index f21503b8..403d1988 100644 --- a/cadvisor.go +++ b/cadvisor.go @@ -76,6 +76,10 @@ func (ml *metricSetValue) String() string { } func (ml *metricSetValue) Set(value string) error { + ignoreMetrics = metricSetValue{} + if value == "" { + return nil + } for _, metric := range strings.Split(value, ",") { if ignoreWhitelist.Has(container.MetricKind(metric)) { (*ml).Add(container.MetricKind(metric)) diff --git a/cadvisor_test.go b/cadvisor_test.go index 27a5ad0b..ec341ec5 100644 --- a/cadvisor_test.go +++ b/cadvisor_test.go @@ -27,3 +27,9 @@ func TestTcpMetricsAreDisabledByDefault(t *testing.T) { flag.Parse() assert.True(t, ignoreMetrics.Has(container.NetworkTcpUsageMetrics)) } + +func TestTcpMetricsAreEnabledOnDemand(t *testing.T) { + assert.True(t, ignoreMetrics.Has(container.NetworkTcpUsageMetrics)) + ignoreMetrics.Set("") + assert.False(t, ignoreMetrics.Has(container.NetworkTcpUsageMetrics)) +}