Skip to content

Commit 0beb644

Browse files
add datasets to alerts json (#110)
1 parent cf0fe27 commit 0beb644

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

model.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ func getAlertBody(stream string, targetId string) string {
527527
}`, stream, targetId)
528528
}
529529

530-
func getMetadataFromAlertResponse(body io.Reader) (string, string, string) {
530+
func getMetadataFromAlertResponse(body io.Reader) (string, string, string, []string) {
531531
type AlertConfig struct {
532532
Severity string `json:"severity"`
533533
Title string `json:"title"`
@@ -536,6 +536,7 @@ func getMetadataFromAlertResponse(body io.Reader) (string, string, string) {
536536
AlertType string `json:"alertType"`
537537
Tags []string `json:"tags"`
538538
Created string `json:"created"`
539+
Datasets []string `json:"datasets"`
539540
}
540541

541542
var response []AlertConfig
@@ -544,10 +545,11 @@ func getMetadataFromAlertResponse(body io.Reader) (string, string, string) {
544545
}
545546

546547
alert := response[0]
547-
return alert.Id, alert.State, alert.Created
548+
return alert.Id, alert.State, alert.Created, alert.Datasets
548549
}
549550

550-
func createAlertResponse(id string, state string, created string) string {
551+
func createAlertResponse(id string, state string, created string, datasets []string) string {
552+
datasetsJSON, _ := json.Marshal(datasets)
551553
return fmt.Sprintf(`
552554
[
553555
{
@@ -559,7 +561,8 @@ func createAlertResponse(id string, state string, created string) string {
559561
"state": "%s",
560562
"tags": [
561563
"quest-test"
562-
]
564+
],
565+
"datasets": %s
563566
}
564-
]`, created, id, state)
567+
]`, created, id, state, string(datasetsJSON))
565568
}

quest_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,9 +437,9 @@ func TestSmokeGetAlert(t *testing.T) {
437437
reader1 = bytes.NewReader(body)
438438
reader2 := bytes.NewReader(body)
439439
expected := readAsString(reader1)
440-
id, state, created := getMetadataFromAlertResponse(reader2)
440+
id, state, created, datasets := getMetadataFromAlertResponse(reader2)
441441
require.Equalf(t, 200, response.StatusCode, "Server returned http code: %s and response: %s", response.Status, body)
442-
res := createAlertResponse(id, state, created)
442+
res := createAlertResponse(id, state, created, datasets)
443443
require.JSONEq(t, expected, res, "Get alert response doesn't match with Alert config returned")
444444
DeleteAlert(t, NewGlob.QueryClient, id)
445445
DeleteTarget(t, NewGlob.QueryClient, targetId)

0 commit comments

Comments
 (0)