IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

unhide alert rule's data sources during migraiton (#48559)

Browse Source
This commit is contained in:
Yuriy Tseretyan 2022-05-04 09:31:05 -04:00 committed by GitHub
parent 7b4bc3eda6
commit f85e758972
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/sqlstore/migrations/ualert/alert_rule.go
View File

@ -160,6 +160,8 @@ func migrateAlertRuleQueries(data []alertQuery) ([]alertQuery, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
// remove hidden tag from the query (if exists)
delete(fixedData, "hide")
fixedData = fixGraphiteReferencedSubQueries(fixedData) fixedData = fixGraphiteReferencedSubQueries(fixedData)
updatedModel, err := json.Marshal(fixedData) updatedModel, err := json.Marshal(fixedData)
if err != nil { if err != nil {

5
pkg/services/sqlstore/migrations/ualert/alert_rule_test.go
View File

@ -25,6 +25,11 @@ func TestMigrateAlertRuleQueries(t *testing.T) {
input: simplejson.NewFromAny(map[string]interface{}{"target": "ahalfquery"}), input: simplejson.NewFromAny(map[string]interface{}{"target": "ahalfquery"}),
expected: `{"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 { for _, tt := range tc {