fix: analysis with multiple metrics (argoproj#1261)

Signed-off-by: hari rongali <hari_rongali@intuit.com> Signed-off-by: caoyang001 <caoyang001@foxmail.com>
caoyang001 · Jun 12, 2021 · b79ef5e · b79ef5e
1 parent 7ec525a
commit b79ef5e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/controller/metrics/analysis.go b/controller/metrics/analysis.go
@@ -106,6 +106,6 @@ func collectAnalysisTemplate(ch chan<- prometheus.Metric, namespace, name string
 
 	for _, metric := range at.Metrics {
 		metricType := metricproviders.Type(metric)
-		addGauge(MetricAnalysisTemplateMetricInfo, 1, metricType)
+		addGauge(MetricAnalysisTemplateMetricInfo, 1, metricType, metric.Name)
 	}
 }
diff --git a/controller/metrics/analysis_test.go b/controller/metrics/analysis_test.go
@@ -179,8 +179,8 @@ analysis_template_info{name="http-benchmark-test",namespace=""} 1
 analysis_template_info{name="http-benchmark-test",namespace="jesse-test"} 1
 # HELP analysis_template_metric_info Information on metrics in analysis templates.
 # TYPE analysis_template_metric_info gauge
-analysis_template_metric_info{name="http-benchmark-test",namespace="",type="Web"} 1
-analysis_template_metric_info{name="http-benchmark-test",namespace="jesse-test",type="Web"} 1
+analysis_template_metric_info{metric="webmetric",name="http-benchmark-test",namespace="",type="Web"} 1
+analysis_template_metric_info{metric="webmetric",name="http-benchmark-test",namespace="jesse-test",type="Web"} 1
 `
 	registry := prometheus.NewRegistry()
 	at := newFakeAnalysisTemplate(fakeAnalysisTemplate)

diff --git a/controller/metrics/prommetrics.go b/controller/metrics/prommetrics.go
@@ -132,7 +132,7 @@ var (
 	MetricAnalysisTemplateMetricInfo = prometheus.NewDesc(
 		"analysis_template_metric_info",
 		"Information on metrics in analysis templates.",
-		append(namespaceNameLabels, "type"),
+		append(namespaceNameLabels, "type", "metric"),
 		nil,
 	)
 )