1842 Commits

Author	SHA1	Message	Date
bergquist	2b6013ce81	fix(notifications): failed image upload should not stop notification ... closes #6638	2016-11-21 09:47:59 +01:00
bergquist	5dea0fda51	fix(settings): remove nil pointer exception	2016-11-18 16:43:14 +01:00
bergquist	61bb9cbc13	test(alerting): fixes broken unit test	2016-11-18 10:53:27 +01:00
bergquist	a3b0fbcaba	fix(influxdb): fixes broken tag rendering for influxdb alerting ... closes #6626 ref #6523	2016-11-17 15:50:49 +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
Torkel Ödegaard	18e965c775	fix(error handling): fixed server side error handling page	2016-11-16 17:41:44 +01:00
Torkel Ödegaard	e3564d12a1	fix(404): fixed 404 page	2016-11-16 17:09:00 +01:00
Dan Cech	eacb7c8aba	Merge pull request #6584 from tomkozlowski/bugfix/oauth-login-bearer-token ... explicitly set oauth2 token to Bearer Type	2016-11-16 10:35:32 -05:00
Tom Kozlowski	a353c8d1bb	added explicitly setting token as Bearer Type	2016-11-16 09:55:14 -05: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	4fdfee739a	fix(influxdb): add support for regex measurments ... closes #6560	2016-11-14 08:48:19 +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
bergquist	e04d27c0b0	fix(influxdb): return internal influxdb errors ... ref #6523	2016-11-11 08:47:53 +01:00
bergquist	f924b241ae	tech(influxdb): refactor query builder ... trying to reduce the amounts of moving parts for influxdb	2016-11-10 14:38:07 +01:00
bergquist	a948dfe514	fix(influxdb): fixes broken raw query usage	2016-11-10 14:18:10 +01:00
bergquist	ecba23e883	Merge branch 'master' into influxdb_alias_seriename	2016-11-10 12:22:17 +01:00
bergquist	4f3c8c6663	fix(influxdb): add default operator ... ref #6523	2016-11-10 11:21:38 +01:00
bergquist	ef08a243c5	fix(influxdb): fixes possible nil pointer ... closes #6531	2016-11-10 08:23:58 +01:00
bergquist	82e1d3f6aa	feat(influxdb): disable debug logging in appmode	2016-11-09 14:48:05 +01:00
bergquist	f0a0e647a0	feat(influxdb): backend support for alias by segment ... ref #6510	2016-11-09 12:45:59 +01:00
bergquist	c897d39d5e	feat(influxdb): add support for serie alias replacement ... ref #6510	2016-11-09 10:22:11 +01:00
bergquist	24a3a100ed	feat(influxdb): add alias to query	2016-11-09 10:05:12 +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
bergquist	98a7bf181a	tech(influxdb): close body reader	2016-11-08 19:19:49 +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
bergquist	6dd076efc1	Merge branch 'alerting_pagerduty' of https://github.com/utkarshcmu/grafana into utkarshcmu-alerting_pagerduty	2016-11-08 07:48:20 +01:00
Roger Swingle	69ff13adce	add govcloud	2016-11-07 13:56:29 -05: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