IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 01:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-12-12 11:38:31 +01:00
commit ee6cd727ea
8 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/sources/alerting/notifications.md
View File

@ -69,6 +69,7 @@ Example json body:
"ruleUrl": "http://url.to.grafana/db/dashboard/my_dashboard?panelId=2", "ruleUrl": "http://url.to.grafana/db/dashboard/my_dashboard?panelId=2",
"state": "Alerting", "state": "Alerting",
"imageUrl": "http://s3.image.url", "imageUrl": "http://s3.image.url",
"message": "Load is peaking. Make sure the traffic is real and spin up more webfronts",
"evalMatches": [ "evalMatches": [
{ {
"metric": "requests", "metric": "requests",

1
pkg/services/alerting/notifiers/email.go
View File

@ -89,6 +89,7 @@ func (this *EmailNotifier) Notify(evalContext *alerting.EvalContext) error {
if err != nil { if err != nil {
this.log.Error("Failed to send alert notification email", "error", err) this.log.Error("Failed to send alert notification email", "error", err)
return err
} }
return nil return nil

1
pkg/services/alerting/notifiers/opsgenie.go
View File

@ -112,6 +112,7 @@ func (this *OpsGenieNotifier) closeAlert(evalContext *alerting.EvalContext) erro
if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
this.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body)) this.log.Error("Failed to send notification to OpsGenie", "error", err, "body", string(body))
return err
} }
return nil return nil

1
pkg/services/alerting/notifiers/pagerduty.go
View File

@ -89,6 +89,7 @@ func (this *PagerdutyNotifier) Notify(evalContext *alerting.EvalContext) error {
if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
this.log.Error("Failed to send notification to Pagerduty", "error", err, "body", string(body)) this.log.Error("Failed to send notification to Pagerduty", "error", err, "body", string(body))
return err
} }
return nil return nil

1
pkg/services/alerting/notifiers/slack.go
View File

@ -105,6 +105,7 @@ func (this *SlackNotifier) Notify(evalContext *alerting.EvalContext) error {
if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
this.log.Error("Failed to send slack notification", "error", err, "webhook", this.Name) this.log.Error("Failed to send slack notification", "error", err, "webhook", this.Name)
return err
} }
return nil return nil

1
pkg/services/alerting/notifiers/victorops.go
View File

@ -94,6 +94,7 @@ func (this *VictoropsNotifier) Notify(evalContext *alerting.EvalContext) error {
if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
this.log.Error("Failed to send victorops notification", "error", err, "webhook", this.Name) this.log.Error("Failed to send victorops notification", "error", err, "webhook", this.Name)
return err
} }
return nil return nil

1
pkg/services/alerting/notifiers/webhook.go
View File

@ -74,6 +74,7 @@ func (this *WebhookNotifier) Notify(evalContext *alerting.EvalContext) error {
if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil { if err := bus.DispatchCtx(evalContext.Ctx, cmd); err != nil {
this.log.Error("Failed to send webhook", "error", err, "webhook", this.Name) this.log.Error("Failed to send webhook", "error", err, "webhook", this.Name)
return err
} }
return nil return nil

1
public/app/plugins/datasource/imon-datasource Submodule

@ -0,0 +1 @@
Subproject commit e8d219fa68b85dfc20762a584f4c931740ed0efa