Commit Graph

56 Commits

Author SHA1 Message Date
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
Tanguy Leroux f08b53eb2d Marvel: Use cluster UUID in hash function
Original commit: elastic/x-pack-elasticsearch@919f7928f0
2015-08-20 12:34:17 +02:00
Tanguy Leroux 392398c7aa Marvel: Remove and clean payload stuff
Closes elastic/elasticsearch#476

Original commit: elastic/x-pack-elasticsearch@9e90fe26f6
2015-08-20 12:31:51 +02:00
Areek Zillur ef11bc3f05 remove using License.builder in marvel test
Original commit: elastic/x-pack-elasticsearch@bef6683b12
2015-08-19 17:03:47 -04:00
Tanguy Leroux 1f41d42f39 Marvel: Use UUIDs in Marvel Docs
Related to elastic/elasticsearch#460

Original commit: elastic/x-pack-elasticsearch@ecf360eff5
2015-08-19 18:21:39 +02:00
Ryan Ernst 804cf68031 Merge pull request elastic/elasticsearch#472 from rjernst/despawn
Remove uses of SpawnModules

Original commit: elastic/x-pack-elasticsearch@09b719e9c0
2015-08-19 08:56:43 -07:00
Tanguy Leroux 2ffd79f0f6 Marvel: Add Licenses collector to ship licensing information into a dedicated index
Closes elastic/elasticsearch#369

squash

Original commit: elastic/x-pack-elasticsearch@6d6d5c08d2
2015-08-19 12:31:53 +02:00
Tanguy Leroux 3c1372b757 Marvel: Add simple launcher to run Marvel in an IDE
Original commit: elastic/x-pack-elasticsearch@a9a29796ca
2015-08-19 09:39:31 +02: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
Tanguy Leroux 9dc9a1cce7 Marvel: Mute IndexStatsCollectorTests
Original commit: elastic/x-pack-elasticsearch@7b1f2dab6d
2015-08-18 23:43:40 +02:00
Tanguy Leroux 4756f07f2b Marvel: Update settings
Original commit: elastic/x-pack-elasticsearch@2cc525e95a
2015-08-18 19:01:27 +02: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 5899dc5f46 [maven] fix build issues with artifactId renaming
Related to elastic/elasticsearch#450

Original commit: elastic/x-pack-elasticsearch@d84fc8e85f
2015-08-18 17:29:09 +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
Tanguy Leroux 4b0888926d Marvel: Do not check number type when comparing tests output
Depending on the returned value at the time the test is executed, it can be recognized as int, or long or whatever.

Original commit: elastic/x-pack-elasticsearch@0b73838f30
2015-08-17 17:29:01 +02:00
Martijn van Groningen 8b16fdfc05 Fixed compile errors due to upstream change: 008dc8ec31
Original commit: elastic/x-pack-elasticsearch@a6e567a5ab
2015-08-17 15:17:29 +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
Tanguy Leroux 1ec293a4a6 Marvel: Add indices options to Index Stats/Recovery collectors
Original commit: elastic/x-pack-elasticsearch@a4bc62dff7
2015-08-14 16:10:55 +02:00
Tanguy Leroux b3b7ca34a4 Marvel: Add additional stats to index/node stats
Closes elastic/elasticsearch#397

Original commit: elastic/x-pack-elasticsearch@0ddaeb8bb1
2015-08-14 10:37:39 +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
Adrien Grand 12e9dcc684 Add Shield testing to qa/smoke-test-plugins.
Original commit: elastic/x-pack-elasticsearch@fbbc6cefda
2015-08-11 10:54:50 +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
Tanguy Leroux e87b3d0681 Marvel: Add Cluster Stats timeout
Original commit: elastic/x-pack-elasticsearch@6a5631d124
2015-08-05 11:31:42 +02:00
Tanguy Leroux 14b30fd80c Marvel: Fix IndexRecoveryCollectorTests
This commit fixes and simplifies the IndexRecoveryCollectorTests.

closes elastic/elasticsearch#366

Original commit: elastic/x-pack-elasticsearch@9112a45e01
2015-08-04 13:42:40 +02:00
Tanguy Leroux a7645ed4f0 Fix compilation issue following removal of Streams.copyToStringFromClasspath() from core
Original commit: elastic/x-pack-elasticsearch@d7d0dfd640
2015-08-04 11:42:17 +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
Tanguy Leroux 101ea6deab Remove usage of Streams.copyToBytesFromClasspath()
Original commit: elastic/x-pack-elasticsearch@8f813e9275
2015-07-31 16:37:30 +02:00
Tanguy Leroux ed6f38b3b0 Remove unnecessary assertion from test
closes elastic/elasticsearch#368

