414 Commits

Author	SHA1	Message	Date
bergquist	d0ca4ca3cd	chore(alerting): remove unused files	2016-08-22 17:01:23 +02:00
bergquist	26c6437846	Merge branch 'master' into alerting	2016-08-22 12:27:08 +02:00
bergquist	c663e32ea8	Merge branch 'database_url' of https://github.com/Scalingo/grafana into Scalingo-database_url	2016-08-19 13:15:44 +02:00
bergquist	d3421c671c	fix(alerting): make sure xorm can reset execution_error	2016-08-18 17:25:32 +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	63a283b4bc	feat(alerting): working on alert state filters for alert list	2016-08-17 11:00:00 +02:00
bergquist	6497b307c4	feat(alerting): save execution error upon state changed	2016-08-17 09:27:29 +02:00
bergquist	9915f15ed0	feat(alerting): adds sql layer for saving execution errors	2016-08-17 07:49:14 +02:00
Torkel Ödegaard	0b7fa3c19d	feat(alerting): minor progress on alert list, #5784	2016-08-16 16:50:36 +02:00
Torkel Ödegaard	f934081bcb	feat(alerting): making progress on alerting list, #5784	2016-08-16 09:52:45 +02:00
Torkel Ödegaard	9f29c54170	Merge branch 'query_part_refactor' into alerting ... Conflicts: pkg/services/sqlstore/migrations/alert_mig.go pkg/services/sqlstore/migrations/heartbeat_mig.go	2016-08-15 17:54:42 +02:00
Torkel Ödegaard	1418cbbd8b	feat(query_part): refactoring query part	2016-08-15 17:20:45 +02:00
Torkel Ödegaard	0392fde34e	feat(alerting): doing schema changes	2016-08-15 15:12:43 +02:00
bergquist	16e75a3036	feat(alerting): add alert message to slack integration	2016-08-12 10:12:04 +02:00
Torkel Ödegaard	1edd224168	feat(alerting): fixing failing unit tests	2016-08-01 14:34:58 +02:00
Torkel Ödegaard	357358898d	feat(annotations): working on alert annotations, #5694	2016-08-01 10:07:00 +02:00
Torkel Ödegaard	0d9b98da6d	feat(alerting): progress on email notifications	2016-07-26 12:29:52 +02:00
Torkel Ödegaard	6cb1dafb1d	feat(alerting): progress on notifications	2016-07-25 16:26:28 +02:00
Torkel Ödegaard	a6c6094775	feat(alerting): started reworking notifications	2016-07-22 16:45:17 +02:00
Torkel Ödegaard	7eb2d2cf47	feat(alerting): working on state management	2016-07-22 13:14:09 +02:00
Torkel Ödegaard	783d697529	feat(alerting): more output when testing alert	2016-07-21 21:54:12 +02:00
Torkel Ödegaard	f6a160b270	feat(alerting): testing alert is starting to work	2016-07-21 13:09:12 +02:00
Torkel Ödegaard	0f555d6ab5	fix(alerting): minor fix	2016-07-19 09:28:49 +02:00
Torkel Ödegaard	f13b869aa4	feat(alerting): work on alerting	2016-07-14 13:32:16 +02:00
Torkel Ödegaard	624cd6fc0a	feat(alerting): cleanup, removed alert changes table and code	2016-07-13 11:58:55 +02:00
Torkel Ödegaard	d9096110f8	Merge branch 'master' into alerting ... Conflicts: pkg/api/dashboard.go pkg/models/dashboards.go pkg/services/sqlstore/dashboard.go	2016-07-11 18:28:07 +02:00
Torkel Ödegaard	68a8d9bc91	feat(apps): more work on plugin dashboard sync	2016-07-08 13:41:46 +02:00
Torkel Ödegaard	85be7dd902	feat(apps): progress on app dashboard sync	2016-07-08 12:26:51 +02:00
Torkel Ödegaard	d44325affd	feat(apps): progress on app dashboard imports	2016-07-08 09:35:06 +02:00
Torkel Ödegaard	b62f1f00cd	feat(apps): auto update dashboard dashboards, #5529	2016-07-07 18:11:03 +02:00
bergquist	4fc16c36ed	feat(alerting): saves new state when alert updates	2016-06-29 00:05:48 +02:00
Soulou	03d0f11407	Accept URL parameter [database] config	2016-06-28 15:31:34 +02:00
bergquist	6bf42dde18	tech(alerting): remove some logging	2016-06-27 01:27:30 +02:00
bergquist	48e1a17ac2	feat(alerting): remove dummie values from email notifier	2016-06-23 16:30:12 +02:00
bergquist	67197d54f9	feat(alerting): add triggeredAlerts as json to alert_state	2016-06-23 11:14:40 +02:00
bergquist	488b42377b	feat(alerting): update state if not been updated for 15min	2016-06-23 11:03:27 +02:00
bergquist	5d62c84a19	feat(alerting): adds default checkbox to ui	2016-06-20 16:19:15 +02:00
bergquist	fa309ec925	feat(alerting): add default notification group	2016-06-20 15:24:48 +02:00
bergquist	96e5ad3f5c	Merge branch 'alerting' into alerting_notifications	2016-06-20 10:45:05 +02:00
bergquist	dd8c3d0355	Merge branch 'master' into alerting	2016-06-20 10:44:48 +02:00
Torkel Ödegaard	305a6ae110	feat(dashboards): dashboard sharing fixes	2016-06-17 11:36:35 +02:00
Torkel Ödegaard	10daf1d63a	Revert "Enable the "limit" param in /api/search" ... This reverts commit 3d77685108.	2016-06-17 11:22:39 +02:00
bergquist	ebada26b85	Merge branch 'alerting' into alerting_notifications	2016-06-17 08:27:58 +02:00
bergquist	e8a324c7f5	feat(alerting): add frequency back to alert model	2016-06-17 08:27:38 +02:00
bergquist	a0418da160	Merge branch 'alerting' into alerting_notifications	2016-06-16 16:49:16 +02:00
bergquist	8ec311ade4	Merge branch 'master' into alerting	2016-06-16 16:29:41 +02:00
bergquist	b907ce341c	feat(alerting): enables deletes for alert notifications	2016-06-16 15:21:44 +02:00
bergquist	9a8416416d	feat(alerting): converter for db model to notification	2016-06-16 08:16:16 +02:00
bergquist	6eca26e8ec	style(alerting): improve formating	2016-06-16 08:16:16 +02:00
bergquist	dbf3795aaf	feat(alerting): add sql layer for alert notifications	2016-06-16 08:16:16 +02:00