Commit Graph

5044 Commits

Author SHA1 Message Date
Brian Murphy f86544497a Remove extraneous methods and change IndexAlertAction.NAME
This commit removes the uneeded addAlert methods in AlertManager and AlertsStore and
also changes the IndexAlertAction.NAME to "indices:data/write/alert/index"

Original commit: elastic/x-pack-elasticsearch@19013dcf3e
2014-11-06 11:14:58 +00:00
Brian Murphy bce97abc1d Refactor and rename transport layer
This commit removes the update action and renames the create action to index.
It also hides the Alert objects behind the interface rather than exposing them.
This means that all interactions should be via BytesReferences.

Original commit: elastic/x-pack-elasticsearch@87ac377d3e
2014-11-06 11:08:57 +00:00
Alexander Reelsen 2f4fb2cf48 Dependencies: Upgrade to Elasticsearch 1.4.0
* Configuring the transport pipeline has changed due to adding profiles in 1.4
* Lots of tests needed to be changed in order to not leave thread pools around
* ApacheDs leaves a thread lingering around, thus a ThreadLeakFilter needed to be added

Original commit: elastic/x-pack-elasticsearch@de35362fc4
2014-11-06 12:03:49 +01:00
Martijn van Groningen 0f78028190 * Update the alert version on each write
* Make AlertStore#addAlert() return a tuple<Alert, IndexResponse>

Original commit: elastic/x-pack-elasticsearch@b2f270caaf
2014-11-06 11:30:52 +01:00
Martijn van Groningen 9c81a2ab87 * Simplified add alert action logic.
* Reduce needed code to index Alert and AlertActionEntry
* Added scroll for loading action needed alert action entries

Original commit: elastic/x-pack-elasticsearch@a7b790ecc4
2014-11-06 09:40:44 +01:00
Areek Zillur abd129fa7a Refactored licensing tools to use CliTool as base
- rewrote licensing tool tests

Original commit: elastic/x-pack-elasticsearch@e5e70a491a
2014-11-05 19:29:00 -05:00
Brian Murphy 6422e8b5d5 Add IndexResponse to Update and Create Alert Responses.
This commit adds the IndexResponse if available to the Update and Create
Alert Response objects.

Original commit: elastic/x-pack-elasticsearch@5fed850c61
2014-11-05 18:08:22 +00:00
Brian Murphy 5d52c374b3 Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-alerts
Original commit: elastic/x-pack-elasticsearch@d91926ebdf
2014-11-05 17:50:54 +00:00
Brian Murphy 41821c39c6 DeleteAlert : Add the delete response to the DeleteAlertResponse
This commit adds the delete response to the DeleteAlertResponse.

Original commit: elastic/x-pack-elasticsearch@a5cc31f321
2014-11-05 17:50:05 +00:00
Areek Zillur 3bf4d2659e Use junit temporaryFolder instead of using deleteOnExit
Original commit: elastic/x-pack-elasticsearch@b437df66f5
2014-11-05 11:03:16 -05:00
Areek Zillur 9b30af3958 Remove LicensingCharset & reformat code
Original commit: elastic/x-pack-elasticsearch@be5dc1c817
2014-11-05 10:53:33 -05:00
Martijn van Groningen b07b0d497d AlertManager#stop() didn't stop, the expected and update was reversed in compareAndSet
Original commit: elastic/x-pack-elasticsearch@5b001af292
2014-11-05 16:13:22 +01:00
Martijn van Groningen 5a957ed678 Introduced dedicated alerting thread pool, which executes alert actions
Original commit: elastic/x-pack-elasticsearch@e49ecb3f7c
2014-11-05 16:08:27 +01:00
Martijn van Groningen 61a28f68e3 Upgraded to ES 1.4.0
Original commit: elastic/x-pack-elasticsearch@6685382a01
2014-11-05 16:06:36 +01:00
Brian Murphy 47a78648df Alerts : Cleanup
This commit :
1. Ensures an alert will run even if the lastFireTime is null (first time we see an alert)
2. Removes the incorrect license that existed in some of the files.
3. Cuts the BasicTest over to use the AlertsClient and deletes the alert at the end of the test
to prevent it running in a race condition.
4. Moves the execute method signatures in AlertsClient to be on a single line.

Original commit: elastic/x-pack-elasticsearch@9c3aec0127
2014-11-05 10:05:17 +00:00
Alexander Reelsen 4903852f48 Packaging: Include build information
Also added a ShieldBuild class to return

