Commit Graph

185 Commits

Author SHA1 Message Date
Jason Tedor 86596f4194 Remove use of com.google.common.hash.Hashing
This commit removes all uses of com.google.common.hash.Hashing across
the codebase. This is one of the few remaining steps in the eventual
removal of Guava as a dependency.

Relates elastic/elasticsearchelastic/elasticsearch#13224

Original commit: elastic/x-pack-elasticsearch@5b90c9a496
2015-10-02 17:24:51 +02:00
uboness 42dac35d98 fixed ClusterStatsIT test (take 2)
Original commit: elastic/x-pack-elasticsearch@28f0f7bc9d
2015-09-30 11:22:15 +02:00
Robert Muir 71127c7b4f disable flaky tests, see elastic/elasticsearch#730
Original commit: elastic/x-pack-elasticsearch@a916919e7f
2015-09-29 22:09:22 -04:00
Robert Muir e11191fd03 disable flaky tests, see elastic/elasticsearch#729
Original commit: elastic/x-pack-elasticsearch@be8fbc156e
2015-09-29 21:32:41 -04:00
uboness 6ad26f1248 fixed ClusterStatsIT test
- `ClusterStatsIT` is now `ClusterStatsTests` (moving it to maven `test` phase)
- Simplified and restructured the test
- changed the `LocalExporter` to handle the case where the marvel template was deleted. Now every time the cluster state is updated, it'll make sure the template still exists and if not put it back.
- moved all the marvel template logic to a centrailzed place (`MarvelTemplateUtils`)
- moved all es/marvel version logic to a cernralized place (`VersionUtils`)
- now the `MarvelIntegTestCase` doesn't allow the marvel template to be deleted by the test infra
- improved logging output

Original commit: elastic/x-pack-elasticsearch@502532ddad
2015-09-29 15:57:56 +02:00
Tanguy Leroux 9b4a2c906e Marvel: Mute ClusterInfoCollectorTests until licensing stuff is updated
Original commit: elastic/x-pack-elasticsearch@d1b03e7cd3
2015-09-28 11:02:32 +02:00
uboness 794fd3805b fixed ClusterInfoCollectorTests#testClusterInfoCollector
Original commit: elastic/x-pack-elasticsearch@fa7accf6f5
2015-09-26 14:51:23 +02:00
uboness dd2f0dbce5 fixed tests when shield is disabled
- also turned shield testing to be random

Original commit: elastic/x-pack-elasticsearch@9f236826ea
2015-09-26 04:30:35 +02:00
Tanguy Leroux 00f8e40a99 Fix tests
Original commit: elastic/x-pack-elasticsearch@3d76fda9d8
2015-09-26 04:30:35 +02:00
Tanguy Leroux 047022ab0f Move MarvelRestIT.java in a rest package
Original commit: elastic/x-pack-elasticsearch@b2e90bb3ea
2015-09-26 04:30:35 +02:00
Tanguy Leroux 6f557f3640 Remove static in MarvelIntegTestCase.java so that LocalExporterTests can be executed after HttpExporterTests
Original commit: elastic/x-pack-elasticsearch@d8363ed606
2015-09-26 04:30:35 +02:00
Tanguy Leroux 72675e711d Remove static stuff in MarvelSettings
Original commit: elastic/x-pack-elasticsearch@e534397299
2015-09-26 04:30:35 +02:00
uboness 78d006dbcc cleanup
- moved `MIN_SUPPORTED_TEMPLATE_VERSION` to `Exporter`

Original commit: elastic/x-pack-elasticsearch@75df7cb083
2015-09-26 04:30:35 +02:00
uboness 1cd5b51283 cleaned up forbidden apis
Original commit: elastic/x-pack-elasticsearch@9d42f8d07d
2015-09-26 04:30:35 +02:00
uboness 71b0b121f7 Fixed the cluster state handling in local exporter
- addded additional tests for local exporter

Original commit: elastic/x-pack-elasticsearch@b188394078
2015-09-26 04:30:35 +02:00
uboness 8fa83b9109 Cleaned up local exporter
- remove state - the existing of the internal `bulk` is enough to determine the state of the exporter. When the exporter is started, the bulk is instantiated.
- simplified & structured the startup of the exporter - now it listens to cluster state events and acts on those, rather than fetching & checking the cluster state on demand.
- the master is responsible for "putting" the marvel template... everything else will just wait for the right template to appear in the cluster state.
- started to fix the local exporter tests

