fix(analyse_prometheus): store errors instead of exit

Fixes grafana#236 Signed-off-by: Furkan <[email protected]> Co-authored-by: Emin <[email protected]> Co-authored-by: Yasin <[email protected]> Co-authored-by: Batuhan <[email protected]>
Dentrax · Jan 20, 2022 · 35224ff · 35224ff
1 parent feaf58b
commit 35224ff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/pkg/analyse/prometheus.go b/pkg/analyse/prometheus.go
@@ -7,6 +7,8 @@ type MetricsInPrometheus struct {
 
 	InUseMetricCounts      []MetricCount `json:"in_use_metric_counts"`
 	AdditionalMetricCounts []MetricCount `json:"additional_metric_counts"`
+
+	Errors []string `json:"errors"`
 }
 
 type MetricCount struct {

diff --git a/pkg/commands/analyse_prometheus.go b/pkg/commands/analyse_prometheus.go
@@ -3,6 +3,7 @@ package commands
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"sort"
@@ -94,15 +95,18 @@ func (cmd *PrometheusAnalyseCommand) run(k *kingpin.ParseContext) error {
 		jobCount   map[string]int
 	}{}
 	inUseCardinality := 0
-
+	var errorMetrics []string
 	for _, metric := range metricsUsed {
 		ctx, cancel := context.WithTimeout(context.Background(), cmd.readTimeout)
 		defer cancel()
 
 		query := "count by (job) (" + metric + ")"
 		result, _, err := v1api.Query(ctx, query, time.Now())
 		if err != nil {
-			return errors.Wrap(err, "error querying "+query)
+			errStr := fmt.Sprintf("error querying %v: %s", query, err.Error())
+			log.Warnln(errStr)
+			errorMetrics = append(errorMetrics, errStr)
+			continue
 		}
 
 		vec := result.(model.Vector)
@@ -151,7 +155,10 @@ func (cmd *PrometheusAnalyseCommand) run(k *kingpin.ParseContext) error {
 		query := "count by (job) (" + metric + ")"
 		result, _, err := v1api.Query(ctx, query, time.Now())
 		if err != nil {
-			return errors.Wrap(err, "error querying "+query)
+			errStr := fmt.Sprintf("error querying %v: %s", query, err.Error())
+			log.Warnln(errStr)
+			errorMetrics = append(errorMetrics, errStr)
+			continue
 		}
 
 		vec := result.(model.Vector)
@@ -187,6 +194,7 @@ func (cmd *PrometheusAnalyseCommand) run(k *kingpin.ParseContext) error {
 	output.TotalActiveSeries = inUseCardinality + additionalMetricsCardinality
 	output.InUseActiveSeries = inUseCardinality
 	output.AdditionalActiveSeries = additionalMetricsCardinality
+	output.Errors = errorMetrics
 
 	for metric, counts := range inUseMetrics {
 		jobCounts := make([]analyse.JobCount, 0, len(counts.jobCount))