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

Fix multiple bugs

Browse Source
This commit is contained in:
John Baublitz
2018-05-20 12:12:10 -04:00
committed by bergquist
parent 3cb0e27e1c
commit fca97535d1
8 changed files with 95 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/api/dtos/alerting.go
View File

@@ -24,14 +24,15 @@ type AlertRule struct {
}
type AlertNotification struct {
Id int64 `json:"id"`
Name string `json:"name"`
Type string `json:"type"`
IsDefault bool `json:"isDefault"`
NotifyOnce bool `json:"notifyOnce"`
Frequency bool `json:"frequency"`
Created time.Time `json:"created"`
Updated time.Time `json:"updated"`
Id int64 `json:"id"`
Name string `json:"name"`
Type string `json:"type"`
IsDefault bool `json:"isDefault"`
NotifyOnce bool `json:"notifyOnce"`
Frequency string `json:"frequency"`
Created time.Time `json:"created"`
Updated time.Time `json:"updated"`
Settings *simplejson.Json `json:"settings"`
}
type AlertTestCommand struct {
@@ -64,7 +65,7 @@ type NotificationTestCommand struct {
Name string `json:"name"`
Type string `json:"type"`
NotifyOnce bool `json:"notifyOnce"`
Frequency time.Duration `json:"frequency"`
Frequency string `json:"frequency"`
Settings *simplejson.Json `json:"settings"`
}