Original commit: elastic/x-pack-elasticsearch@7fae23d166
2015-09-26 04:30:35 +02:00
uboness 899f359946 Enhanced local exporter
- fixed concurrency issues
- started to work on fixing the tests

Original commit: elastic/x-pack-elasticsearch@3cfc4d2cda
2015-09-26 04:30:35 +02:00
uboness a86bb7b140 Introduced `ExportBulk`
- bulk abstraction on top of exporter
- removed queuing and bulk processor from local exporter
- started to adjust tests to shield (require a lot of helper methods in `MarvelInegTestCase`)
- moved index name resolution to `Exporter` (functionality shared between all exporters)

Original commit: elastic/x-pack-elasticsearch@86b495622c
2015-09-26 04:30:34 +02:00
uboness 3162097ce8 disabled licensing tests until license refactoring is done
Original commit: elastic/x-pack-elasticsearch@e5673fedd9
2015-09-26 04:30:34 +02:00
uboness 075707e12c cleanup for local exporter
Original commit: elastic/x-pack-elasticsearch@b715ab7ca1
2015-09-26 04:30:34 +02:00
Tanguy Leroux e2719ab213 Add tests for LocalExporter
Original commit: elastic/x-pack-elasticsearch@a1866a9c39
2015-09-26 04:30:34 +02:00
Tanguy Leroux da4b259c48 Remove start/stop in Exporter(s)
Original commit: elastic/x-pack-elasticsearch@9ddcb8119b
2015-09-26 04:30:34 +02:00
Tanguy Leroux 415f6eda79 Add LocalExporter implementation
Original commit: elastic/x-pack-elasticsearch@36a683294c
2015-09-26 04:30:34 +02:00
uboness 1c5e03a239 fixed tests
Original commit: elastic/x-pack-elasticsearch@bea8d61278
2015-09-26 04:30:34 +02:00
uboness 57561f9a03 cleaned up `HttpExporterUtils`
Original commit: elastic/x-pack-elasticsearch@2db95799ea
2015-09-26 04:30:34 +02:00
uboness c85f0f4564 Fixed the integration tests
- prepared the ground for shield integration tests.
- for now, `shield` is disabled for all integration tests (once we have the `local` exporter we'll be able to turn shield on.

Original commit: elastic/x-pack-elasticsearch@cf5d660f58
2015-09-26 04:30:34 +02:00
uboness 345efb38d6 Cleaned up warnings in `SecuredClient`
Original commit: elastic/x-pack-elasticsearch@b8f52f1518
2015-09-26 04:30:34 +02:00
uboness 53b2fb9826 cleaned up `Exporters`
- also added additional unit tests for this class

Original commit: elastic/x-pack-elasticsearch@c16891a50a
2015-09-26 04:30:33 +02:00
uboness 7206de9c2a Adding multiple exporter types
- an exporter is no longer fixed construct. Instead, this commit creates an `Exporter` abstraction. An exporter has a type and is responsible for exporting marvel documents.
- multiple exporters can be configured, each can be of a different type.
- an exporter can be of a "singleton" type, indicating that there can only be one exporter of that type at any point in time.
- exporters are configured in the settings. Each exporters is identified by a unique name/id and has its own settings (the type of the exporter defines what settings that exporter expects)
- exporters are loaded at start up time, but it is also possible to update the exporter settings at runtime (all exporter settings are registered as dynamic cluster settings). When updated, all the exporters will be rebuild & reloaded.
- there are two types of exporters: `http` and `local`
- `http` exporter exports documents to external elasticsearch clusters using the REST API
- the new `http` exporter doesn't support user info as part of the URL (it's pron to security info leak). Instead a new `auth.username` and `auth.password` settings were added that can be set per `http` exporter (when shield is installed, the passwords are filtered out from the node info API)
- `local` exporter exports documents to the same cluster the agent is installed on, using the internal node client.
- when no exporter is configured, a default `local` exporter is created (for best ootb experience)

