Commit Graph

108 Commits

Author SHA1 Message Date
Martijn van Groningen 31f3830cf7 unmuted scan parse tests and don't be strict when parse the search type. (Watcher fails when it sees scan is being used)
Closes elastic/elasticsearch#484

Original commit: elastic/x-pack-elasticsearch@fea5d6a22d
2015-08-24 14:12:08 +02:00
Simon Willnauer e723c355d8 Remove unused imports - SpawnModules.java is removed
Original commit: elastic/x-pack-elasticsearch@717d38694d
2015-08-23 13:03:50 +02:00
Ryan Ernst 670b9b5ce8 Remove use of PreProcessModule
PreProcessModule was an alternate way to customize another module's
behavior inside plugins. The preferred (and only in the future) way to
do this is with onModule in the plugin itself. This change moves the
only two remaining users of PreProcessModule to do so in their
respective plugins. The use case was adding roles for shield
authorization, but these roles were really static, so there was no
reason they could not be configured up front.

Original commit: elastic/x-pack-elasticsearch@e67ac2dcb6
2015-08-21 14:23:23 -07:00
jaymode 7e552f393b fix all InetAddress forbidden apis and compile errors
This commit also fixes test shard routing compilation error and disables local address check in
the Shield IPFilter. This will be addressed in a followup, see elastic/elasticsearch#487

Original commit: elastic/x-pack-elasticsearch@984df0b131
2015-08-21 09:22:57 -04:00
jaymode 64706aefe4 mute watcher tests failing due to scan deprecation
Original commit: elastic/x-pack-elasticsearch@17f3d5c005
2015-08-20 14:06:30 -04:00
debadair dffd30d591 Updated package installation information. Closes elastic/elasticsearch#376.
Original commit: elastic/x-pack-elasticsearch@59be16531c
2015-08-19 14:10:51 -07:00
Ryan Ernst e0128daf9a Remove uses of SpawnModules
SpawnModules will be going away very soon as part of
elastic/elasticsearchelastic/elasticsearch#12783. This change removes its use from all
x-plugins.

Most spawnmodules uses here were to either collect a number of modules
into one (so the modules were just moved up into the plugin itself), or
to spawn a module which interacted with an extension point from ES. This
change moves those, as well as most uses of PreProcessModule, to use
onModule.

Original commit: elastic/x-pack-elasticsearch@6430e35379
2015-08-18 18:41:44 -07:00
Ryan Ernst 2b5cb6b9f2 Fix compile after removal of apache commons and refactoring of plugin api
Original commit: elastic/x-pack-elasticsearch@5171192d16
2015-08-18 15:35:01 -07:00
David Pilato 29f8362bce [maven] fix build issues with artifactId renaming
Related to elastic/elasticsearch#450

Original commit: elastic/x-pack-elasticsearch@780002a9de
2015-08-18 18:03:40 +02:00
David Pilato 7b10f36775 [maven] rename artifactIds from `elasticsearch-something` to `something`
When https://github.com/elastic/elasticsearch/pull/12879 will be merged, this commit should be merged as well.

```
[INFO] Reactor Summary:
[INFO]
[INFO] Elasticsearch Commercial Plugin Build Resources .... SUCCESS [  0.228 s]
[INFO] Elasticsearch X-Plugins - Parent POM ............... SUCCESS [  0.282 s]
[INFO] X-Plugins: License: Parent POM ..................... SUCCESS [  0.089 s]
[INFO] X-Plugins: License: Core ........................... SUCCESS [  0.118 s]
[INFO] X-Plugins: License: Licensor ....................... SUCCESS [  0.150 s]
[INFO] X-Plugins: License: Plugin API ..................... SUCCESS [  0.106 s]
[INFO] X-Plugins: License: Plugin ......................... SUCCESS [  0.112 s]
[INFO] X-Plugins: Shield .................................. SUCCESS [  0.234 s]
[INFO] X-Plugins: Watcher ................................. SUCCESS [  0.264 s]
[INFO] X-Plugins: Marvel .................................. SUCCESS [  0.113 s]
[INFO] QA: Parent POM ..................................... SUCCESS [  0.097 s]
[INFO] QA: Smoke Test X-Plugins ........................... SUCCESS [  0.107 s]
[INFO] QA: Shield core REST tests ......................... SUCCESS [  0.093 s]
[INFO] QA: Smoke Test Watcher's Shield integration ........ SUCCESS [  0.109 s]
```

