feat(alerting): working on state management

pkg/api/dtos/alerting.go

@@ -4,24 +4,17 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	m "github.com/grafana/grafana/pkg/models"
 )
 
 type AlertRuleDTO struct {
-	Id           int64   `json:"id"`
-	DashboardId  int64   `json:"dashboardId"`
-	PanelId      int64   `json:"panelId"`
-	Query        string  `json:"query"`
-	QueryRefId   string  `json:"queryRefId"`
-	WarnLevel    float64 `json:"warnLevel"`
-	CritLevel    float64 `json:"critLevel"`
-	WarnOperator string  `json:"warnOperator"`
-	CritOperator string  `json:"critOperator"`
-	Frequency    int64   `json:"frequency"`
-	Name         string  `json:"name"`
-	Description  string  `json:"description"`
-	QueryRange   int     `json:"queryRange"`
-	Aggregator   string  `json:"aggregator"`
-	State        string  `json:"state"`
+	Id          int64               `json:"id"`
+	DashboardId int64               `json:"dashboardId"`
+	PanelId     int64               `json:"panelId"`
+	Name        string              `json:"name"`
+	Description string              `json:"description"`
+	State       m.AlertStateType    `json:"state"`
+	Severity    m.AlertSeverityType `json:"severity"`
 
 	DashbboardUri string `json:"dashboardUri"`
 }
@@ -40,10 +33,10 @@ type AlertTestCommand struct {
 }
 
 type AlertTestResult struct {
-	Triggered bool                  `json:"triggerd"`
-	Timing    string                `json:"timing"`
-	Error     string                `json:"error,omitempty"`
-	Logs      []*AlertTestResultLog `json:"logs,omitempty"`
+	Firing bool                  `json:"firing"`
+	Timing string                `json:"timing"`
+	Error  string                `json:"error,omitempty"`
+	Logs   []*AlertTestResultLog `json:"logs,omitempty"`
 }
 
 type AlertTestResultLog struct {