Original commit: elastic/x-pack-elasticsearch@d1d7c8aefd
2015-09-26 04:30:33 +02:00
uboness 334e090902 Shield Integration
- Adds internal `__marvel_user`
- Adds a `SecuredClient` that binds the internal marvel user to all requests it sends

Original commit: elastic/x-pack-elasticsearch@77c4716261
2015-09-26 04:30:33 +02:00
javanna 22edda4044 [TEST] fix method clashes due to randomTimeValue addition to ESTestCase
Original commit: elastic/x-pack-elasticsearch@74bd522bf8
2015-09-25 16:45:11 +02:00
Nik Everett 974ae21899 Remove eclipse configuration files
These files are generated automatically with eclipse:eclipse so they shouldn't
be tracked in the repository.

Original commit: elastic/x-pack-elasticsearch@3869ddebfa
2015-09-24 14:08:49 -04:00
jaymode 6a7462be3e update the IPFilter to always allow traffic from a bound address
This change updates the IPFilter to always allow traffic from the bound addresses of the node
even if they have been explicitly disabled. This behavior can be disabled through a setting but
that could be dangerous if the blocking rule is added via a persistent setting stored in the cluster
state.

Closes elastic/elasticsearch#487

Original commit: elastic/x-pack-elasticsearch@4c1cf9455f
2015-09-23 10:30:43 -04:00
Robert Muir f610a347f0 Fix all doclint errors and warnings (so compile does not break with https://github.com/elastic/elasticsearch/pull/13702)
Original commit: elastic/x-pack-elasticsearch@6a05dcd6a2
2015-09-22 00:09:11 -04:00
Tanguy Leroux a5dcb52ba8 Marvel: Add Fielddata stats to index_stats
Closes elastic/elasticsearch#671

Original commit: elastic/x-pack-elasticsearch@eabd7eab20
2015-09-21 16:27:02 +02:00
Tanguy Leroux 34937604e1 Marvel: Remove marvel_ prefix from Marvel document types
Closes elastic/elasticsearch#669

Original commit: elastic/x-pack-elasticsearch@2e04ce186a
2015-09-21 15:58:39 +02:00
Tanguy Leroux 4d829951b4 Marvel: Disable indexing for nodes attribute in cluster state documents
Closes elastic/elasticsearch#658

Original commit: elastic/x-pack-elasticsearch@bb501aa5b8
2015-09-18 14:24:52 +02:00
Tanguy Leroux db13d99cdf Marvel: Mute IndexStatsCollectorTests
Original commit: elastic/x-pack-elasticsearch@c8746d7ea2
2015-09-18 14:24:28 +02:00
Tanguy Leroux fdae10ff74 Marvel: Additional metrics for marvel_node_stats
indices.indexing.index_total
indices.indexing.index_time_in_millis
indices.search.query_total
indices.search.query_time_in_millis

closes elastic/elasticsearch#661

Original commit: elastic/x-pack-elasticsearch@f9892e5b85
2015-09-18 10:25:56 +02:00
Tanguy Leroux a640ab6bec Marvel: Store shards as individual documents in marvel_shards
Closes elastic/elasticsearch#581

Original commit: elastic/x-pack-elasticsearch@059ad5f09f
2015-09-18 10:16:32 +02:00
Tanguy Leroux 81dc0ee210 Marvel: Use Version in index template
Original commit: elastic/x-pack-elasticsearch@6ee3300773
2015-09-18 10:05:33 +02:00
Tanguy Leroux e08e587eb9 Marvel: Add heap to ClusterStats
Closes elastic/elasticsearch#593

Original commit: elastic/x-pack-elasticsearch@87a467ff13
2015-09-17 09:51:20 +02:00
Ryan Ernst 018dd53ffc Move rest-api-spec tests to resources dirs
See elastic/elasticsearchelastic/elasticsearch#13611

Original commit: elastic/x-pack-elasticsearch@cc26a1a9db
2015-09-16 11:09:46 -07:00
Simon Willnauer d1c2698595 Fix forbidden API usage from upstream
Original commit: elastic/x-pack-elasticsearch@2bfcc83477
2015-09-15 15:51:22 +02:00
Tanguy Leroux 4ac8b87f3b Marvel: Update release notes
Original commit: elastic/x-pack-elasticsearch@31b17e5115
2015-09-14 11:17:34 +02:00
Simon Willnauer 6fb4f7817c Use method references rather than Class instances to register transport handler.
This is caused by upstream changes in core.

Original commit: elastic/x-pack-elasticsearch@67f602abd1
2015-09-14 10:07:35 +02:00
Lee Hinman 4a8df4f328 Update eclipse files for Java 1.8 move
Original commit: elastic/x-pack-elasticsearch@a2dd77ccf3
2015-09-10 10:04:31 -06:00
Martijn van Groningen cdc3a142e5 fixed compile error
Original commit: elastic/x-pack-elasticsearch@73d853b077
2015-09-10 17:36:06 +02:00
Ryan Ernst fbbd3f6c2d Add warning suppressions
I fixed a couple more warnings and added suppressions, so that when
 elastic/elasticsearchelastic/elasticsearch#13410 lands, x-plugins will not break.

Original commit: elastic/x-pack-elasticsearch@8a19b2b71b
2015-09-09 12:45:20 -07:00
Ryan Ernst 5dd5f525b5 Remove some warnings caught by -Xlint
Original commit: elastic/x-pack-elasticsearch@50bea927cf
2015-09-09 00:16:13 -07:00
Ryan Ernst 2ab0db4373 Fix compile issues after removal of loadConfigSettings from transport
client

Original commit: elastic/x-pack-elasticsearch@2efe4f2980
2015-09-08 17:22:54 -07:00
uboness 533c14242f Bumped the version to 3.0.0-SNAPSHOT
Original commit: elastic/x-pack-elasticsearch@0771b3e589
2015-09-04 16:30:11 +02:00
Alexander Reelsen 8934f3436b Marvel: Ensure marvel is not deployed
In order to not accidentally release marvel in its current state
this removes marvel in the S3 upload as well as not deploying
marvel to artifactory.

Original commit: elastic/x-pack-elasticsearch@cb6088e18b
2015-09-04 11:00:37 +02:00
Tanguy Leroux 93f6b705e4 Marvel: Fix various tests inconsistencies
Original commit: elastic/x-pack-elasticsearch@1b122ecd40
2015-09-02 16:24:59 +02:00
Tanguy Leroux 892eeaf845 Marvel: Fix test issue in ClusterInfoIT
Original commit: elastic/x-pack-elasticsearch@b6cb867d52
2015-09-02 11:13:53 +02:00
Tanguy Leroux 8c6b0d03d4 Marvel: Rename cluster_licenses to cluster_info and add additional stats
Closes elastic/elasticsearch#490

Original commit: elastic/x-pack-elasticsearch@6dceb5b20c
2015-09-02 10:06:38 +02:00
Tanguy Leroux 47ba724498 Marvel: Update .marvel indices naming
Closes elastic/elasticsearch#527, elastic/elasticsearch#458

Original commit: elastic/x-pack-elasticsearch@f3fb15f88c
2015-09-02 09:36:41 +02:00
Tanguy Leroux 7a59749392 Marvel: Add Indices Stats collector
Closes elastic/elasticsearch#555

Original commit: elastic/x-pack-elasticsearch@63a0e02258
2015-09-02 09:04:33 +02:00
Tanguy Leroux 9e5053a5c0 Marvel: Prints settings values in MarvelSettingsTests and remove smallest random time values
Original commit: elastic/x-pack-elasticsearch@488306ba63
2015-09-01 15:01:46 +02:00
Tanguy Leroux 794b2e0089 Marvel: Remove AwaitFix on NodeStatsRendererTests
Now thread pools are sorted by names in elasticsearch core (see elastic/elasticsearchelastic/elasticsearch#13121)

Closes elastic/elasticsearch#367

Original commit: elastic/x-pack-elasticsearch@d2fab327c0
2015-09-01 14:15:22 +02:00
Tanguy Leroux 37fc05dc4c Marvel: Ad IT tests for Cluster State, Cluster Stats and Node Stats collectors
Closes elastic/elasticsearch#445, elastic/elasticsearch#444

Original commit: elastic/x-pack-elasticsearch@cd82064098
2015-09-01 11:06:27 +02:00
Tanguy Leroux 541644fbb2 Marvel: Remove usages of Guava's ImmutableMap and Predicate
Original commit: elastic/x-pack-elasticsearch@71d0a7f436
2015-09-01 09:44:43 +02:00
Martijn van Groningen 593fc30669 Fix main class runners
Original commit: elastic/x-pack-elasticsearch@28a90a19b8
2015-08-31 22:45:56 +02:00
Jason Tedor 473e0af11f Remove use of com.google.common.collect.ImmutableList in Marvel
Original commit: elastic/x-pack-elasticsearch@1e1a6223fd
2015-08-31 15:51:14 -04:00
Tanguy Leroux 0dbd13b67c Marvel: Update tests due to changes in elasticsearch core
Original commit: elastic/x-pack-elasticsearch@7224989d22
2015-08-31 11:46:58 +02:00
Jason Tedor 8cc9531bcb Update for API changes in 5e2efcfe09
Original commit: elastic/x-pack-elasticsearch@5cf5f71ba6
2015-08-30 12:42:29 -04:00
Tanguy Leroux a14a11ebdb Marvel: Mute IndexStatsCollectorTests
Original commit: elastic/x-pack-elasticsearch@aaea8e8715
2015-08-28 16:24:56 +02:00
Tanguy Leroux 0e365a7670 Marvel: Add indices.count in Cluster Stats
Closes elastic/elasticsearch#517

Original commit: elastic/x-pack-elasticsearch@6ecbf3d1ee
2015-08-28 13:50:09 +02:00
debadair 6da0a38ebf Set up Marvel 2.0 docs structure.
Original commit: elastic/x-pack-elasticsearch@344c7c2458
2015-08-27 10:31:37 -07:00
Tanguy Leroux 64bbc110ff Marvel: Fixes for Index Stats Collector tests
Original commit: elastic/x-pack-elasticsearch@4fdc11946e
2015-08-27 14:14:07 +02:00
Tanguy Leroux 38061c5f98 Marvel: Wait for shard allocation in IndexStatsCollectorTests
Original commit: elastic/x-pack-elasticsearch@f75c36f945
2015-08-26 18:00:19 +02:00
Tanguy Leroux 8e5521a427 Move license status as calculated method
Original commit: elastic/x-pack-elasticsearch@92ce1d9d55
2015-08-26 10:26:27 +02:00
Tanguy Leroux 8d48382bab Marvel: Mute LicensesRendererIT test
Awaits fix for elastic/elasticsearchelastic/elasticsearch#13017

Original commit: elastic/x-pack-elasticsearch@d63df50a4a
2015-08-26 10:13:24 +02:00
Areek Zillur b24378b775 [TEST] add assertion message
Original commit: elastic/x-pack-elasticsearch@20a8b5ed1a
2015-08-26 00:24:32 -04:00
Tanguy Leroux 78a70b5f65 Marvel: Fix test bug in MarvelSettingsTests
Original commit: elastic/x-pack-elasticsearch@6a68f61051
2015-08-25 13:31:22 +02:00
Tanguy Leroux 4d65f396c8 Marvel: Stop collecting data X days after license expiration
Closes elastic/elasticsearch#370, elastic/elasticsearch#470

Original commit: elastic/x-pack-elasticsearch@7ed95605ff
2015-08-25 10:47:59 +02:00
Areek Zillur ef7d4e2579 stub out acknowledge callbacks for commercial plugins
Original commit: elastic/x-pack-elasticsearch@d16f9dc1df
2015-08-24 18:25:40 -04:00
Areek Zillur 0b9021ee87 Add license acknowledgment mechanism for consumer plugins to notify users when they attempt to install a new license
closes elastic/elasticsearch#461

Original commit: elastic/x-pack-elasticsearch@bc30ac2871
2015-08-24 18:25:29 -04:00
Robert Muir 18702cae00 Bootstrap -> BootstrapInfo
Original commit: elastic/x-pack-elasticsearch@c40454618b
2015-08-22 08:41:55 -04: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
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