* Shield version
* Shield build hash
* Shield build timestamp

Also added a '/_shield' endpoint which returns those fields.

Original commit: elastic/x-pack-elasticsearch@38928d1ef6
2014-11-05 10:28:02 +01:00
Areek Zillur 1eec394f8f Merge branch 'master' into es_integration
Original commit: elastic/x-pack-elasticsearch@e57a626bff
2014-11-04 23:12:25 -05:00
Areek Zillur 7b6afbeb69 minor comments fix
Original commit: elastic/x-pack-elasticsearch@53e5432b55
2014-11-04 23:05:02 -05:00
Areek Zillur 3558ee76f9 remove license
Original commit: elastic/x-pack-elasticsearch@ae67cd82a5
2014-11-04 22:58:45 -05:00
Areek Zillur 3aec0fd1f0 - Fix test concurrency bugs
- Minor test fixes
- LicensesService documentation

Original commit: elastic/x-pack-elasticsearch@ab98ba8a2d
2014-11-04 22:54:27 -05:00
Areek Zillur 93944f27f2 minor fixes
Original commit: elastic/x-pack-elasticsearch@6dae7b4ee6
2014-11-04 17:38:14 -05:00
Areek Zillur 73754767dd short-circuit master notification when registering trial license
Original commit: elastic/x-pack-elasticsearch@877df7705b
2014-11-04 16:51:19 -05:00
Areek Zillur 8007136e63 cleanup tests
Original commit: elastic/x-pack-elasticsearch@b7733b8269
2014-11-04 16:12:42 -05:00
Areek Zillur 97796d3634 minor comment fixes
Original commit: elastic/x-pack-elasticsearch@fbadfc9218
2014-11-04 16:01:01 -05:00
Areek Zillur d9d04fceaf LicensesService:
- Ensure license registration can be called through any stage of consumer plugin life cycle
 - Added randomized plugin integration tests
 - Run test on plugins with different license registration scheme

Original commit: elastic/x-pack-elasticsearch@1cee85943d
2014-11-04 15:48:20 -05:00
Brian Murphy 9a2e594647 Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-alerts
Original commit: elastic/x-pack-elasticsearch@258c047506
2014-11-04 17:24:57 +00:00
Brian Murphy 4f58b9c5ff Alerts : Forgot to add the AlertsClient package.
Sorry.

Original commit: elastic/x-pack-elasticsearch@8231a3845b
2014-11-04 17:24:18 +00:00
Brian Murphy aced6039e9 Merge pull request elastic/elasticsearch#26 from elasticsearch/add-transport-actions
adds the following actions and an AlertsClient with AlertsClientInterface.
CreateAlert : Creates an alert.
UpdateAlert : Updates an existing alert.
DeleteAlert : Deletes an existing alert.
GetAlert : Gets an existing alert.

Original commit: elastic/x-pack-elasticsearch@8638fa7e35
2014-11-04 17:12:39 +00:00
Brian Murphy 9f3f23698f Merge branch 'add-transport-actions' of https://github.com/elasticsearch/elasticsearch-alerts into add-transport-actions
Conflicts:
	src/main/java/org/elasticsearch/alerts/AlertManager.java
	src/main/java/org/elasticsearch/alerts/AlertsStore.java
	src/main/java/org/elasticsearch/alerts/transport/actions/update/TransportUpdateAlertAction.java
	src/main/java/org/elasticsearch/alerts/transport/actions/update/UpdateAlertResponse.java
	src/test/java/org/elasticsearch/alerts/actions/AlertActionsTest.java

Original commit: elastic/x-pack-elasticsearch@3f1b58a2ee
2014-11-04 17:09:40 +00:00
Brian Murphy 85655ac16d Alerts : Alert Transport Layer
This commit fixes the test and tests to make sure the alert we get back from
the alertsstore isn't null in execute alert since it may have been deleted.

Original commit: elastic/x-pack-elasticsearch@7a57dd090a
2014-11-04 17:03:03 +00:00
Brian Murphy a05fc88f0d Alerts: Transport actions
Add the UpdateAction (oops) and fix the test.

Original commit: elastic/x-pack-elasticsearch@ead7d446d7
2014-11-04 16:49:56 +00:00
Brian Murphy 75ce20ecff Alerting transport layer.
This commit adds the transport layer to the alerting plugin.