Original commit: elastic/x-pack-elasticsearch@e9871261cf
2015-08-18 13:55:11 +02:00
Martijn van Groningen 5c09618224 Fixed compile error due to upstream change in how dynamic cluster and index settings are registered.
Original commit: elastic/x-pack-elasticsearch@21c9bfdd73
2015-08-17 14:16:42 +02:00
Martijn van Groningen d7665293cb Changed pom version to 2.1.0-SNAPSHOT
as ES core does in its master branch

Original commit: elastic/x-pack-elasticsearch@fc9b1a7327
2015-08-17 13:44:33 +02:00
uboness c8b83daf44 Removed plugin specific version classes
Now that the versions are aligned with ES version, we can just use the es `Version` class. Version compatibility is applied by the `PluginService`.

Closes elastic/elasticsearch#439

Original commit: elastic/x-pack-elasticsearch@32f305abb8
2015-08-13 17:54:38 +02:00
uboness c4e213fc92 Updated version to 2.0.0-SNAPSHOT
Original commit: elastic/x-pack-elasticsearch@8fb8035596
2015-08-13 00:05:11 +02:00
Martijn van Groningen ae7d9c3048 test: fixed test due to upstream change timed out cluster health now returns 408 instead of 200 response code.
Original commit: elastic/x-pack-elasticsearch@5a0be2e70d
2015-08-12 21:17:03 +02:00
Martijn van Groningen ca8a7bb262 added watcher+shield qa rest tests
only run watcher rest tests during verify phase
never run the rest tests with shield enabled, because that is now tested in the new qa module
removed the disabled license watcher rest tests, because the disabled license use case is already tested by the LicenseIntegrationTests
enabled the getting started rest test

Closes elastic/elasticsearch#403

Original commit: elastic/x-pack-elasticsearch@67f0f7f596
2015-08-12 14:11:45 +02:00
Martijn van Groningen 8a4260db46 test: disable getting started rest test until it gets fixed
Original commit: elastic/x-pack-elasticsearch@40ba3d6ba9
2015-08-11 14:27:11 +02:00
Martijn van Groningen 1372bdef22 test: moved smoke test to yaml rest test.
Original commit: elastic/x-pack-elasticsearch@5a8bfeee2e
2015-08-11 13:03:42 +02:00
Martijn van Groningen 682fdc3024 test: removed es core rest spec copies and fetch them during the build process instead.
Original commit: elastic/x-pack-elasticsearch@e92e3e3778
2015-08-11 10:53:48 +02:00
Martijn van Groningen 3876bde0c2 Don't use Settings#getClassLoader() because it doesn't return the classloader the plugin was being loaded with.
Closes elastic/elasticsearch#419

Original commit: elastic/x-pack-elasticsearch@1c4b4b8760
2015-08-10 16:13:15 +02:00
Adrien Grand f38b92b917 Merge pull request elastic/elasticsearch#405 from jpountz/enhancement/qa_tests
Add a skeleton for QA tests.

Original commit: elastic/x-pack-elasticsearch@97df15390c
2015-08-10 11:00:53 +02:00
Adrien Grand 2cd124d263 Add a skeleton for QA tests.
For now this just tries to install license, marvel and watcher, and then checks
that these plugins are listed in the node infos. I can do shield once I figure
out how to set it up for REST tests.

Original commit: elastic/x-pack-elasticsearch@8549f4bc5a
2015-08-10 10:55:58 +02:00
Martijn van Groningen cf1409ed02 fix watcher runner
Original commit: elastic/x-pack-elasticsearch@243fa1b153
2015-08-10 10:48:21 +02:00
Tanguy Leroux 20a65dd6ca Watcher: Fix compilation issue in WatcherF class
Related to elastic/elasticsearch@368c41666c

