IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into alerting_reminder

Browse Source 
* master: (95 commits)
  registry: adds more comments
  registry: adds comments to interfaces
  changelog: update
  changelog: update
  changelog: add notes about closing #12438
  alerting: only log when screenshot been uploaded
  fixes typos
  changelog: add notes about closing #12444
  Revert "auth proxy: use real ip when validating white listed ip's"
  changelog: adds note for #11892
  changelog: add notes about closing #12430
  fix footer css issue
  Karma to Jest: 3 test files (#12414)
  fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438
  Karma to Jest: value_select_dropdown (#12435)
  support passing api token in Basic auth password (#12416)
  Add disabled styles for checked checkbox (#12422)
  changelog: add notes about closing #11920
  changelog: add notes about closing #11920
  changelog: update
  ...
This commit is contained in:
bergquist
2018-06-29 15:44:20 +02:00
parent 396f8e6464 d440b9a8d1
commit d31c7bc6a4
116 changed files with 5833 additions and 2606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/alerting/notifier.go
View File

@@ -131,7 +131,10 @@ func (n *notificationService) uploadImage(context *EvalContext) (err error) {
return err
}
n.log.Info("uploaded", "url", context.ImagePublicUrl)
if context.ImagePublicUrl != "" {
n.log.Info("uploaded screenshot of alert to external image store", "url", context.ImagePublicUrl)
}
return nil
}