diff --git a/pkg/tests/api/alerting/api_notification_channel_test.go b/pkg/tests/api/alerting/api_notification_channel_test.go index 6e56803917666..a4a9d018f8b22 100644 --- a/pkg/tests/api/alerting/api_notification_channel_test.go +++ b/pkg/tests/api/alerting/api_notification_channel_test.go @@ -1298,7 +1298,7 @@ func (nc *mockNotificationChannel) matchesExpNotifications(t *testing.T, exp map r1 = regexp.MustCompile(`.*"source"\s*:\s*"([^"]+)"`) case "googlechat_recv/googlechat_test": // "Grafana v | 25 May 21 17:44 IST" - r1 = regexp.MustCompile(`.*"text"\s*:\s*"(Grafana v[^"]+)"`) + r1 = regexp.MustCompile(`.*"text"\s*:\s*"([^"]+)"`) // LOGZ.IO GRAFANA CHANGE :: DEV-43549 Fix Google chat notification messages case "victorops_recv/victorops_test": // It has a time component "timestamp". r1 = regexp.MustCompile(`.*"timestamp"\s*:\s*([0-9]+)`) @@ -2755,7 +2755,7 @@ var expNonEmailNotifications = map[string][]string{ "buttons": [ { "textButton": { - "text": "OPEN IN GRAFANA", + "text": "OPEN IN LOGZIO", "onClick": { "openLink": { "url": "http://localhost:3000/alerting/list" diff --git a/pkg/tests/api/plugins/data/expectedListResp.json b/pkg/tests/api/plugins/data/expectedListResp.json index 23702ab914f80..829355e16405e 100644 --- a/pkg/tests/api/plugins/data/expectedListResp.json +++ b/pkg/tests/api/plugins/data/expectedListResp.json @@ -1175,7 +1175,7 @@ "hasUpdate": false, "defaultNavUrl": "/plugins/news/", "category": "", - "state": "beta", + "state": "deprecated", "signature": "internal", "signatureType": "", "signatureOrg": "", diff --git a/pkg/tsdb/elasticsearch/error_handling_test.go b/pkg/tsdb/elasticsearch/error_handling_test.go index 353c1e2409d2a..e2f982f5c8d4d 100644 --- a/pkg/tsdb/elasticsearch/error_handling_test.go +++ b/pkg/tsdb/elasticsearch/error_handling_test.go @@ -41,7 +41,14 @@ func TestErrorAvgMissingField(t *testing.T) { require.NoError(t, err) // FIXME: we should return the received error message - require.Len(t, result.response.Responses, 0) + // LOGZ.IO GRAFANA CHANGE :: DEV-43744 - Add error msg + require.Len(t, result.response.Responses, 1) + dataResponse, ok := result.response.Responses["A"] + + require.True(t, ok) + require.Len(t, dataResponse.Frames, 0) + require.ErrorContains(t, dataResponse.Error, "got bad response status from datasource. StatusCode: 400") + // LOGZ.IO GRAFANA CHANGE :: End } func TestErrorAvgMissingFieldNoDetailedErrors(t *testing.T) { @@ -69,7 +76,14 @@ func TestErrorAvgMissingFieldNoDetailedErrors(t *testing.T) { require.NoError(t, err) // FIXME: we should return the received error message - require.Len(t, result.response.Responses, 0) + // LOGZ.IO GRAFANA CHANGE :: DEV-43744 - Add error msg + require.Len(t, result.response.Responses, 1) + dataResponse, ok := result.response.Responses["A"] + + require.True(t, ok) + require.Len(t, dataResponse.Frames, 0) + require.ErrorContains(t, dataResponse.Error, "got bad response status from datasource. StatusCode: 400") + // LOGZ.IO GRAFANA CHANGE :: End } func TestErrorTooManyDateHistogramBuckets(t *testing.T) {