From 8d8bfc7c33a9ba9049f24c02454371011ef775b7 Mon Sep 17 00:00:00 2001 From: Daniel Weibel Date: Wed, 14 Aug 2019 18:47:54 +0200 Subject: [PATCH 1/2] Set default value of --metrics-max-age equal to --metrics-relist-interval --- cmd/adapter/adapter.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/adapter/adapter.go b/cmd/adapter/adapter.go index 8d62c0f96..09d98c65e 100644 --- a/cmd/adapter/adapter.go +++ b/cmd/adapter/adapter.go @@ -242,7 +242,6 @@ func main() { cmd := &PrometheusAdapter{ PrometheusURL: "https://localhost", MetricsRelistInterval: 10 * time.Minute, - MetricsMaxAge: 20 * time.Minute, } cmd.Name = "prometheus-metrics-adapter" cmd.addFlags() @@ -251,6 +250,11 @@ func main() { klog.Fatalf("unable to parse flags: %v", err) } + // if --metrics-max-age is not set, make it equal to --metrics-relist-interval + if cmd.MetricsMaxAge == 0 * time.Second { + cmd.MetricsMaxAge = cmd.MetricsRelistInterval + } + // make the prometheus client promClient, err := cmd.makePromClient() if err != nil { From 4788770bf68664bd011cc6c3e09448a4389fc135 Mon Sep 17 00:00:00 2001 From: Daniel Weibel Date: Wed, 14 Aug 2019 19:40:37 +0200 Subject: [PATCH 2/2] Fix formatting --- cmd/adapter/adapter.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/adapter/adapter.go b/cmd/adapter/adapter.go index 09d98c65e..5caa3d65c 100644 --- a/cmd/adapter/adapter.go +++ b/cmd/adapter/adapter.go @@ -250,8 +250,8 @@ func main() { klog.Fatalf("unable to parse flags: %v", err) } - // if --metrics-max-age is not set, make it equal to --metrics-relist-interval - if cmd.MetricsMaxAge == 0 * time.Second { + // if --metrics-max-age is not set, make it equal to --metrics-relist-interval + if cmd.MetricsMaxAge == 0*time.Second { cmd.MetricsMaxAge = cmd.MetricsRelistInterval }