1232 Commits

Author SHA1 Message Date
uboness
3f31855ded Merge branch 'migrate_shield'
Original commit: elastic/x-pack-elasticsearch@01cfbf98de
2015-07-13 12:32:03 +02:00
uboness
8babe1c456 initial migration of shield
Original commit: elastic/x-pack-elasticsearch@2bf095d3cb
2015-07-13 12:31:34 +02:00
uboness
09dd30f582 Merge branch 'migrate_watcher'
Original commit: elastic/x-pack-elasticsearch@8cec5e872a
2015-07-13 12:24:03 +02:00
uboness
b5d42a01c7 initial migration of watcher
Original commit: elastic/x-pack-elasticsearch@b70f48d25c
2015-07-13 12:23:07 +02:00
uboness
9501180fe4 initial pom.xml
Original commit: elastic/x-pack-elasticsearch@03ce181538
2015-07-13 12:12:01 +02:00
uboness
5ee82e4ae7 Initial X-Pack commit 2018-04-20 14:16:58 -07:00
Brian Murphy
53a5aa373b Bring Watcher inline with es script changes
This change allows watcher to compile against the latest es core scripting changes.
Instantiate compiled scripts and use those in tests.

Original commit: elastic/x-pack-elasticsearch@edd46a089f
2015-07-12 22:00:48 -04:00
Brian Murphy
4cf56aef12 Bring transport actions in line with master
ES master added IndexNameExpressionResolver class, which is required by all transport actions. This change adds this class to the actions as well as replacing calls to state.metadata.concreteIndices with calls to the new IndexNameExpressionResolver class.

Original commit: elastic/x-pack-elasticsearch@7938330321
2015-07-10 12:20:34 -04:00
jaymode
f71ba1f025 fix compile error due to changes in core with transport actions and MetaData
Original commit: elastic/x-pack-elasticsearch@5db2e18e31
2015-07-10 12:08:25 -04:00
Robert Muir
4b246371b4 Merge pull request elastic/elasticsearch#648 from rmuir/fix_version
bump build versions to 2.0.0.beta1-SNAPSHOT

Original commit: elastic/x-pack-elasticsearch@e97c888fca
2015-07-09 22:16:14 -04:00
Robert Muir
35d7c2d61a bump build versions to 2.0.0.beta1-SNAPSHOT
Original commit: elastic/x-pack-elasticsearch@d254c9304f
2015-07-09 21:09:47 -04:00
Robert Muir
9e36796126 Merge pull request elastic/elasticsearch#973 from rmuir/fix_version
bump version to 2.0.0.beta1-SNAPSHOT and fix broken assert.

Original commit: elastic/x-pack-elasticsearch@08c68b3d22
2015-07-09 20:20:11 -04:00
Robert Muir
e516427bfc bump version to 2.0.0.beta1-SNAPSHOT and fix broken assert.
this was already done in ES core, but commercial plugins are now sitting out of sync.

also 'mvn verify' would sometimes fail, because apparently the list of plugins from the plugin api
is not defined (my suspicion: filesystem order, which is undefined). For now I changed the assert
to allow any order.

Original commit: elastic/x-pack-elasticsearch@9ea0ac457f
2015-07-09 20:04:08 -04:00
Robert Muir
f91059d1a9 Merge pull request elastic/elasticsearch#968 from rmuir/integ_tests
packaging, config, and file permissions are busted

Original commit: elastic/x-pack-elasticsearch@74787a2123
2015-07-09 12:58:03 -04:00
Robert Muir
c3387464c6 Merge branch 'integ_tests' of github.com:rmuir/elasticsearch-shield into integ_tests
Conflicts:
	dev-tools/integration-tests.xml

