Commit Graph

1600 Commits

Author SHA1 Message Date
jaymode af377e6608 re-enable rest tests
Original commit: elastic/x-pack-elasticsearch@145d449099
2015-07-07 09:34:51 -04:00
Martijn van Groningen 28e384d104 When Watcher starts verify that all index templates have been added, otherwise add the index templates
There maybe a small window of time just after Watcher has started that the index templates don't exist.

Original commit: elastic/x-pack-elasticsearch@9af3018be4
2015-07-07 14:09:03 +02:00
Martijn van Groningen 01fd8496c6 test: store triggered watch events belonging to multipel watches, so that during startup the triggered watch executions can be paralyzed.
Also increased the maximum time to wait

Original commit: elastic/x-pack-elasticsearch@142ed0a810
2015-07-07 12:54:13 +02:00
Brian Murphy 12de46e2d4 [TEST] Add logging to determine if ticker thread is being stopped correctly.
Added some trace logging and set the WatcherStatsTest to trace watcher to try and figure out why the ticker isn't stopping.

Original commit: elastic/x-pack-elasticsearch@75dc936165
2015-07-03 23:26:47 +02:00
Brian Murphy 3051cca896 Change manual stop semantics.
This change sets the manually stopped flag even if manual stop is requested but the watcher is not started.
Also clears the manually stopped flag if a manual start is initiated.

Original commit: elastic/x-pack-elasticsearch@6d5fd897ba
2015-07-03 23:21:15 +02:00
uboness 287a612179 Cleanup exceptions
Remove all watcher specific/custom exceptions. We're now reusing the standard exceptions used in core.

Original commit: elastic/x-pack-elasticsearch@26090ff6ef
2015-07-03 21:12:33 +02:00
uboness bca8f140c2 disabling rest tests
first focusing on getting a successful build without them

Original commit: elastic/x-pack-elasticsearch@cfc1e97c43
2015-07-03 20:38:19 +02:00
uboness 7350301792 Continued removing custom exceptions
- Removed `AuthorizationException` and `AuthenticationException`, both were replaced by the std `ElasticsearchSecurityException`.
- Added utility class `Exceptions` to help create authorization/authentication exceptions.
- Added a utility class `ShieldTestsUtils` that provides methods for asserting authentication/authorization exceptions

Original commit: elastic/x-pack-elasticsearch@b59360ebc7
2015-07-03 20:02:39 +02:00
jaymode a3a04a7d1d cleanup the exceptions used by Shield to only the ones in core
Original commit: elastic/x-pack-elasticsearch@5424fe68fa
2015-07-03 20:01:41 +02:00
uboness eec962f7f8 Changed the license expiration exception to ElasticsearchSecurityException
We'd like to have an UNAUTHORIZED behaviour when the license is expired

Original commit: elastic/x-pack-elasticsearch@f46a92b6f8
2015-07-03 16:01:08 +02:00
uboness 792359103d Removed LicenseExpiredException
This exception was removed from the license plugin. We use `ElasticsearchException` instead with `es.license.expired.feature` header to hold the expired feature. We use `LicenseUtils.newExpirationException` to create and throw the proper exception.

