public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AlertingNG/SSE: Datasource UID and UID/ID only (drop name) (#33039)

Browse Source 
SSE still will support ID until dashboard/frontend always requests UID
update *.http examples

Co-authored-by: gotjosh <josue@grafana.com>
This commit is contained in:
Kyle Brandt
2021-04-16 15:29:19 +02:00
committed by GitHub
co-authored by gotjosh
parent 5d1ec39224
commit 2c862678ab
11 changed files with 40 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tests/api/alerting/api_alertmanager_test.go
+2 -4
View File
@@ -91,7 +91,7 @@ func TestAlertRuleCRUD(t *testing.T) {
To: ngmodels.Duration(time.Duration(3) * time.Hour),
},
Model: json.RawMessage(`{
"datasource": "__expr__",
"datasourceUid": "-100",
"type": "math",
"expression": "2 + 3 > 1"
}`),
@@ -112,7 +112,7 @@ func TestAlertRuleCRUD(t *testing.T) {
To: ngmodels.Duration(time.Duration(3) * time.Hour),
},
Model: json.RawMessage(`{
"datasource": "__expr__",
"datasourceUid": "-100",
"type": "math",
"expression": "2 + 3 > 1"
}`),
@@ -180,7 +180,6 @@ func TestAlertRuleCRUD(t *testing.T) {
"to":10800
},
"model":{
"datasource":"__expr__",
"datasourceUid":"-100",
"expression":"2 + 3 \u003e 1",
"intervalMs":1000,
@@ -216,7 +215,6 @@ func TestAlertRuleCRUD(t *testing.T) {
"to":10800
},
"model":{
"datasource":"__expr__",
"datasourceUid":"-100",
"expression":"2 + 3 \u003e 1",
"intervalMs":1000,