936 Commits

Author	SHA1	Message	Date
Joe Lanford	56b7e2dfaf	Added support for TLS client auth for datasource proxies (#5801)	2016-11-24 13:22:25 +01:00
Torkel Ödegaard	2233938ba7	Merge branch 'master' into getting-started-panel	2016-11-24 13:17:22 +01:00
Carl Bergquist	df2b2e3058	feat(alerting): validate alerts before saving dashboard (#6691) ... ref #6576	2016-11-24 09:50:35 +01:00
Tom Kozlowski	c21ffcc6c9	generalized database connection cert support and added to postgres	2016-11-22 15:29:22 -08:00
bergquist	6882dcfb99	feat(alerting): add backend support for median reducer	2016-11-22 14:09:35 +01:00
bergquist	50811c80ea	fix(alerting): fixes bug that prevents noData from triggering ... closes #6631	2016-11-22 11:47:52 +01:00
bergquist	2b6013ce81	fix(notifications): failed image upload should not stop notification ... closes #6638	2016-11-21 09:47:59 +01:00
Torkel Ödegaard	fd512457d8	Merge remote-tracking branch 'origin/master' into getting-started-panel-css2	2016-11-18 16:31:54 +01:00
bergquist	61bb9cbc13	test(alerting): fixes broken unit test	2016-11-18 10:53:27 +01:00
Torkel Ödegaard	7ce33c31ec	Merge branch 'master' of github.com:grafana/grafana	2016-11-17 15:50:08 +01:00
Torkel Ödegaard	62e8a039a1	refactor(alerting): refactoring PR for OR conditions, #6579	2016-11-17 15:48:15 +01:00
bergquist	3ea66ebe3f	fix(alerting): remove possible divide by zero panic ... ref #6599	2016-11-17 15:20:14 +01:00
Torkel Ödegaard	457ae74343	Merge branch 'or_alerting' of https://github.com/utkarshcmu/grafana into utkarshcmu-or_alerting	2016-11-17 14:43:24 +01:00
utkarshcmu	aae33b36dd	Added tests for firingEvaluation string	2016-11-17 01:41:23 -08:00
utkarshcmu	fc82dac868	Added braces to single condition firingEvaluation string	2016-11-17 01:30:50 -08:00
utkarshcmu	690868c837	Added firingEvalution to Rule test	2016-11-17 01:28:17 -08:00
ichekrygin	acc729131a	Add VictorOps Test.	2016-11-16 16:14:02 -08:00
ichekrygin	8f0d51171d	Resolve rebase w/ upstream conflicts. ... Remove: `Alert on Exec Error` (no longer needed) Add: `ruleUrl` to VictorOps message body.	2016-11-16 16:13:33 -08:00
ichekrygin	bbca9861fb	Fix return on nil and cleanup debug messages	2016-11-16 14:02:34 -08:00
ichekrygin	b46cbc5fbe	Add option to alert on ExecutionError	2016-11-16 14:02:34 -08:00
ichekrygin	b0620a9d4b	Add VictorOps alert notification capability	2016-11-16 14:02:34 -08:00
utkarshcmu	8d0bcd23f8	Added tests for checking nested operators	2016-11-15 08:07:05 -08:00
utkarshcmu	dfb1b1918c	Implemented operator based firiing in backend	2016-11-15 06:35:25 -08:00
bergquist	b9d709ab27	feat(alerting): improve error logging for extracting alerts ... ref #6576	2016-11-15 11:47:46 +01:00
bergquist	a87fd11f26	feat(stats): add alerts to global admin stats	2016-11-11 14:04:38 +01:00
bergquist	ad97db937c	feat(stats_usage): add stats about alerts	2016-11-11 13:57:11 +01:00
Torkel Ödegaard	575828f1e9	Merge branch 'getting-started-panel' of github.com:grafana/grafana into getting-started-panel	2016-11-10 13:25:18 +01:00
Torkel Ödegaard	fb57bf77da	ux(getting started): progress on getting started panel and persited help flag states, #6466	2016-11-09 10:41:39 +01:00
bergquist	eb34855adb	feat(pagerduty): add support for auto resolve ... closes #6513	2016-11-08 20:38:38 +01:00
utkarshcmu	610ea090dc	Send test notification fixed	2016-11-08 11:22:03 -08:00
bergquist	5542b0ab9e	tech(pagerduty): sync calls should be using context	2016-11-08 20:05:43 +01:00
Torkel Ödegaard	fd09f17cd3	docs(): alerting docs, #6490	2016-11-08 14:53:28 +01:00
utkarshcmu	841fb74b39	Reversed loop for last function	2016-11-07 23:16:57 -08:00
utkarshcmu	74632b5e98	Added last function for alerting conditions	2016-11-07 23:16:57 -08:00
bergquist	5bbdd99d35	tech(notifications): remove async webhook	2016-11-08 08:06:42 +01:00
bergquist	66f257e382	tech(pagerduty): make api call sync	2016-11-08 07:51:19 +01:00
bergquist	7bc80d0374	tech(pagerduty): declare url as constant	2016-11-08 07:50:58 +01:00
utkarshcmu	5549d8658a	Fixed description message	2016-11-07 07:27:31 -08:00
utkarshcmu	f8d1eb11a9	Removed ExecError state	2016-11-07 07:12:43 -08:00
utkarshcmu	4b53ea0a56	Fixed pagerduty tests	2016-11-07 07:08:52 -08:00
utkarshcmu	638d3bcb42	Removed NoData option	2016-11-07 07:08:51 -08:00
utkarshcmu	de0fa3d479	Added pagerduty tests	2016-11-07 07:08:51 -08:00
utkarshcmu	df8cd764b2	Added trigger options with Pagerduty	2016-11-07 07:08:51 -08:00
utkarshcmu	139bbecc10	Added Pagerduty basic alerting	2016-11-07 07:08:51 -08:00
Carl Bergquist	3607316920	Merge pull request #6489 from bergquist/reduce_notification_states ... Reduce alerting states	2016-11-07 15:18:07 +01:00
bergquist	d7f11c304c	tech(alerting): set prev state when creating eval context	2016-11-07 13:01:54 +01:00
bergquist	489f087fbd	feat(alerting): reduce states. Make exeuction result configurable. ... ref #6444	2016-11-07 12:42:39 +01:00
bergquist	f0b591b89b	feat(alerting): extract logic state updates and notifications ... ref #6444	2016-11-07 07:57:34 +01:00
utkarshcmu	c737704eeb	Removed playlist item when dashboard is deleted	2016-11-06 01:49:43 -08:00
utkarshcmu	dc3a62da83	Added slack tests , fixed webhook tests	2016-11-04 06:05:44 -07:00