Original commit: elastic/x-pack-elasticsearch@caf32d7cac
2015-07-09 12:53:21 -04:00
Robert Muir
889e63c6f5 remove chmod hack
Original commit: elastic/x-pack-elasticsearch@51bd629e5a
2015-07-09 12:52:27 -04:00
jaymode
aac2fb5b75 elasticsearch-shield back to shield
Original commit: elastic/x-pack-elasticsearch@128fda2cd3
2015-07-09 11:35:30 -04:00
jaymode
d2d5e62230 make integration tests work
Original commit: elastic/x-pack-elasticsearch@379e705138
2015-07-09 09:41:23 -04:00
Robert Muir
36f5bbd232 Merge pull request elastic/elasticsearch#646 from rmuir/integ_testing
Add integration test phase to watcher build.

Original commit: elastic/x-pack-elasticsearch@44eefe5047
2015-07-09 08:29:55 -04:00
Robert Muir
147aff97ba Merge branch 'master' into integ_testing
Original commit: elastic/x-pack-elasticsearch@dfe5ba5ff8
2015-07-09 08:27:06 -04:00
jaymode
b1147e3cb3 fix IndexAuditTrailTests
Original commit: elastic/x-pack-elasticsearch@d94ecf98e1
2015-07-09 07:21:45 -04:00
Martijn van Groningen
125a5256c9 test: if minimum performed actions count validation fails, then print out the last checked search response
Original commit: elastic/x-pack-elasticsearch@5723adc774
2015-07-09 12:50:16 +02:00
Robert Muir
f7046efd48 use java.io.tmpdir for the GET hack
Original commit: elastic/x-pack-elasticsearch@ed63b5add8
2015-07-09 02:56:41 -04:00
Robert Muir
bdb36263b3 get ES server started and stopped with shield... but many problems
Original commit: elastic/x-pack-elasticsearch@c6b6bc4c10
2015-07-09 02:48:45 -04:00
Robert Muir
7afd454663 adapt to bin/plugin changes for es plugins
Original commit: elastic/x-pack-elasticsearch@1a43ef87e0
2015-07-09 01:18:31 -04:00
Robert Muir
f0e02fd020 Add integration test phase to watcher build.
Integration tests unzip elasticsearch.zip, install the license and watcher plugins with bin/plugin,
starts up es with bin/elasticsearch, runs rest tests, then shuts down es.

They are run during `mvn verify` phase.

Original commit: elastic/x-pack-elasticsearch@f75a036fe5
2015-07-09 00:40:11 -04:00
Brian Murphy
7b386daf38 [TEST] Fix store tests to use new ShardRouting APIs
This change bring watcher back in line with ES master and the ShardRouting changes.

Original commit: elastic/x-pack-elasticsearch@211196eb04
2015-07-08 11:00:10 -04:00
Martijn van Groningen
6d80d1b0ad test: enabled the slf4j logging for subethamail smtp server to see what is failing here
Original commit: elastic/x-pack-elasticsearch@6c4b1096f9
2015-07-08 11:04:29 +02:00
Robert Muir
1d0d30538d Disable integ test until we fix it to install license-plugin
Original commit: elastic/x-pack-elasticsearch@25f5d96b71
2015-07-08 03:23:49 -04:00
Martijn van Groningen
74d178cfbe wait for put index template call to return when executed during startup, otherwise don't wait.
Original commit: elastic/x-pack-elasticsearch@689d071b4a
2015-07-08 00:20:03 +02:00
Martijn van Groningen
7f13e2ff06 test: improve index template check
Original commit: elastic/x-pack-elasticsearch@7dbf41b8b5
2015-07-07 23:21:22 +02:00
Robert Muir
e09806e21e Merge pull request elastic/elasticsearch#962 from rmuir/integ_testing
Get basic integ test working... fixes broken groupids etc.

Original commit: elastic/x-pack-elasticsearch@7d0262c29a
2015-07-07 09:50:30 -04:00
Robert Muir
23190e4aff Get basic integ test working... fixes broken groupids etc.
Note currently this just installs the plugin. we need to add some
more logic to really get some kind of integ test working with rest tests.
e.g. we need to install the license plugin. I will look into this as a followup.

Original commit: elastic/x-pack-elasticsearch@ebc507a1fb
2015-07-07 09:42:12 -04:00
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
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
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
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
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