1321 Commits

Author	SHA1	Message	Date
bergquist	946dc0ecf3	Merge branch 'alerting' into alerting_notifications	2016-06-17 07:44:39 +02:00
bergquist	1771ab032e	Merge branch 'master' into alerting	2016-06-17 07:44:21 +02:00
bergquist	8b2f6fffc9	test(dashboards): comment code in broken tests	2016-06-17 07:43:57 +02:00
Torkel Ödegaard	32479503bd	fix(build): another windows build issue	2016-06-16 21:10:30 +02:00
Torkel Ödegaard	b06ec734f1	fix(build): windows, another windows build fix, #5370	2016-06-16 18:21:12 +02:00
bergquist	b035074613	tech(alerting): disable update state api	2016-06-16 17:02:45 +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	3c4d2b8ca1	feat(alerting): add basic body for webhooks	2016-06-16 16:25:23 +02:00
bergquist	6705efef6f	feat(alerting): make some settings properties required	2016-06-16 16:18:40 +02:00
bergquist	b907ce341c	feat(alerting): enables deletes for alert notifications	2016-06-16 15:21:44 +02:00
bergquist	149c2ae913	feat(alerting): add submenu for alerting	2016-06-16 15:21:23 +02:00
Torkel Ödegaard	b039a81375	feat(build): fixing windows build issue, #5370	2016-06-16 14:36:19 +02:00
bergquist	7f767224af	feat(alerting): basic support for creating and updating notifications	2016-06-16 14:29:20 +02:00
Torkel Ödegaard	81e9aa4de4	feat(datasource): cancel in flight data source requests, refeatoring #5321	2016-06-16 10:48:26 +02:00
bergquist	00fc2e2593	test(alerting): fixes broken unittest	2016-06-16 09:09:09 +02:00
bergquist	72e23bca5f	tech(alerting): improve/cleanup logging	2016-06-16 08:56:19 +02:00
Torkel Ödegaard	23e0240410	fix(build): removed logging call that caused wrong dependency to be used	2016-06-16 08:55:36 +02:00
bergquist	4d03e04172	feat(alerting): enable email notifiter	2016-06-16 08:29:49 +02:00
bergquist	2e809cae05	tech(alerting): enforce POST for webhooks	2016-06-16 08:16:16 +02:00
bergquist	efea3bc9cb	feat(alerting): skeleton commit for webhook	2016-06-16 08:16:16 +02:00
bergquist	a3b7ea7704	feat(alerting): skeleton for alert notification configuration page	2016-06-16 08:16:16 +02:00
bergquist	4c5d2d6079	style(alerting): remove unused code	2016-06-16 08:16:16 +02:00
bergquist	b9b65cf2d4	tech(alerting): add logging about failed notifications	2016-06-16 08:16:16 +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
bergquist	8b91e57ef6	feat(alerting): notification query	2016-06-16 08:16:16 +02:00
Torkel Ödegaard	ec0b09450c	Merge branch 'export-dashboard' ... Conflicts: conf/defaults.ini pkg/setting/setting.go public/app/core/components/grafana_app.ts public/app/core/core.ts public/app/features/dashboard/dashboardCtrl.js	2016-06-16 08:06:43 +02:00
bergquist	779ea55ee0	style(alerting): rename executor -> handler	2016-06-15 11:49:20 +02:00
bergquist	777ca4cd7d	style(alerting): rename level.level to level.value	2016-06-15 11:39:25 +02:00
Torkel Ödegaard	dac8b35a1a	feat(alerting): renamed scheduler to handler	2016-06-13 15:58:22 +02:00
bergquist	7f22b9eb6e	tech(alerting): expression -> settings	2016-06-13 15:18:19 +02:00
bergquist	bb6888885e	fix(alerting): makes valid to save more explicit	2016-06-13 15:01:07 +02:00
bergquist	0d60b042c8	style(alerting): revemo commented code	2016-06-13 14:57:24 +02:00
bergquist	ca33622698	style(alerting): rename max retries	2016-06-13 14:54:06 +02:00
bergquist	3ad90c389c	style(alerting): improve naming	2016-06-13 14:01:57 +02:00
bergquist	04436c8a52	test(alerting): make sure the worst state is captured	2016-06-13 13:45:26 +02:00
bergquist	6cb4bdd6cb	feat(alerting): adds a result list to alertresult ... Since one query can return multiple series we might be interested in getting the result for each serie	2016-06-13 11:44:47 +02:00
bergquist	1e41eb8c97	tech(alerting): remove frequency from alert model	2016-06-13 10:42:36 +02:00
bergquist	94f059838c	feat(alerting): implemention duration parser	2016-06-13 10:40:46 +02:00
bergquist	2cf72715fb	test(alerting): fixes broken unit tests	2016-06-13 09:33:14 +02:00
Torkel Ödegaard	9216492d55	Merge branch 'alert_handles' into alert_ui_take2 ... Conflicts: pkg/services/alerting/commands.go	2016-06-13 07:53:13 +02:00
bergquist	77746f277d	chore(alerting): move transformers to seperate package	2016-06-13 07:46:54 +02:00
bergquist	22407fc897	fix(metrics): 64bit aligns standardcounter ... Due to a bug in golang the 64bit variable i need to come first to be 64bit aligned. https://golang.org/pkg/sync/atomic/#pkg-note-BUG closes #5341	2016-06-13 06:56:16 +02:00
Torkel Ödegaard	e3b281dbac	feat(alerting): more work on alerting thresholds	2016-06-12 11:43:18 +02:00
Torkel Ödegaard	1500c0e954	feat(alerting): alert threshold handles progress	2016-06-11 22:33:02 +02:00
Torkel Ödegaard	66c2594262	feat(alerting): sql update fixes	2016-06-11 14:08:55 +02:00
Torkel Ödegaard	71c1c0ab65	feat(alerting): trying to get things to work with new model	2016-06-11 13:49:11 +02:00
Torkel Ödegaard	0ef6801117	Merge branch 'master' into alert_ui_take2	2016-06-11 12:17:14 +02:00