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/services/ngalert/api/test-data/ruler-grafana-recipient-unauthorized.http
-6
View File
@@ -77,7 +77,6 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "gdev-prometheus",
"datasourceUid": "000000002",
"expr": "http_request_duration_microseconds_count",
"hide": false,
@@ -96,7 +95,6 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "query",
"hide": false,
@@ -115,7 +113,6 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "$reduced > 10",
"hide": false,
@@ -162,7 +159,6 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "gdev-prometheus",
"datasourceUid": "000000002",
"expr": "http_request_duration_microseconds_count",
"hide": false,
@@ -181,7 +177,6 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "query",
"hide": false,
@@ -200,7 +195,6 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "$reduced > 42",
"hide": false,
pkg/services/ngalert/api/test-data/ruler-grafana-recipient.http
-8
View File
@@ -100,7 +100,6 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "query",
"hide": false,
@@ -119,7 +118,6 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "$reduced > 10",
"hide": false,
@@ -170,7 +168,6 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "gdev-prometheus",
"datasourceUid": "000000002",
"expr": "http_request_duration_microseconds_count",
"hide": false,
@@ -189,7 +186,6 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "query",
"hide": false,
@@ -208,7 +204,6 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "$reduced > 42",
"hide": false,
@@ -272,7 +267,6 @@ Content-Type: application/json
"to": 10800
},
"model": {
"datasource": "gdev-prometheus",
"datasourceUid": "000000002",
"expr": "http_request_duration_microseconds_count",
"hide": false,
@@ -291,7 +285,6 @@ Content-Type: application/json
"to": 10800
},
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "query",
"hide": false,
@@ -310,7 +303,6 @@ Content-Type: application/json
"to": 10800
},
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "$reduced > 42",
"hide": false,
pkg/services/ngalert/api/test-data/test.http
+2 -2
View File
@@ -16,7 +16,7 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"type":"math",
"expression":"1 < 2"
}
@@ -68,7 +68,7 @@ content-type: application/json
"to": 10800
},
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"type":"math",
"expression":"1 < 2"
}