Original commit: elastic/x-pack-elasticsearch@3076c87509
2015-07-31 13:45:02 +02:00
jaymode 4e9b7581b2 [Test] mute testNodeStatsCollector on windows
See elastic/elasticsearch#368

Original commit: elastic/x-pack-elasticsearch@ca16052340
2015-07-30 15:52:21 -04:00
jaymode 135ee1c6c8 [Test] mute failing NodeStatsRendererTests and IndexRecoveryCollectorTests
See elastic/elasticsearch#366
See elastic/elasticsearch#367

Original commit: elastic/x-pack-elasticsearch@6799bbd16e
2015-07-30 13:34:06 -04:00
Tanguy Leroux 7f42d04bf2 Marvel: Add Recovery collector
closes elastic/elasticsearch-marvelelastic/elasticsearch#452

Original commit: elastic/x-pack-elasticsearch@0cfb9b5c57
2015-07-30 17:12:32 +02:00
Tanguy Leroux 5a6e142bc8 Marvel: Add Node Stats collector
Original commit: elastic/x-pack-elasticsearch@1381905198
2015-07-30 14:37:12 +02:00
Tanguy Leroux 5b519935be Marvel: Add Cluster State collector
closes elastic/elasticsearch-marvelelastic/elasticsearch#445

Original commit: elastic/x-pack-elasticsearch@28c8b0f5af
2015-07-30 13:50:07 +02:00
Tanguy Leroux b8da63deba Marvel: Add Cluster Stats tests
Original commit: elastic/x-pack-elasticsearch@d6eb8160d0
2015-07-30 10:31:40 +02:00
Tanguy Leroux ae3c569bea Marvel: Add Cluster Stats collector
Original commit: elastic/x-pack-elasticsearch@dd96d33a00
2015-07-30 10:31:40 +02:00
Tanguy Leroux 63ddbc9adb Marvel: Refactor IndexStatsCollector to use Renderer/XContentFiltering (aka 'filter_path') feature
Original commit: elastic/x-pack-elasticsearch@562ffea0b8
2015-07-29 17:28:49 +02:00
Tanguy Leroux bedab83929 Marvel: fix test in IndexStatsCollectorTests
Closes  elastic/elasticsearch#357

Original commit: elastic/x-pack-elasticsearch@5e37eb2fcc
2015-07-29 16:37:34 +02:00
Tanguy Leroux 1628ce2061 Marvel: mute test in IndexStatsCollectorTests
Original commit: elastic/x-pack-elasticsearch@ab1230549f
2015-07-29 16:13:02 +02:00
Tanguy Leroux 597d704c17 Marvel: Add dedicated settings service
This commit adds a dedicated MarvelSettingsService to centralized all Marvel settings.

Original commit: elastic/x-pack-elasticsearch@f7b97be396
2015-07-29 15:13:49 +02:00
Tanguy Leroux e1c4285482 Marvel: Clean HttpESExporterTests and AgentUtilsTests classes
Original commit: elastic/x-pack-elasticsearch@9cd271333e
2015-07-29 11:51:00 +02:00
jaymode 6a479a6dc8 apply the useBaseVersion fix to marvel as well
Original commit: elastic/x-pack-elasticsearch@b749d78e76
2015-07-28 13:20:42 -04: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 2dbeb1273d fix marvel unit tests
Original commit: elastic/x-pack-elasticsearch@6ab4a90805
2015-07-22 10:03:21 -04:00
Robert Muir b7470ea469 Fix compilation/verify works
Original commit: elastic/x-pack-elasticsearch@62001c83cb
2015-07-22 09:38:22 -04:00
Robert Muir 0cd1aa5aa2 get build (kinda) working
Original commit: elastic/x-pack-elasticsearch@c230faf732
2015-07-22 08:49:20 -04:00
Tanguy Leroux deb6391c10 Marvel: Add integration test
Closes elastic/elasticsearch#314

Original commit: elastic/x-pack-elasticsearch@9c5d3ab862
2015-07-21 21:42:13 +02:00