720 Commits

Author	SHA1	Message	Date
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
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
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
utkarshcmu	2f60929d1e	Added slack mention functionality	2016-11-04 06:05:44 -07:00
bergquist	f0d9d133c6	tech(slack): format code using gofmt	2016-11-04 07:55:15 +01:00
bergquist	b578d06e4a	chore(notification): improve log message	2016-11-03 18:04:50 +01:00
bergquist	4af420f759	tech(alerting): refactor how evalhandler uses conditions	2016-11-03 17:31:36 +01:00
bergquist	c138b04c5e	feat(alerting): avoid double logging	2016-11-03 07:25:00 +01:00
bergquist	ff5d4e8e0c	fix(alerting): temp fix for broken AND condition ... This should be refactored. lets return condition results instead of setting new value on the evalContext. The condition execution should only be able to update its own state. closes #6449	2016-11-03 07:18:39 +01:00
utkarshcmu	d009c6b953	Log bad alert config	2016-11-02 18:22:24 -07:00
utkarshcmu	942de5497e	Fixed alert message typo	2016-11-02 18:13:11 -07:00
bergquist	d1d7c240f9	tech(mailer): dont use deprecated method	2016-11-02 22:11:59 +01:00
Carl Bergquist	e659eb745d	Merge pull request #6420 from utkarshcmu/alerting_initial_state ... Alerts not sent when state is changed from "initialized" to "ok"	2016-11-01 18:30:14 +01:00
utkarshcmu	7490c49f60	Alert un paused to pending state	2016-11-01 07:58:38 -07:00
utkarshcmu	d9f2519916	Renamed Initialized to Pending	2016-11-01 07:30:55 -07:00
utkarshcmu	95117a0bc9	Added message parsing functionality	2016-10-31 14:55:21 -07:00
utkarshcmu	80fdd830de	Added override default recipient functionality	2016-10-31 14:46:51 -07:00
utkarshcmu	dcaae47e96	Fixed tests	2016-10-28 14:54:55 -07:00
utkarshcmu	4c64e45a59	Added initalized state to alerts	2016-10-28 14:44:45 -07:00