Commit Graph

1677 Commits

Author SHA1 Message Date
jaymode de02fd3c9c remove AwaitsFix from IPHostnameVerification tests now that it is fixed in core
Closes elastic/elasticsearch#468

Original commit: elastic/x-pack-elasticsearch@e2623762a3
2015-08-19 10:01:31 -04: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 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
jaymode 152aeaa776 remove NetworkUtils and InetAddress getLocalHost usage in shield
Original commit: elastic/x-pack-elasticsearch@460ef63824
2015-08-18 13:31:03 -04: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 22a191ba0a [maven] change also artifactId for x-dev-tools
Original commit: elastic/x-pack-elasticsearch@dd837702d2
2015-08-18 13:55:12 +02:00
David Pilato a7d3a9408f [maven] change also name for parent and dev-tools
Original commit: elastic/x-pack-elasticsearch@119d4cfa02
2015-08-18 13:55:12 +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
Ryan Ernst dbaf3166ef Fix compile, NetworkUtils get hostname and address methods changed
Original commit: elastic/x-pack-elasticsearch@64a94930dd
2015-08-18 00:13:23 -07: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 a8825fc3ed Merge pull request elastic/elasticsearch#448 from martijnvg/marvel/fix/dynamic_settings_change
Fixed compile errors due to upstream change

Original commit: elastic/x-pack-elasticsearch@58c2f6669f
2015-08-17 15:18:00 +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 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 59fdd54dbc Fixed compile error due to upstream change.
Original commit: elastic/x-pack-elasticsearch@a07877571c
2015-08-17 13:44:59 +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
jaymode 002c0282cc skip deployment of dev tools and qa modules when deploying publicly
Closes elastic/elasticsearch#433

Original commit: elastic/x-pack-elasticsearch@3f0f7fda4f
2015-08-14 13:53:16 -04: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
Adrien Grand b8666f0bca Merge pull request elastic/elasticsearch#441 from jpountz/fix/shield_core_rest_tests_to_qa
Tests: Move Shield "run core REST tests" to qa.

Original commit: elastic/x-pack-elasticsearch@4040a1766a
2015-08-14 11:23:40 +02:00
Adrien Grand 06d84f00e4 Tests: Move Shield "run core REST tests" to qa.
Close elastic/elasticsearch#404

Original commit: elastic/x-pack-elasticsearch@1250e1449e
2015-08-14 11:18:11 +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
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
Adrien Grand 268860be7b Disable Shield ssl tests until openssl is available on the Windows build machines.
Original commit: elastic/x-pack-elasticsearch@777375bb94
2015-08-12 17:00:20 +02:00
Martijn van Groningen 430266274a Merge pull request elastic/elasticsearch#431 from martijnvg/qa/watcher_with_shield
Add watcher+shield qa rest tests

Original commit: elastic/x-pack-elasticsearch@a1a095f86e
2015-08-12 14:19:03 +02:00
Martijn van Groningen 583799d3e7 applied feedback
Original commit: elastic/x-pack-elasticsearch@9042427219
2015-08-12 14:11:46 +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
Adrien Grand 9479569b02 Merge pull request elastic/elasticsearch#429 from jpountz/enhancement/qa_shield_ssl
Tests: Smoke tests with SSL enabled.

Original commit: elastic/x-pack-elasticsearch@39361caa4b
2015-08-12 14:10:06 +02:00
Adrien Grand cd5169745d Tests: Smoke tests with SSL enabled.
We should smoke test our plugins with ssl enabled to make sure that plugins
still work together and eg. Marvel still manages to export stats.

Close elastic/elasticsearch#402

Original commit: elastic/x-pack-elasticsearch@3bb7c2b96c
2015-08-12 14:04:49 +02:00
Adrien Grand 2842898c1c Build: cut over to the new startup-elasticsearch syntax.
Original commit: elastic/x-pack-elasticsearch@29582a18b9
2015-08-11 18:54:08 +02:00
jaymode 0b4512582f fix integration test runs due to changes in core around argument definition
Original commit: elastic/x-pack-elasticsearch@af2a85cf91
2015-08-11 09:01:14 -04: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 892c4f8194 Merge pull request elastic/elasticsearch#406 from martijnvg/test/monitor_cluster_health
Moved smoke test script to yaml rest test.

Original commit: elastic/x-pack-elasticsearch@5427f7c698
2015-08-11 13:10:28 +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
Adrien Grand 2322e42a70 Merge pull request elastic/elasticsearch#424 from jpountz/enhancement/qa_shield
Add Shield testing to qa/smoke-test-plugins.

Original commit: elastic/x-pack-elasticsearch@e5916e4522
2015-08-11 10:55:54 +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
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
Adrien Grand d3789db974 Build: Remove definition of `convert-plugin-name`.
Follow-up of elastic/elasticsearchelastic/elasticsearch#12765.

Original commit: elastic/x-pack-elasticsearch@f75538e87b
2015-08-11 10:38:29 +02:00
Ryan Ernst ceb932a276 Fix transport test to use plugin to hookup mock
Original commit: elastic/x-pack-elasticsearch@397c6bc2dc
2015-08-10 17:53:37 -07:00
jaymode 85eeeab88a add release notes for Shield 1.3.2
Original commit: elastic/x-pack-elasticsearch@f4f3101aa2
2015-08-10 13:10:28 -04: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 214dc6e5be Build: Fix artifactId of qa/smoke-test-plugins.
Original commit: elastic/x-pack-elasticsearch@c84753e933
2015-08-10 14:01:26 +02:00
Adrien Grand f7cee828e3 Build: Make the qa module extend the x-plugins artifact.
This way it will inherit the repositories definitions.

Original commit: elastic/x-pack-elasticsearch@5d6ee26596
2015-08-10 11:56:46 +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