From f85e758972450e987a0a481c23eefc14e36ba8bf Mon Sep 17 00:00:00 2001 From: Yuriy Tseretyan Date: Wed, 4 May 2022 09:31:05 -0400 Subject: [PATCH] unhide alert rule's data sources during migraiton (#48559) --- pkg/services/sqlstore/migrations/ualert/alert_rule.go | 2 ++ pkg/services/sqlstore/migrations/ualert/alert_rule_test.go | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/pkg/services/sqlstore/migrations/ualert/alert_rule.go b/pkg/services/sqlstore/migrations/ualert/alert_rule.go index 9846d6630d7..cefa976130a 100644 --- a/pkg/services/sqlstore/migrations/ualert/alert_rule.go +++ b/pkg/services/sqlstore/migrations/ualert/alert_rule.go @@ -160,6 +160,8 @@ func migrateAlertRuleQueries(data []alertQuery) ([]alertQuery, error) { if err != nil { return nil, err } + // remove hidden tag from the query (if exists) + delete(fixedData, "hide") fixedData = fixGraphiteReferencedSubQueries(fixedData) updatedModel, err := json.Marshal(fixedData) if err != nil { diff --git a/pkg/services/sqlstore/migrations/ualert/alert_rule_test.go b/pkg/services/sqlstore/migrations/ualert/alert_rule_test.go index 533dad039fa..b3d16922a1e 100644 --- a/pkg/services/sqlstore/migrations/ualert/alert_rule_test.go +++ b/pkg/services/sqlstore/migrations/ualert/alert_rule_test.go @@ -25,6 +25,11 @@ func TestMigrateAlertRuleQueries(t *testing.T) { input: simplejson.NewFromAny(map[string]interface{}{"target": "ahalfquery"}), expected: `{"target":"ahalfquery"}`, }, + { + name: "when query was hidden, it removes the flag", + input: simplejson.NewFromAny(map[string]interface{}{"hide": true}), + expected: `{}`, + }, } for _, tt := range tc {