Original commit: elastic/x-pack-elasticsearch@ae6de46457
2015-08-10 09:55:28 +02:00
Martijn van Groningen f726a8a017 Fixed rest runners that check watcher+shield and an expired license.
* The watcher+shield test failed, but the error was ignored due to a buggy if statement that existed for the hijack rest test.
* Blacklisted the hijack test.
* Also ade sure that we run the watcher+rest test with an user that doesn't have credentials.

Original commit: elastic/x-pack-elasticsearch@61b1bf0142
2015-08-07 14:26:22 +02:00
Alexander Reelsen b433ee390c Packaging: Changing groupId to org.elasticsearch.plugin
This commit changes the groupId to the above mentioned one
so that S3 uploads will end up in the right bucket. This will
allow the Elasticsearch plugin manager to install the commercial
plugins like

```
bin/plugin install {watcher,shield,license,marvel}
```

like the official ones.

Original commit: elastic/x-pack-elasticsearch@642f1f006a
2015-08-06 15:46:48 +02:00
Robert Muir 9133f766d3 fix skip.integ.tests to work everywhere again
Original commit: elastic/x-pack-elasticsearch@9cd5ca6db8
2015-08-06 07:07:23 -04:00
Martijn van Groningen 64ee394460 There is no need to check if the primary shards of the history indices are started, since we don't load watch records any more during the Watcher startup process.
Original commit: elastic/x-pack-elasticsearch@e6bfb37477
2015-08-05 18:58:11 +02:00
Martijn van Groningen 3f0509923a Use custom metadata to remember that Watcher stopped via an explicit stop api call.
Also expose WatcherMetaData in stats api

Original commit: elastic/x-pack-elasticsearch@5581615f9c
2015-08-05 18:55:52 +02:00
uboness 5f932952f2 [watcher] Remove default timezone usage
Closes elastic/elasticsearch#387

