Khalah Jones-Golden
01e88961f4
Merge remote-tracking branch 'upstream/master'
...
Original commit: elastic/x-pack-elasticsearch@f7d4238cc7
2015-08-19 19:44:49 -04:00
Khalah Jones-Golden
1d097c8d0e
Merge remote-tracking branch 'upstream/master'
...
Original commit: elastic/x-pack-elasticsearch@af34624581
2015-08-19 17:12:53 -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
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
debadair
3d5fef9d8f
Updated the SSL config & CA topics to make the procedures clearer.
...
Original commit: elastic/x-pack-elasticsearch@9a08da7703
2015-08-19 13:51:54 -07: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
Khalah Jones-Golden
c66db74f85
Merge remote-tracking branch 'upstream/master'
...
Original commit: elastic/x-pack-elasticsearch@cf7324bdb8
2015-08-19 12:09:47 -04: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
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
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
Chris Cowan
e8f13f50b8
Changing cluster_name to cluster_uuid
...
Original commit: elastic/x-pack-elasticsearch@7b5227a0a7
2015-08-18 12:33:17 -07: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
Chris Cowan
0eb0e701e4
Adding cluster home screen; cleaning up cluster_state; removing cluster_state service
...
Original commit: elastic/x-pack-elasticsearch@0dc010a7b7
2015-08-17 11:20:32 -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
Khalah Jones-Golden
9273b726ee
Merge remote-tracking branch 'upstream/master'
...
Original commit: elastic/x-pack-elasticsearch@3f2ac65458
2015-08-12 20:10:08 -04: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
Konrad Beiske
e1cbb0fe7d
Merge pull request elastic/elasticsearch#2 from elastic/master
...
update from master
Original commit: elastic/x-pack-elasticsearch@de3f5502cf
2015-08-12 21:38:51 +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
Khalah Jones-Golden
f2e3b40e1a
Merge remote-tracking branch 'upstream/master'
...
Original commit: elastic/x-pack-elasticsearch@9257e7083f
2015-08-11 15:04:33 -04: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