From 04d06d2f236d205c7482e3234cadcdb30ebd7d17 Mon Sep 17 00:00:00 2001 From: zhouya0 Date: Tue, 24 Mar 2020 14:23:26 +0800 Subject: [PATCH] Remove prometheus references from etcd version monitor --- cluster/images/etcd-version-monitor/BUILD | 2 +- .../images/etcd-version-monitor/etcd-version-monitor.go | 6 ++---- .../k8s.io/component-base/metrics/testutil/metrics.go | 9 +++++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/cluster/images/etcd-version-monitor/BUILD b/cluster/images/etcd-version-monitor/BUILD index cd7ace3cc3e..36a59d66af8 100644 --- a/cluster/images/etcd-version-monitor/BUILD +++ b/cluster/images/etcd-version-monitor/BUILD @@ -17,9 +17,9 @@ go_library( importpath = "k8s.io/kubernetes/cluster/images/etcd-version-monitor", deps = [ "//staging/src/k8s.io/component-base/metrics:go_default_library", + "//staging/src/k8s.io/component-base/metrics/testutil:go_default_library", "//vendor/github.com/gogo/protobuf/proto:go_default_library", "//vendor/github.com/prometheus/client_model/go:go_default_library", - "//vendor/github.com/prometheus/common/expfmt:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], diff --git a/cluster/images/etcd-version-monitor/etcd-version-monitor.go b/cluster/images/etcd-version-monitor/etcd-version-monitor.go index 411d2f136ef..3126ff2515d 100644 --- a/cluster/images/etcd-version-monitor/etcd-version-monitor.go +++ b/cluster/images/etcd-version-monitor/etcd-version-monitor.go @@ -27,10 +27,10 @@ import ( "github.com/gogo/protobuf/proto" dto "github.com/prometheus/client_model/go" - "github.com/prometheus/common/expfmt" "github.com/spf13/pflag" "k8s.io/component-base/metrics" + "k8s.io/component-base/metrics/testutil" "k8s.io/klog" ) @@ -271,9 +271,7 @@ func scrapeMetrics() (map[string]*dto.MetricFamily, error) { } defer resp.Body.Close() - // Parse the metrics in text format to a MetricFamily struct. - var textParser expfmt.TextParser - return textParser.TextToMetricFamilies(resp.Body) + return testutil.TextToMetricFamilies(resp.Body) } func renameMetric(mf *dto.MetricFamily, name string) { diff --git a/staging/src/k8s.io/component-base/metrics/testutil/metrics.go b/staging/src/k8s.io/component-base/metrics/testutil/metrics.go index cf39cb7ab56..2af9c01058e 100644 --- a/staging/src/k8s.io/component-base/metrics/testutil/metrics.go +++ b/staging/src/k8s.io/component-base/metrics/testutil/metrics.go @@ -92,6 +92,15 @@ func ParseMetrics(data string, output *Metrics) error { } } +// TextToMetricFamilies reads 'in' as the simple and flat text-based exchange +// format and creates MetricFamily proto messages. It returns the MetricFamily +// proto messages in a map where the metric names are the keys, along with any +// error encountered. +func TextToMetricFamilies(in io.Reader) (map[string]*dto.MetricFamily, error) { + var textParser expfmt.TextParser + return textParser.TextToMetricFamilies(in) +} + // ExtractMetricSamples parses the prometheus metric samples from the input string. func ExtractMetricSamples(metricsBlob string) ([]*model.Sample, error) { dec := expfmt.NewDecoder(strings.NewReader(metricsBlob), expfmt.FmtText)