Original commit: elastic/x-pack-elasticsearch@5e722be1cc
2015-07-03 02:54:54 +02:00
Areek Zillur e0e4f07348 Replace LicenseExpiredException with ElasticsearchException.WithRestHeadersException
Original commit: elastic/x-pack-elasticsearch@36aaccc0b9
2015-07-02 18:25:13 -04:00
Martijn van Groningen f620907939 Fix compile errors due to the ParseFieldMatcher change in core (PR elastic/elasticsearch#11859)
Original commit: elastic/x-pack-elasticsearch@cccc6dcee2
2015-07-03 00:07:08 +02:00
Martijn van Groningen f58af85631 Fix WatcherF to work due to the recent upstream changes.
Original commit: elastic/x-pack-elasticsearch@cb91fd9e9f
2015-07-03 00:07:08 +02:00
Martijn van Groningen 122be138d7 build: remove Groovy dependency because it is already provided in the parent pom
Original commit: elastic/x-pack-elasticsearch@80e9ffb9fa
2015-07-03 00:07:08 +02:00
Konrad Beiske 31e2516fd6 Changed to depend only on license-plugin-api in main scope
Original commit: elastic/x-pack-elasticsearch@e508b73033
2015-07-02 11:04:29 -04:00
Konrad Beiske c9aba06721 Merge pull request elastic/elasticsearch#945 from elastic/beiske-attach-zip-assembly
Attach zip assembly as artifact to build when deploying internally

Original commit: elastic/x-pack-elasticsearch@851687bc88
2015-07-02 16:26:49 +02:00
jaymode e5cd37a9af move the core artifact to provided scope
The license core artifact is currently marked as a compile dependency but it also
shaded into the plugin jar file. This causes issues because we have the same class
in multiple jars. To workaround this, the core artifact is marked as provided so that
it is not included in the published pom file.

Closes elastic/elasticsearch#54

Original commit: elastic/x-pack-elasticsearch@0d786cb965
2015-07-02 10:25:13 -04:00
Konrad Beiske 44909bdcd6 Attach zip assembly as artifact to build when deploying internally
Attaching the zip assembly as an artifact to the build will include it when deploying to maven repositories. This will in turn facilitate testing Elasticsearch snapshot versions in a Found environment. We need to to that in order to cut down the delay from a release is made until it is available on Found.

Original commit: elastic/x-pack-elasticsearch@27516c7243
2015-07-02 16:18:03 +02:00
Konrad Beiske ba9202a5de Merge pull request elastic/elasticsearch#51 from elastic/plugin-api
Refactored api for plugins into it's own module

Original commit: elastic/x-pack-elasticsearch@8136be7e53
2015-07-02 15:19:15 +02:00
Konrad Beiske 7975e56f1e Merge branch 'master' into plugin-api
Includes porting changes made to LicenseVersion in master

Original commit: elastic/x-pack-elasticsearch@2d9919487e
2015-07-02 14:43:01 +02:00
Brian Murphy a3c5292b24 [TEST] Clean up watch created by stats test.
This may have resulted in a watch being run during shutdown.

Original commit: elastic/x-pack-elasticsearch@2631690f1a
2015-07-01 13:51:09 -04:00
jaymode b7133a516a awaits fix for another test failing due to exception serialization changes
Original commit: elastic/x-pack-elasticsearch@9585a3647b
2015-07-01 09:37:47 -04:00
jaymode b3cd671d45 add awaits fix for exception serialization issue
Original commit: elastic/x-pack-elasticsearch@6c9e993a62
2015-06-30 18:55:39 -04:00
jaymode 2d71019df9 mute tests that rely on ShieldException serialization
See elastic/elasticsearch#947

Original commit: elastic/x-pack-elasticsearch@28a69c3193
2015-06-30 18:26:45 -04:00
jaymode aef47ecc47 mute the render_search_template rest tests for now
These tests trip a Shield assertion. Need to look into how to proceed in detail.

See elastic/elasticsearch#946

Original commit: elastic/x-pack-elasticsearch@b5027ce105
2015-06-30 18:25:42 -04:00
jaymode ed0aea1311 add new action and handlers from core
Original commit: elastic/x-pack-elasticsearch@457055e5d2
2015-06-30 17:57:07 -04:00
Martijn van Groningen 1fffcc9666 fix compile error due to a rename in core
Original commit: elastic/x-pack-elasticsearch@03c9032c8b
2015-06-30 18:12:25 +02:00
Konrad Beiske f3befde555 Removed unnecessary comment blocks
Original commit: elastic/x-pack-elasticsearch@fc38cc1c30
2015-06-30 14:52:51 +02:00
jaymode 480ee9cabc only load the shield plugin for remote auditing client
Currently, any plugin that is on the classpath will be loaded by the TransportClient we create
for remote audit indexing. The only plugin that should be loaded for this client is the Shield
plugin. To accomplish this, we disable loading of plugins from the classpath and specify that
the Shield plugin should be loaded.

Closes elastic/elasticsearch#941

Original commit: elastic/x-pack-elasticsearch@2bc0a8ce17
2015-06-30 06:21:54 -04:00
Robert Muir 9edfd2f0d0 remove jar hell
Original commit: elastic/x-pack-elasticsearch@205e35baf9
2015-06-30 00:59:05 -04:00
Robert Muir 3543d7874b don't depend on ant tasks in tests
Original commit: elastic/x-pack-elasticsearch@ebbc490a2e
2015-06-30 00:56:26 -04:00
Robert Muir 0325aeeb5f Don't depend on ant tasks in tests
Original commit: elastic/x-pack-elasticsearch@f5dd00f327
2015-06-30 00:55:33 -04:00
Robert Muir 7e519222ef Merge pull request elastic/elasticsearch#636 from rmuir/securemock
Use elasticsearch securemock library

Original commit: elastic/x-pack-elasticsearch@8a6b2246b8
2015-06-29 11:09:20 -04:00
Robert Muir 9380b5c050 Merge pull request elastic/elasticsearch#942 from rmuir/securemock
Use elasticsearch securemock library

Original commit: elastic/x-pack-elasticsearch@198b7ab3b1
2015-06-29 11:08:33 -04:00
Robert Muir b368916005 Use elasticsearch securemock library
Original commit: elastic/x-pack-elasticsearch@0eccff1d6b
2015-06-29 10:46:54 -04:00
Robert Muir ebd515e6ee Use elasticsearch securemock library
Original commit: elastic/x-pack-elasticsearch@b44c85ca99
2015-06-29 10:38:52 -04:00
uboness 7cec0c97df Added time zone support to DynamicIndexName
Today `DynamicIndexName` generates the names based on UTC. This doesn't work for environments where the indices rollover is based on a local/different timezone.

The timezone can be configured:
 * globally with the `watcher.dynamic_indices.time_zone` setting
 * collectively to all `search` input, `search` transform and `index` action with `watcher.input.search.dynamic_indices.time_zone`, `watcher.transform.search.dynamic_indices.time_zone` and `watcher.actions.index.dynamic_indices.time_zone` respectively
 * locally on the watch as part of the `search` input, `search` transform and/or `index` action definition.

This commit revealed a set of bugs in the `search` input, `search` transform and/or `index` action when it comes to xcontent serialization. In short, when the user didn't define a timeout, a default timeout was set on them, which meant their serialized xcontent did not match the original one (from which they're deserialized). This bug also meant that the global default client timeouts (defined in the `ClientProxy` never took effect.

  This issue revealed the bugs above as the `WatchTests` were enhanced to execute more settings permutations

Closes elastic/elasticsearch#632

Original commit: elastic/x-pack-elasticsearch@35a2191828
2015-06-29 15:36:34 +03:00
Martijn van Groningen 0a07d6dee5 index templates: Change the TemplateUtils to be a TemplateRegistry that is responsible for maintaining the Watcher index templates.
The TemplateRegistry adds templates based on if these index templates exist in the cluster state. Components that rely on index templates register their template config with the TemplateRegistry. The TemplateRegistry adds these templates in the background when a cluster state update occurs and add component index settings to the index template. Also when component index settings change, the index template will be updated by the TemplateRegistry.

If a registered index template gets deleted, it will be added back by the TemplateRegistry in background if in a cluster state the index template is missing.

Original commit: elastic/x-pack-elasticsearch@97f4f42160
2015-06-29 12:30:39 +02:00
Martijn van Groningen 521b6e8cf3 lifecycle: Only fork a thread if we start and stop from cluster state update if the watcher state is expected
Also improved some log statements.

Original commit: elastic/x-pack-elasticsearch@7c72550c63
2015-06-26 18:43:17 +02:00
uboness fcad80b973 fixed typo in NOTICE.txt
Original commit: elastic/x-pack-elasticsearch@90bded37ea
2015-06-26 17:02:15 +03:00
uboness a459c753ad Added NOTICE.txt
- added both the `NOTICE.txt` and `LICENSE.txt` to the distribution

Original commit: elastic/x-pack-elasticsearch@5acfd50874
2015-06-26 16:49:28 +03:00
Chris Cowan c43433d580 Merge pull request elastic/elasticsearch#443 from simianhacker/feature/issues
Issues Feature

Original commit: elastic/x-pack-elasticsearch@cefd91100d
2015-06-25 11:15:19 -07:00
Chris Cowan 6c3052d1ab Merge pull request elastic/elasticsearch#437 from panda01/master
Chart and Cluster Status Directives

Original commit: elastic/x-pack-elasticsearch@cd3559db33
2015-06-25 11:14:39 -07:00
Chris Cowan e67359ca09 Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel into feature/issues
Original commit: elastic/x-pack-elasticsearch@907dc62b0c
2015-06-25 10:15:25 -07:00
uboness 266dfbb3c5 Added version 1.0.0 to WatcherVersion
Original commit: elastic/x-pack-elasticsearch@f7a0996ddf
2015-06-25 16:54:20 +02:00
uboness 39f9f53a0a Renamed the status field in the stored watch
was renamed to `_status` so it'll distinct from the other "formal" fields of the watch and also be aligned with the `_status` field that is returned by the Get API.

Also updated the installation docs

Original commit: elastic/x-pack-elasticsearch@1081b75d13
2015-06-25 15:39:19 +02:00
Martijn van Groningen 9cb7232075 test: Use utc time to create index name in test, since that is what internally is used too.
Original commit: elastic/x-pack-elasticsearch@48f300f657
2015-06-25 00:36:47 +02:00
Martijn van Groningen 193d8092db Added timeout option to the `search` transform, `search` input and `index` action.
Added default timeout setting:
* `watcher.action.index.default_timeout` sets the timeout for `index` action, if no timeout is defined in the `index` action itself.
* `watcher.input.search.default_timeout` sets the timeout for `search` input, if no timeout is defined in the `search` input itself.
* `watcher.transform.search.default_timeout`  sets the timeout for `search` transform, if no timeout is defined in the `search` transform itself.

Added general Watcher wide default timeout settings to the operations exposed in the client proxy:
* `watcher.internal.ops.search.default_timeout` for search related operations.
* `watcher.internal.ops.index.default_timeout` for index operations.
* `watcher.internal.ops.bulk.default_timeout` for bulk operations.

Original commit: elastic/x-pack-elasticsearch@5a3ef35a9d
2015-06-25 00:10:24 +02:00
Martijn van Groningen 591ea500f2 test: Fetch the status from the get response itself instead of the watch source
Original commit: elastic/x-pack-elasticsearch@ab0f4b8fe9
2015-06-24 22:29:17 +02:00