59 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	fc8f0721cd	Merge branch 'master' of github.com:grafana/grafana ... Conflicts: pkg/services/alerting/eval_context.go	2016-09-06 20:40:49 +02:00
Torkel Ödegaard	fbae6abb3c	feat(alerting): progress on handling no data in alert query, #5860	2016-09-06 20:40:12 +02:00
bergquist	04690ca920	feat(alerting): add support for retries ... ref #5855	2016-09-06 15:09:49 +02:00
bergquist	7ddd625e9d	feat(alerting): add slack/email support for execution errors	2016-08-31 15:55:01 +02:00
Torkel Ödegaard	0392fde34e	feat(alerting): doing schema changes	2016-08-15 15:12:43 +02:00
bergquist	c4e905474a	feat(alerting): improve email notifications layout	2016-08-13 11:24:03 +02:00
Torkel Ödegaard	357358898d	feat(annotations): working on alert annotations, #5694	2016-08-01 10:07:00 +02:00
Torkel Ödegaard	2b276d5cd1	feat(alerting): working on alert notification and image rendering	2016-07-30 13:36:21 +02:00
Torkel Ödegaard	01da3f6cb2	feat(alerting): worked on improving slack alerts	2016-07-28 17:03:53 +02:00