7eb1ec8ba0
Test: Also clear the alert actions te be processed between tests.
...
Original commit: elastic/x-pack-elasticsearch@f6da5717aa
2014-11-24 21:14:18 +01:00
53ef534567
No need to clear the scheduler when it is going to be shut down.
...
Original commit: elastic/x-pack-elasticsearch@5e8e4134ee
2014-11-24 21:06:47 +01:00
3c896c3d44
Test: Fix mistake, this test requires cluster scope test
...
Original commit: elastic/x-pack-elasticsearch@e84b055c19
2014-11-24 18:38:03 +01:00
1a4e118d0d
Improving the starting and stop logic of the alert manager.
...
- Remove synchronized
- Add STOPPING state
- Expose alert state in stats api
- Let the test framework disable alerting before closing the test cluster
Original commit: elastic/x-pack-elasticsearch@5794f5fd8f
2014-11-24 17:35:10 +01:00
4e543ded65
Test: Move ClusterScope annotation to base alerting test class.
...
Original commit: elastic/x-pack-elasticsearch@96bb107c03
2014-11-24 16:21:45 +01:00
619afe51af
Test: use refresh and assertBusy
...
Original commit: elastic/x-pack-elasticsearch@44e0dab7ef
2014-11-24 10:15:14 +01:00
e0eecc5550
Test: ensure alerting is started before adding alerts
...
Original commit: elastic/x-pack-elasticsearch@f034d20016
2014-11-23 21:02:21 +01:00
44b9d8229f
Set the manually stopped flag we a node gets shutdown.
...
Original commit: elastic/x-pack-elasticsearch@f3841481b0
2014-11-23 20:55:40 +01:00
4e239a8be6
Test: check no master block on all nodes
...
Original commit: elastic/x-pack-elasticsearch@611ce01d69
2014-11-23 20:32:50 +01:00
beb4fada5f
Core: Changed the loading logic in AlertManager to happen all in a single forked thread only. Also retry attempts stay on the the same thread and is only done if there is a new cluster state version.
...
Test: Added first version of test that fails the elected master multiple times.
Original commit: elastic/x-pack-elasticsearch@2f7b840f5a
2014-11-21 18:15:09 +01:00
c471abdab5
Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-alerts
...
Original commit: elastic/x-pack-elasticsearch@7aee9aef96
2014-11-21 15:52:08 +00:00
e6336010be
Changed info log into debug log
...
Original commit: elastic/x-pack-elasticsearch@b142696ca5
2014-11-21 14:30:51 +01:00
97bbd747ea
DOCS : Add REST API doc for akcing alerts.
...
Original commit: elastic/x-pack-elasticsearch@633444773d
2014-11-21 12:52:31 +00:00
bb4d85a1a7
Removed error log statement
...
Original commit: elastic/x-pack-elasticsearch@8a33309b71
2014-11-21 13:44:18 +01:00
1adb25127b
Added start, stop and restart apis.
...
Closes elastic/elasticsearch#37
Original commit: elastic/x-pack-elasticsearch@6d491c4cec
2014-11-21 12:28:54 +01:00
6ea6256e35
TEST : Fix ACK test
...
Get the count AFTER we ack.
Original commit: elastic/x-pack-elasticsearch@23dacea151
2014-11-21 10:41:08 +00:00
c4787d9160
fixed bug, expected and update was swapped.
...
Original commit: elastic/x-pack-elasticsearch@78e42879be
2014-11-21 01:01:29 +01:00
178a701724
ACKS : Fix some issues when a transport client was used.
...
Original commit: elastic/x-pack-elasticsearch@9276820a90
2014-11-20 22:24:25 +00:00
42d484b62a
TEST: Add extra logging when alert didn't trigger an action.
...
Original commit: elastic/x-pack-elasticsearch@bc389fccdc
2014-11-20 22:22:50 +00:00
32e7bc45b1
REST : Add ACK Rest Action
...
This commit adds the alert ack rest action.
Original commit: elastic/x-pack-elasticsearch@73a0286863
2014-11-20 18:02:54 +00:00
bed7ddbb01
DOCS : Add some java docs.
...
Original commit: elastic/x-pack-elasticsearch@394d957364
2014-11-20 17:24:20 +00:00
a3259e9c62
TEST: Up wait time to allow things to settle down once we ACK.
...
Original commit: elastic/x-pack-elasticsearch@69f7680348
2014-11-20 17:00:21 +00:00
b1f64f4103
Fixes after merge conflicts.
...
Original commit: elastic/x-pack-elasticsearch@65adad6ea7
2014-11-20 16:28:00 +00:00
3fcae91633
Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-alerts
...
Conflicts:
src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java
src/test/java/org/elasticsearch/alerts/BootStrapTest.java
src/test/java/org/elasticsearch/alerts/actions/AlertActionsTest.java
Original commit: elastic/x-pack-elasticsearch@8dcb986dff
2014-11-20 15:44:25 +00:00
64325d4f30
THROTTLING : Add throttling support for alerts.
...
This commit adds throttling support for alerts.
If an alert is added with the throttle_state NOT_TRIGGERED
This alert can be ACKed.
If an alert is ACKed no further actions will be performed until the alert stops triggering.
If an alert is added with the throttle_period as a TimeValue alerts will only be triggered at least that TimeValue apart in time.
Original commit: elastic/x-pack-elasticsearch@65dfda7d1a
2014-11-20 15:31:04 +00:00
64d49dae5c
Forked CronExpression because it uses the default Locale to determine the maximum allowed year to be used. It now uses Locale.ENGLISH to do this.
...
Original commit: elastic/x-pack-elasticsearch@41f27aa33c
2014-11-20 15:19:35 +01:00
e3694655af
Only stop the scheduler once it is set.
...
Original commit: elastic/x-pack-elasticsearch@4238a62673
2014-11-20 14:44:31 +01:00
306fefd847
Removed useless if check
...
Original commit: elastic/x-pack-elasticsearch@c9fea5aca4
2014-11-20 12:42:41 +01:00
15d9101ea9
First stop the alert action manager and enforce started property inside alert action manager.
...
Original commit: elastic/x-pack-elasticsearch@75a98a93f5
2014-11-20 12:39:09 +01:00
cfdc061908
In the AlertsClusterStateListener fork the call to stop if we're no longer master
...
Original commit: elastic/x-pack-elasticsearch@1b40f14570
2014-11-20 12:09:12 +01:00
0438e61404
Let Quartz interrupt jobs on shutdown.
...
Original commit: elastic/x-pack-elasticsearch@3084f9b3f4
2014-11-20 11:56:48 +01:00
79b10f8c0d
Don't let Quartz check for updates.
...
Original commit: elastic/x-pack-elasticsearch@dd1e4c2577
2014-11-20 11:32:54 +01:00
ca00e59911
Make AlertManager#stop() synchronized so that the call from beforeClose waits if an stop is being performed already.
...
This prevents the test framework to complain about the fact that threads are lingering around when the test cluster has been shutdown.
Original commit: elastic/x-pack-elasticsearch@315be3f376
2014-11-20 11:12:25 +01:00
42dda5b975
Test: Let AlertActionsTest extend from AbstractAlertingTests.
...
Original commit: elastic/x-pack-elasticsearch@4c11aef8cb
2014-11-19 21:44:58 +01:00
43e6aa5b23
Moved json field variable from AlertActionEntry to AlertActionManager and made AlertActionEntry not implement ToXContent.
...
Original commit: elastic/x-pack-elasticsearch@76731aee22
2014-11-19 21:37:23 +01:00
72e9d9e4b7
Leftover from IndexAlert* to PutAlert*
...
Original commit: elastic/x-pack-elasticsearch@6af1e77e43
2014-11-19 21:32:18 +01:00
c2e4fe375d
Test: Fixed and cleanup bootstrap test
...
Original commit: elastic/x-pack-elasticsearch@7455bd8c00
2014-11-19 21:27:51 +01:00
19622d4f0b
Moved more initialization responsibilty to AlertManager.
...
Original commit: elastic/x-pack-elasticsearch@5799ecbd23
2014-11-19 18:08:56 +01:00
506daca17e
Added state to AlertManager that replaced the started flag.
...
This helps us preventing endless re-loading logic while a node steps down as master while while we in the process of starting alert store and action manager.
Original commit: elastic/x-pack-elasticsearch@e18c8215a9
2014-11-19 15:12:52 +01:00
8615cdb6af
CLEANUP : remove extraneous logging statement.
...
Original commit: elastic/x-pack-elasticsearch@b6dd5601b9
2014-11-19 12:04:15 +00:00
2954f5f9c2
Fix alert history entry parsing
...
This commit fixes the alert history parsing that was causing the tests to fail.
It now just warns on null fields and sets the search request on alert history entry creation.
Original commit: elastic/x-pack-elasticsearch@09d2b09b79
2014-11-19 11:57:14 +00:00
71d9feb9d0
Disabled request and response object fields in the alerthistory mapping template
...
Original commit: elastic/x-pack-elasticsearch@01aa6aa526
2014-11-19 12:23:41 +01:00
a6089ce8ac
Dropped the binary request and response fields and rely fully on the response and request object fields.
...
Closes elastic/elasticsearch#36
Original commit: elastic/x-pack-elasticsearch@51370ac47d
2014-11-19 12:01:55 +01:00
7f177281ae
TEST : Add alert history bootstrap test
...
This test checks if the alert history entries are loaded correctly at startup.
Also included in this commit are the fixes needed to pass this test.
Original commit: elastic/x-pack-elasticsearch@2a7859e495
2014-11-19 10:45:37 +00:00
84680f84b3
TESTS : Fix the alert stats test failure and some cleanup and docs.
...
This test fixes the alert stats test failures due the the scope being suite scope
which meant that the pass/fail was dependent on execution order for the clean start test.
Also add asciidoc for alert stats.
Original commit: elastic/x-pack-elasticsearch@be3ff86359
2014-11-19 09:33:16 +00:00
90a214f9ab
TEST fix the stats test.
...
Original commit: elastic/x-pack-elasticsearch@021cb7d5f2
2014-11-18 16:03:06 +00:00
7d27fdfc4b
TEST fix the alert serialization test to look at each field instead of compairing alerts directly.
...
Original commit: elastic/x-pack-elasticsearch@2d0d4ce6df
2014-11-18 15:46:17 +00:00
6e7ea3cc5b
Core: Add javadocs and add refresh to queue loading
...
This commit adds javadocs to the Request/Response/Action classes and
Adds a refresh to the loading of both the action queue and the alerts.
Original commit: elastic/x-pack-elasticsearch@853be114dd
2014-11-18 15:42:22 +00:00
5491e8e4b3
TESTS : Add stats test and bootstrap test
...
This commit adds tests for the stats API along with a bootstrap test.
The bootstrap test is currently failing outside of a debugger for me so I'm digging into it.
Original commit: elastic/x-pack-elasticsearch@db497a6b51
2014-11-18 11:17:00 +00:00
43043ce3ce
Added `search_type` option to the trigger search in an alert.
...
The default `search_type` is `count`.
Closes elastic/elasticsearch#38
Original commit: elastic/x-pack-elasticsearch@8e87aaea36
2014-11-17 19:02:23 +01:00
Martijn van Groningen
Brian Murphy