From f70efed2cb47d0b1c088ee524405ff5e230bd2b9 Mon Sep 17 00:00:00 2001 From: Brendan O'Handley Date: Thu, 27 Apr 2023 15:54:12 -0400 Subject: [PATCH] Prometheus: Update healthcheck text message (#67401) * the healthcheck is used outside the config save&test so change text message * fix e2e test --- e2e/various-suite/exemplars.spec.ts | 2 +- pkg/tsdb/prometheus/healthcheck.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/e2e/various-suite/exemplars.spec.ts b/e2e/various-suite/exemplars.spec.ts index d341878b4cc..af990cb2d61 100644 --- a/e2e/various-suite/exemplars.spec.ts +++ b/e2e/various-suite/exemplars.spec.ts @@ -4,7 +4,7 @@ const dataSourceName = 'PromExemplar'; const addDataSource = () => { e2e.flows.addDataSource({ type: 'Prometheus', - expectedAlertMessage: 'saved', + expectedAlertMessage: 'Prometheus', name: dataSourceName, form: () => { e2e.components.DataSource.Prometheus.configPage.exemplarsAddButton().click(); diff --git a/pkg/tsdb/prometheus/healthcheck.go b/pkg/tsdb/prometheus/healthcheck.go index 8929d12c766..9117e828b7c 100644 --- a/pkg/tsdb/prometheus/healthcheck.go +++ b/pkg/tsdb/prometheus/healthcheck.go @@ -64,15 +64,15 @@ func healthcheck(ctx context.Context, req *backend.CheckHealthRequest, i *instan }) if err != nil { - return getHealthCheckMessage(logger, "Your configuration has been saved but there is an error.", err) + return getHealthCheckMessage(logger, "There was an error returned querying the Prometheus API.", err) } if resp.Responses[refID].Error != nil { - return getHealthCheckMessage(logger, "Your configuration has been saved but there is an error.", + return getHealthCheckMessage(logger, "There was an error returned querying the Prometheus API.", errors.New(resp.Responses[refID].Error.Error())) } - return getHealthCheckMessage(logger, "Successfully saved the configuration and queried the Prometheus API.", nil) + return getHealthCheckMessage(logger, "Successfully queried the Prometheus API.", nil) } func getHealthCheckMessage(logger log.Logger, message string, err error) (*backend.CheckHealthResult, error) {