Original commit: elastic/x-pack-elasticsearch@a99dce9411
2014-11-04 16:49:56 +00:00
Martijn van Groningen 669203b2a1 Removed checks for creating alert & history index from code and use index templates instead
Original commit: elastic/x-pack-elasticsearch@c81134701f
2014-11-04 17:23:05 +01:00
Brian Murphy 69942c6c79 Alerting transport layer.
This commit adds the transport layer to the alerting plugin.

Original commit: elastic/x-pack-elasticsearch@0b6cb4760f
2014-11-04 16:21:57 +00:00
Martijn van Groningen c8c30f9b28 Properly resolve the place holders in the request source
Original commit: elastic/x-pack-elasticsearch@0d19c920d1
2014-11-04 16:01:20 +01:00
Martijn van Groningen 8ba9c1c609 Cleared up the alert / alert action entry classes and how the search request in the trigger manager gets prepared.
Original commit: elastic/x-pack-elasticsearch@52b16abb53
2014-11-04 11:27:58 +01:00
Areek Zillur 6c116e2fb3 - added serialization tests
- added license signature tests
- refactor unit tests
- testing infra
- cleanup license tools
- nuked FileBasedLicenseProvider

Original commit: elastic/x-pack-elasticsearch@2af36aecfa
2014-11-03 20:57:25 -05:00
Areek Zillur e0ec8f6059 Tests & Refactoring:
- Added LicensesPluginsIntegrationTests (test with more than one consumer plugin)
 - Minor fix for LicensesService
 - Remove public_key_file from verify-license
 - WIP: STATE_NOT_RECOVERED_BLOCK tests

Original commit: elastic/x-pack-elasticsearch@372034a86a
2014-11-03 10:44:52 -05:00
Igor Motov c5f5c807bb Fix test level logging
Original commit: elastic/x-pack-elasticsearch@aa8439bd89
2014-11-02 11:23:21 -05:00
Areek Zillur dc8e3850e4 LicensesService: make sure feature registration happens only after first cluster changed event
Tests: added multiple plugin integration tests
Minor fixes

Original commit: elastic/x-pack-elasticsearch@d9a20b4a10
2014-10-31 18:31:17 -04:00
Areek Zillur 7d41146f38 LicensesService:
- remove scheduled notification offset
 - improve test to test serial notification

Original commit: elastic/x-pack-elasticsearch@fbf811efaa
2014-10-31 14:14:05 -04:00
Areek Zillur bf4d249221 minor doc fix
Original commit: elastic/x-pack-elasticsearch@88b9f7a13c
2014-10-31 12:58:28 -04:00
Areek Zillur 5051e30af2 LicensesService: Added Notification Documentation
Original commit: elastic/x-pack-elasticsearch@1337fbc9c7
2014-10-31 12:53:49 -04:00
Igor Motov 455dc77162 Add support for time in license issue and expiration dates
Original commit: elastic/x-pack-elasticsearch@27fb44ba1c
2014-10-31 12:44:18 -04:00
Areek Zillur cc2859d22f LicensesService: make sure that there are no race conditions on cluster state metaData
Original commit: elastic/x-pack-elasticsearch@095e7263b8
2014-10-31 11:36:44 -04:00
Martijn van Groningen 4373330a28 Changed the alert manager starting logic to move the loading logic down to alert store and alert action manager
Moved logic around from alert scheduler to action manager and trigger manager.

Original commit: elastic/x-pack-elasticsearch@8cba72b005
2014-10-31 10:28:42 +01:00
Igor Motov feeae1956f Enable license plugin to work on clients nodes
Original commit: elastic/x-pack-elasticsearch@1b940480ae
2014-10-30 19:58:47 -04:00
Igor Motov a107b5d70a TestConsumerPlugin shouldn't register its service on transport clients
Original commit: elastic/x-pack-elasticsearch@c9baa72a4b
2014-10-30 18:20:02 -04:00
Areek Zillur 34679d3e47 registerLicenses/trialLicenses should return currentCLusterState if not modified
Original commit: elastic/x-pack-elasticsearch@b8432ed988
2014-10-30 17:45:57 -04:00
Areek Zillur 1b9f069837 WIP: cluster integration tests
Original commit: elastic/x-pack-elasticsearch@99d055e04f
2014-10-30 17:29:55 -04:00