Original commit: elastic/x-pack-elasticsearch@5382fecf10
2015-08-05 00:20:14 +02:00
Ryan Ernst cfc4c6eca2 Rename integ tests back from IT extension
Original commit: elastic/x-pack-elasticsearch@e4ffa393ba
2015-08-03 18:47:33 -07:00
Ryan Ernst ae02762b95 Rename test cases to use new test name patterns
With elastic/elasticsearchelastic/elasticsearch#12623 base test classes were renamed
to use "TestCase" suffix. This updates x-plugins to reflect those
name changes. It also renames some tests that were marked
with @Slow (which was forbidden with elastic/elasticsearchelastic/elasticsearch#12617 and
elastic/elasticsearch elastic/elasticsearch#12618) to use the IT suffix to run
under `mvn verify`.

Original commit: elastic/x-pack-elasticsearch@05ffe2f202
2015-08-03 18:18:18 -07:00
Robert Muir 875e2e67c5 switch over uses of homeFile() to binFile().getParent().
homeFile() is removed and should not be used, we need to cleanup,
but this is just a rote change to get builds green.

Original commit: elastic/x-pack-elasticsearch@05d0fb4a7c
2015-08-03 13:36:22 -04:00
jaymode 77eb27001b fix WatcherF compile error
Original commit: elastic/x-pack-elasticsearch@a8383fa2bb
2015-08-03 07:10:09 -04:00
Tanguy Leroux 101ea6deab Remove usage of Streams.copyToBytesFromClasspath()
Original commit: elastic/x-pack-elasticsearch@8f813e9275
2015-07-31 16:37:30 +02:00
Alexander Reelsen 7ec8a7ab27 CLI tool: Fix exit status changes
In elastic/elasticsearch#12165 the return value of the CLITool was changed from an integer
to the ExitStatus enum. This commit adapts the cli tools of x-plugins.

Original commit: elastic/x-pack-elasticsearch@fc6478bfa5
2015-07-30 16:06:54 +02:00
jaymode 78068bd66f apply the useBaseVersion fix to watcher as well
Original commit: elastic/x-pack-elasticsearch@f3b5d76c11
2015-07-28 11:35:20 -04:00
jaymode 868b6b01cf add isClosed method to SensitiveXContentParser
Original commit: elastic/x-pack-elasticsearch@b1cada3bfc
2015-07-24 14:44:52 -04:00
Alexander Reelsen ba5900cf0b Documentation: Fix calls for bin/plugin to be compatible with master
Original commit: elastic/x-pack-elasticsearch@e9ce3f401c
2015-07-24 12:24:44 +02:00
Robert Muir 4b5faf00ac Add description elements to pom.xml's for plugins, it goes in their metadata file
Original commit: elastic/x-pack-elasticsearch@753f7a67f4
2015-07-22 21:57:30 -04:00
Robert Muir 8dea4500c5 get watcher verify working
Original commit: elastic/x-pack-elasticsearch@56978b71f9
2015-07-22 09:49:57 -04:00
Robert Muir 0cd1aa5aa2 get build (kinda) working
Original commit: elastic/x-pack-elasticsearch@c230faf732
2015-07-22 08:49:20 -04:00
Brian Murphy 7609d5f823 [TEST] Fix test compilation
This fixes the WatchStoreTests and the TriggeredWatchStore tests with the new shard constructor.

Original commit: elastic/x-pack-elasticsearch@3d1b00b132
2015-07-21 13:56:15 -04:00
jaymode db0b745fa6 finish cleaning up exceptions
This commit finishes the exception cleanup and resolves the TODOs that were left from
the last set of exception changes and re-enables all muted tests.

Closes elastic/elasticsearch#5

Original commit: elastic/x-pack-elasticsearch@742fa948ce
2015-07-21 06:52:22 -04:00
Shaunak Kashyap 74f5441923 Fixing typo with default throttle period
Original commit: elastic/x-pack-elasticsearch@3b76955708
2015-07-17 12:01:30 -07:00
debadair aaf4cb5288 Fixed typos in examples. Closes #issue-43.
Original commit: elastic/x-pack-elasticsearch@c76c012f3d
2015-07-15 14:18:33 -07:00
Martijn van Groningen af1aaddfb1 fix compile error
Original commit: elastic/x-pack-elasticsearch@98cd0cca1b
2015-07-15 22:10:45 +02:00
jaymode 4619e71af1 remove dependency on license zip in test scope and update integration test xml
Original commit: elastic/x-pack-elasticsearch@c7b4f67b3f
2015-07-15 14:02:59 -04:00
Clinton Gormley 75550a23ab Docs: Fixed bad Shield links
Original commit: elastic/x-pack-elasticsearch@c61133ed12
2015-07-15 12:30:56 +02:00
Robert Muir cc478333b0 remove cruft
Original commit: elastic/x-pack-elasticsearch@e7a1e346fb
2015-07-14 14:12:13 -04:00
Robert Muir 700eb15ccf remove redundant dependencies
Original commit: elastic/x-pack-elasticsearch@b72a41f64d
2015-07-14 14:09:10 -04:00
Robert Muir 35b14612b0 Hook in x-dev-tools properly
Original commit: elastic/x-pack-elasticsearch@1f439bb5e9
2015-07-14 13:29:18 -04:00
Robert Muir 8d7df6a617 fix compile
Original commit: elastic/x-pack-elasticsearch@49c1192749
2015-07-14 11:55:40 -04:00
Robert Muir bb6d68bfbf optional -> provided
Original commit: elastic/x-pack-elasticsearch@87f1d8e7b4
2015-07-14 11:32:44 -04:00
Robert Muir 8e6b4ddd28 Re-enable maven assembly for watcher
Original commit: elastic/x-pack-elasticsearch@6778b2f50b
2015-07-14 09:53:09 -04:00
Robert Muir 3b63e22dce Get shield integ tests working. Watcher still has assembly issues
Original commit: elastic/x-pack-elasticsearch@68d221d776
2015-07-14 09:45:06 -04:00
uboness cef77541a4 initial merge of the build for all the sub modules
Original commit: elastic/x-pack-elasticsearch@f084b626ce
2015-07-14 12:52:25 +02:00
uboness b5d42a01c7 initial migration of watcher
Original commit: elastic/x-pack-elasticsearch@b70f48d25c
2015-07-13 12:23:07 +02:00