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
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
Utkarsh Bhatnagar
b382d17e34
Fixed alerting bug for mysql ( #6375 )
2016-10-25 14:52:20 +02:00
Carl Bergquist
bc90e6ce46
Alerting: Keep last state on no data ( #6354 )
...
* feat(alerting): add support to keep last state on no data
closes #6332
* refactoring(alerting PR #6354 ): added new option type for NoData option so AlertStateType does not have to contain invalid state, #6354
2016-10-22 10:56:04 +02:00
Torkel Ödegaard
4999fff29b
fix(alerting): fixed email notification so it splits email address multiple ways, fixes #6353
2016-10-22 10:24:31 +02:00
bergquist
2c7dbde06a
feat(alerting): recover from panic
2016-10-21 14:46:58 +02:00
bergquist
5bf5ed68e1
tech(notifications): replace internal email code
2016-10-21 09:06:03 +02:00
bergquist
f77799837e
feat(alerting): support for attached graphs in alert notifications
...
closes #6183
2016-10-21 09:06:03 +02:00
bergquist
ded5a0a9d5
tech(alerting): remove unused code
2016-10-21 09:05:54 +02:00
Eric Uldall
eda442dbf9
added support to login user oauth user by email only ( #6330 )
...
* added support to login user oauth user by email only
* added sql handler
* fixed model method name from GetUserByEmail to GetUserByEmailQuery
* fixed variable declaration typo
2016-10-20 06:45:10 +02:00
bergquist
6ea0f0120e
feat(notifications): switch to ; seperator
...
using \n caused problems with the json deserialisation.
closes #6326
2016-10-19 16:34:12 +02:00
bergquist
d1eceedf55
feat(webhook): add httpmethod to webhook
...
closes #6255
2016-10-18 16:50:16 +02:00
Torkel Ödegaard
4c26c55fea
fix(api): minor change to how pause alert was done
2016-10-14 09:58:22 +02:00
Torkel Ödegaard
46bab0bb37
feat(alerting): remove annotations when deleting alert, closes #6244
2016-10-14 09:43:30 +02:00
Torkel Ödegaard
c9d7eb0a7a
feat(alerting): added clear history button to alert state history view, #6244
2016-10-14 09:33:42 +02:00
bergquist
1506df8c11
feat(alerting): parse the interval value from the panel
2016-10-13 11:19:44 +02:00
bergquist
c0829903ba
fix(alerting): scope variable was updated
...
closes #6228
2016-10-12 09:46:32 +02:00
Torkel Ödegaard
b8b577eafb
fix(spelling): minor spelling fix in alerting code
2016-10-12 09:17:48 +02:00
bergquist
ccee1b3f96
fix(alerting): fix bug with unhandled error
...
closes #6239
2016-10-11 17:37:07 +02:00
bergquist
446bde2421
Merge branch 'pause_alert_rules'
...
closes #6135
2016-10-11 10:54:58 +02:00
bergquist
3162e680c2
tech(notifiers): improve logging for notifications
...
ref #6228
2016-10-11 10:15:41 +02:00
bergquist
8b0c29b104
Merge branch 'master' into pause_alert_rules
2016-10-11 09:46:48 +02:00
bergquist
264590a9c2
feat(alerting): add paused api endpoint
2016-10-10 14:26:09 +02:00
bergquist
19427b59f9
feat(alerting): do not enqueue paused rules
2016-10-10 13:29:10 +02:00
bergquist
f609623abd
style(influxdb): tidy up code
2016-10-10 11:34:52 +02:00
bergquist
d8aa38fafe
tech(influxdb): refactor and cleanup
2016-10-06 14:16:26 +02:00
bergquist
d726f49a8c
fix(notification): broken test notifications
...
ref #6159
2016-10-03 17:03:21 +02:00
bergquist
653a0502c4
tech(tsdb): add jsondata to tsdb datasource struct
2016-10-03 14:31:33 +02:00
Carl Bergquist
c38f6ff182
Make alerting notifcations sync ( #6158 )
...
* tech(routines): move the async logic from notification to alerting notifier
* tech(notification): reduce code dupe
* fix(notification): dont touch the response unless its an error
* feat(alerting): make alerting exeuction async but flow sync
* tech(alerting): remove commented code
* tech(alerting): remove unused code
* tech(alerting): fix typo
* tech(alerting): implement Context on EvalContext
* tech(alerting): wait for all alerts to return
* feat(alerting): dont allow alert responses to cancel
* Revert "feat(alerting): dont allow alert responses to cancel"
This reverts commit 324b006c96
2016-10-03 09:38:03 +02:00
Torkel Ödegaard
4a116ad4ad
fix(build): fixed failing unit test
2016-10-01 17:36:56 +02:00
Torkel Ödegaard
a6918617ff
feat(api): fixed minor issue with error message when trying to create duplicate datasource, fixes #6164
2016-10-01 16:41:27 +02:00
Torkel Ödegaard
7c339f0794
feat(alerting): show alertin state in panel header, closes #6136
2016-09-30 17:37:47 +02:00
Torkel Ödegaard
fe4a0a98c1
fix(alerting): added confirm modal in UI, when deleting alert
2016-09-30 13:00:16 +02:00
Torkel Ödegaard
5ec86a9ef4
fix(build): fixed broken build, unreachable code in migrator.go
2016-09-30 09:23:26 +02:00
Torkel Ödegaard
2b8177e3e5
fix(migration): fix for sqlstore migration, the execution of the migration and recording of the success of it was not done in same transaction, fixes #5315
2016-09-30 07:49:40 +02:00
Torkel Ödegaard
50d146e82c
fix(docs): fixed influxdb docs and mention of InfluxDB version, #6027
2016-09-29 14:53:50 +02:00
bergquist
1a062c52fa
fix(notifications): handle none configured image uploader
...
ref #6152
2016-09-29 14:31:19 +02:00
Torkel Ödegaard
75311e0626
feat(alerting): removed old init package
2016-09-28 21:27:24 +02:00
Torkel Ödegaard
80eb82420e
fix(cleanup): check if images dir exists
2016-09-28 21:12:25 +02:00
Torkel Ödegaard
c28d004731
Merge branch 'go_routines'
2016-09-28 21:06:07 +02:00
Torkel Ödegaard
71e2c6f6ef
refactor(backend): refactoring management of go routines in backend
2016-09-28 21:06:00 +02:00
bergquist
bc634f20d5
Merge branch 'master' into go_routines
2016-09-28 13:58:14 +02:00
bergquist
991539e410
style(go_routines): improve variable naming
2016-09-28 13:35:24 +02:00
Torkel Ödegaard
5ccdbf01fd
merge with master
2016-09-28 13:02:15 +02:00
