22 Commits

Author	SHA1	Message	Date
Torkel Ödegaard	b0c7e61ef8	feat(alerting): removed severity	2016-09-13 15:09:55 +02:00
Torkel Ödegaard	b8081b29fd	Merge branch 'master' into grafana-annotations	2016-09-08 11:26:55 +02:00
Torkel Ödegaard	d60bd77658	feat(annotations): added support to show grafana stored annotations in graphs, #5982	2016-09-08 11:25:45 +02:00
bergquist	f56d45ac56	feat(alerting): include default notifications in alert tab	2016-09-07 15:13:24 +02:00
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	22805ce56b	fix(alert_tab): fix broken alert history	2016-09-06 14:42:34 +02:00
Torkel Ödegaard	6b17cdbca6	feat(alerting): Save As removes alerts from panels, closes #5965	2016-09-06 09:14:11 +02:00
bergquist	e493015f54	fix(alerting): replace one hack with another hack	2016-08-31 10:10:39 +02:00
bergquist	53a9dec407	feat(alerting): move timestamp to new row ... ref #5850	2016-08-31 09:48:58 +02:00
bergquist	11a4ff0f8a	feat(alerting): add basic UI for history in alert tab ... ref #5850	2016-08-30 13:22:59 +02:00
bergquist	5a33679470	fix(alerting): remove has no value condition	2016-08-22 12:20:07 +02:00
Torkel Ödegaard	5cf9711862	feat(alerting): added eval match to test results	2016-08-18 11:22:24 +02:00
Torkel Ödegaard	75a6c2b612	feat(alerting): added validation that checks valid data source and checks for template variables in graphite query, #5841	2016-08-18 09:03:46 +02:00
Torkel Ödegaard	f934081bcb	feat(alerting): making progress on alerting list, #5784	2016-08-16 09:52:45 +02:00
Torkel Ödegaard	d8d951c810	feat(alerting): can now change reducer	2016-08-15 17:53:44 +02:00
Torkel Ödegaard	befca9bb2f	feat(query parts): refactoring query part component to support actions	2016-08-15 13:51:55 +02:00
Torkel Ödegaard	89ca15f3a1	feat(thresholds): lots of progress on thresholds	2016-08-11 18:25:41 +02:00
Torkel Ödegaard	72a67b39f1	feat(thresholds): more work thresholds	2016-08-11 15:18:21 +02:00
Torkel Ödegaard	61756d2ae6	feat(alerting): removed delete button	2016-08-10 07:58:40 +02:00
Torkel Ödegaard	c5e90b1801	feat(alerting): more polish on alerting tab UI	2016-07-31 21:58:12 +02:00
Torkel Ödegaard	3b69c8f687	feat(alerting): new design for alert tab with sidemenu	2016-07-31 09:31:32 +02:00