feat(alerting): add support for alert page filter

This commit is contained in:
bergquist
2016-05-09 14:44:44 +02:00
parent 3e462f2914
commit 1be513fabd
9 changed files with 85 additions and 35 deletions
+6 -3
View File
@@ -47,6 +47,7 @@ func GetAlertChanges(c *middleware.Context) Response {
func GetAlerts(c *middleware.Context) Response {
query := models.GetAlertsQuery{
OrgId: c.OrgId,
State: c.QueryStrings("state"),
}
if err := bus.Dispatch(&query); err != nil {
@@ -78,8 +79,10 @@ func GetAlerts(c *middleware.Context) Response {
DashboardIds: dashboardIds,
}
if err := bus.Dispatch(&dashboardsQuery); err != nil {
return ApiError(500, "List alerts failed", err)
if len(alertDTOs) > 0 {
if err := bus.Dispatch(&dashboardsQuery); err != nil {
return ApiError(500, "List alerts failed", err)
}
}
//TODO: should be possible to speed this up with lookup table
@@ -128,7 +131,7 @@ func DelAlert(c *middleware.Context) Response {
func GetAlertStates(c *middleware.Context) Response {
alertId := c.ParamsInt64(":alertId")
query := models.GetAlertsStateCommand{
query := models.GetAlertsStateQuery{
AlertId: alertId,
}