1806 Commits

Author	SHA1	Message	Date
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
Carl Bergquist	3607316920	Merge pull request #6489 from bergquist/reduce_notification_states ... Reduce alerting states	2016-11-07 15:18:07 +01:00
bergquist	56340bfdfb	fix(influxdb): fixes bug when using regexps/numbers in tags ... closes #6488	2016-11-07 14:26:20 +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
Carl Bergquist	d670f1b959	Merge pull request #6479 from utkarshcmu/playlist_bug ... Removed playlist item when dashboard is deleted	2016-11-07 08:00:57 +01:00
bergquist	f0b591b89b	feat(alerting): extract logic state updates and notifications ... ref #6444	2016-11-07 07:57:34 +01:00
Torkel Ödegaard	2d19af601a	fix(alerting): various alerting fixes	2016-11-06 15:40:02 +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
Torkel Ödegaard	2da2d5df56	Merge branch 'master' of github.com:grafana/grafana	2016-11-04 12:15:08 +01:00
bergquist	f0d9d133c6	tech(slack): format code using gofmt	2016-11-04 07:55:15 +01:00
bergquist	2d7bb4a9f3	fix(tsdb): broken build :(	2016-11-03 19:20:53 +01:00
bergquist	b578d06e4a	chore(notification): improve log message	2016-11-03 18:04:50 +01:00
bergquist	1afe0e90f9	fix(tsdb): fixes broken legend buidler for prometheus ... closes #6456	2016-11-03 18:04:09 +01:00
bergquist	0059beb85d	chore(tsdb): remove commented code	2016-11-03 17:34:57 +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
Carl Bergquist	89a3d023ce	Merge pull request #6453 from utkarshcmu/alert_message_typo ... Log bad alert config and fixed alert message typo	2016-11-03 07:12:36 +01:00
Carl Bergquist	bb7f03c91e	Merge pull request #6446 from utkarshcmu/graphite_alerting_fix ... Fixed intervalFormat for Graphite Alerting	2016-11-03 06:58:51 +01:00
utkarshcmu	fc91231104	Fixed failing tests	2016-11-02 22:31:59 -07: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
utkarshcmu	33ee85ede9	Commented strange behavior of tests	2016-11-02 11:11:06 -07:00
utkarshcmu	a4a2e35bb2	Verified interval format function and gofmt check	2016-11-02 02:07:08 -07:00
bergquist	d4bc92b267	feat(tsdb): default tsdb httpclient	2016-11-02 08:51:34 +01:00
utkarshcmu	2088363bf9	Added tests for graphite alerting	2016-11-02 00:00:18 -07:00
utkarshcmu	1e8beb8983	Fixed intervalFormat for Graphite Alerting	2016-11-01 17:55:45 -07: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
bergquist	578507ae77	tech(cli): add default settings for transport	2016-11-01 08:58:44 +01:00
Carl Bergquist	4b8d9cac6f	Merge pull request #6437 from dmvk/feature/grafana-cli-proxy ... Take grafana-cli proxy settings from env	2016-11-01 08:53:23 +01:00
David Moravek	c6257b30c1	Take grafana-cli proxy settings from env	2016-10-31 23:14:48 +01:00