feat(alerting): add feature toggles for alerting functions

This commit is contained in:
bergquist 2016-05-23 07:47:38 +02:00
parent 9d016a2756
commit 45b2b4bc52
2 changed files with 20 additions and 11 deletions

View File

@ -149,17 +149,19 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) {
return
}
saveAlertCommand := m.SaveAlertsCommand{
DashboardId: cmd.Result.Id,
OrgId: c.OrgId,
UserId: c.UserId,
Alerts: cmd.GetAlertModels(),
}
if setting.AlertingEnabled {
saveAlertCommand := m.SaveAlertsCommand{
DashboardId: cmd.Result.Id,
OrgId: c.OrgId,
UserId: c.UserId,
Alerts: cmd.GetAlertModels(),
}
err = bus.Dispatch(&saveAlertCommand)
if err != nil {
c.JsonApiErr(500, "Failed to save alerts", err)
return
err = bus.Dispatch(&saveAlertCommand)
if err != nil {
c.JsonApiErr(500, "Failed to save alerts", err)
return
}
}
metrics.M_Api_Dashboard_Post.Inc(1)

View File

@ -1,8 +1,15 @@
package migrations
import . "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
import (
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/setting"
)
func addAlertMigrations(mg *Migrator) {
if !setting.AlertingEnabled {
return
}
alertV1 := Table{
Name: "alert_rule",
Columns: []*Column{