opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 05:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(alerting): pausing alerts requires alert id

Browse Source
This commit is contained in:
bergquist
2016-10-11 10:53:24 +02:00
parent 8b0c29b104
commit c6cf7647ff
4 changed files with 7 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/api/alerting.go
View File

@ -252,16 +252,11 @@ func NotificationTest(c *middleware.Context, dto dtos.NotificationTestCommand) R
return ApiSuccess("Test notification sent") return ApiSuccess("Test notification sent")
} }
//POST /api/pause-alert //POST /api/:alertId/pause
func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response { func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response {
alertId, err := getAlertIdForRequest(c.OrgId, dto.AlertId, dto.PanelId, dto.DashboardId)
if err != nil {
return ApiError(400, "Bad request", err)
}
cmd := models.PauseAlertCommand{ cmd := models.PauseAlertCommand{
OrgId: c.OrgId, OrgId: c.OrgId,
AlertId: alertId, AlertId: c.ParamsInt64("alertId"),
Paused: dto.Paused, Paused: dto.Paused,
} }
@ -284,30 +279,3 @@ func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response {
return Json(200, result) return Json(200, result)
} }
func getAlertIdForRequest(orgId, alertId, panelId, dashboardId int64) (int64, error) {
if alertId == 0 && dashboardId == 0 && panelId == 0 {
return 0, fmt.Errorf("Missing alertId or dashboardId and panelId")
}
if alertId == 0 {
//fetch alertId
query := models.GetAlertsQuery{
OrgId: orgId,
DashboardId: dashboardId,
PanelId: panelId,
}
if err := bus.Dispatch(&query); err != nil {
return 0, err
}
if len(query.Result) != 1 {
return 0, fmt.Errorf("PanelId is not unique on dashboard")
}
alertId = query.Result[0].Id
}
return alertId, nil
}

4
pkg/api/api.go
View File

@ -252,14 +252,12 @@ func Register(r *macaron.Macaron) {
r.Group("/alerts", func() { r.Group("/alerts", func() {
r.Post("/test", bind(dtos.AlertTestCommand{}), wrap(AlertTest)) r.Post("/test", bind(dtos.AlertTestCommand{}), wrap(AlertTest))
r.Post("/:alertId/pause", ValidateOrgAlert, bind(dtos.PauseAlertCommand{}), wrap(PauseAlert))
r.Get("/:alertId", ValidateOrgAlert, wrap(GetAlert)) r.Get("/:alertId", ValidateOrgAlert, wrap(GetAlert))
r.Get("/", wrap(GetAlerts)) r.Get("/", wrap(GetAlerts))
r.Get("/states-for-dashboard", wrap(GetAlertStatesForDashboard)) r.Get("/states-for-dashboard", wrap(GetAlertStatesForDashboard))
}) })
r.Post("/pause-alert", bind(dtos.PauseAlertCommand{}), wrap(PauseAlert))
r.Get("/alert-notifications", wrap(GetAlertNotifications)) r.Get("/alert-notifications", wrap(GetAlertNotifications))
r.Group("/alert-notifications", func() { r.Group("/alert-notifications", func() {

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

@ -61,7 +61,5 @@ type NotificationTestCommand struct {
type PauseAlertCommand struct { type PauseAlertCommand struct {
AlertId int64 `json:"alertId"` AlertId int64 `json:"alertId"`
DashboardId int64 `json:"dashboardId"`
PanelId int64 `json:"panelId"`
Paused bool `json:"paused"` Paused bool `json:"paused"`
} }

5
public/app/features/alerting/alert_list_ctrl.ts
View File

@ -47,11 +47,10 @@ export class AlertListCtrl {
var alert = _.find(this.alerts, {id: alertId}); var alert = _.find(this.alerts, {id: alertId});
var payload = { var payload = {
paused: alert.state !== "paused", paused: alert.state !== "paused"
alertId: alert.id
}; };
this.backendSrv.post(`/api/pause-alert`, payload).then(result => { this.backendSrv.post(`/api/alerts/${alert.id}/pause`, payload).then(result => {
alert.state = result.state; alert.state = result.state;
alert.stateModel = alertDef.getStateDisplayModel(result.state); alert.stateModel = alertDef.getStateDisplayModel(result.state);
}); });