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

Alerting/Expr: New SSE Request/QueryType, alerting move data source UID (#33282)

Browse Source
This commit is contained in:
Kyle Brandt
2021-04-23 16:52:32 +02:00
committed by GitHub
parent 659ea20c3c
commit 5e818146de
19 changed files with 179 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ngalert/api/test-data/post-rulegroup-101.json
+5 -10
View File
@@ -14,9 +14,8 @@
"from": 18000,
"to": 10800
},
"datasourceUid": "000000002",
"model": {
"datasource": "gdev-prometheus",
"datasourceUid": "000000002",
"expr": "http_request_duration_microseconds_count",
"hide": false,
"interval": "",
@@ -33,9 +32,8 @@
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "query",
"hide": false,
"intervalMs": 1000,
@@ -52,9 +50,8 @@
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "$reduced > 10",
"hide": false,
"intervalMs": 1000,
@@ -80,10 +77,9 @@
"from": 18000,
"to": 10800
},
"datasourceUid": "000000004",
"model": {
"alias": "just-testing",
"datasource": "gdev-testdata",
"datasourceUid": "000000004",
"intervalMs": 1000,
"maxDataPoints": 100,
"orgId": 0,
@@ -99,9 +95,8 @@
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasource": "__expr__",
"datasourceUid": "__expr__",
"expression": "$A",
"intervalMs": 2000,
"maxDataPoints": 200,
pkg/services/ngalert/api/test-data/post-rulegroup-42.json
+5 -10
View File
@@ -21,9 +21,8 @@
"from": 18000,
"to": 10800
},
"datasourceUid": "000000002",
"model": {
"datasource": "gdev-prometheus",
"datasourceUid": "000000002",
"expr": "http_request_duration_microseconds_count",
"hide": false,
"interval": "",
@@ -40,9 +39,8 @@
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "query",
"hide": false,
"intervalMs": 1000,
@@ -59,9 +57,8 @@
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasource": "__expr__",
"datasourceUid": "-100",
"expression": "$reduced > 10",
"hide": false,
"intervalMs": 1000,
@@ -87,10 +84,9 @@
"from": 18000,
"to": 10800
},
"datasourceUid": "000000004",
"model": {
"alias": "just-testing",
"datasource": "gdev-testdata",
"datasourceUid": "000000004",
"intervalMs": 1000,
"maxDataPoints": 100,
"orgId": 0,
@@ -106,9 +102,8 @@
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasource": "__expr__",
"datasourceUid": "__expr__",
"expression": "$A",
"intervalMs": 2000,
"maxDataPoints": 200,
pkg/services/ngalert/api/test-data/ruler-grafana-recipient-unauthorized.http
+6 -6
View File
@@ -76,8 +76,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "000000002",
"model": {
"datasourceUid": "000000002",
"expr": "http_request_duration_microseconds_count",
"hide": false,
"interval": "",
@@ -94,8 +94,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"expression": "query",
"hide": false,
"intervalMs": 1000,
@@ -112,8 +112,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"expression": "$reduced > 10",
"hide": false,
"intervalMs": 1000,
@@ -158,8 +158,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "000000002",
"model": {
"datasourceUid": "000000002",
"expr": "http_request_duration_microseconds_count",
"hide": false,
"interval": "",
@@ -176,8 +176,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"expression": "query",
"hide": false,
"intervalMs": 1000,
@@ -194,8 +194,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"expression": "$reduced > 42",
"hide": false,
"intervalMs": 1000,
pkg/services/ngalert/api/test-data/ruler-grafana-recipient.http
+9 -10
View File
@@ -80,9 +80,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "000000002",
"model": {
"datasource": "gdev-prometheus",
"datasourceUid": "000000002",
"expr": "http_request_duration_microseconds_count",
"hide": false,
"interval": "",
@@ -99,8 +98,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"expression": "query",
"hide": false,
"intervalMs": 1000,
@@ -117,8 +116,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"expression": "$reduced > 10",
"hide": false,
"intervalMs": 1000,
@@ -167,8 +166,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "000000002",
"model": {
"datasourceUid": "000000002",
"expr": "http_request_duration_microseconds_count",
"hide": false,
"interval": "",
@@ -185,8 +184,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"expression": "query",
"hide": false,
"intervalMs": 1000,
@@ -203,8 +202,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"expression": "$reduced > 42",
"hide": false,
"intervalMs": 1000,
@@ -266,8 +265,8 @@ Content-Type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "000000002",
"model": {
"datasourceUid": "000000002",
"expr": "http_request_duration_microseconds_count",
"hide": false,
"interval": "",
@@ -284,8 +283,8 @@ Content-Type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"expression": "query",
"hide": false,
"intervalMs": 1000,
@@ -302,8 +301,8 @@ Content-Type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"expression": "$reduced > 42",
"hide": false,
"intervalMs": 1000,
pkg/services/ngalert/api/test-data/test-rule.json
+1 -1
View File
@@ -9,8 +9,8 @@
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasource": "__expr__",
"type": "math",
"expression": "2 + 2 > 1"
}
pkg/services/ngalert/api/test-data/test.http
+4 -4
View File
@@ -15,8 +15,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"type":"math",
"expression":"1 < 2"
}
@@ -39,8 +39,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "000000004",
"model": {
"datasourceUid": "000000004",
"intervalMs": 1000,
"maxDataPoints": 100,
"orgId": 0,
@@ -56,8 +56,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"expression": "$A",
"intervalMs": 2000,
"maxDataPoints": 200,
@@ -113,8 +113,8 @@ content-type: application/json
"from": 18000,
"to": 10800
},
"datasourceUid": "-100",
"model": {
"datasourceUid": "-100",
"type":"math",
"expression":"1 < 2"
}