1730 Commits

Author SHA1 Message Date
uboness
315055012f Merge Marvel 2.0
Original commit: elastic/x-pack-elasticsearch@ce68b3b983
2015-07-17 18:43:52 +02:00
uboness
37c0b627e7 migration of marvel agent 2.0
Original commit: elastic/x-pack-elasticsearch@6cd0a7d25c
2015-07-17 18:43:12 +02:00
jaymode
a2c23cdc6f update the active directory cert in the testnode keystore
Original commit: elastic/x-pack-elasticsearch@8b3d65896d
2015-07-17 08:45:39 -04:00
jaymode
41799e44a4 blacklist rest test with no indices since shield changes the behavior
Original commit: elastic/x-pack-elasticsearch@1a58146296
2015-07-17 08:17:38 -04:00
jaymode
5ac477fbb7 add shard stores api to known actions/handlers
Original commit: elastic/x-pack-elasticsearch@8f3bad4f80
2015-07-17 07:58:05 -04:00
jaymode
b3c1e3a34c add new active directory certificate
Original commit: elastic/x-pack-elasticsearch@ad902dcd57
2015-07-17 07:53:36 -04:00
Areek Zillur
9a51aad48f Merge branch 'master' of github.com:elastic/x-plugins
Original commit: elastic/x-pack-elasticsearch@e0c506bb5b
2015-07-16 15:30:06 -04:00
jaymode
66569f631a use securemock instead of elasticsearch-securemock
Original commit: elastic/x-pack-elasticsearch@c4ab3b8689
2015-07-16 12:59:52 -04:00
Clinton Gormley
7d986eb295 Docs: Fixed bad link to disk allocation in ES 1.7
Original commit: elastic/x-pack-elasticsearch@8abbf7468b
2015-07-16 16:07:45 +02:00
jaymode
f95f86764c shield rest tests use the ElasticsearchRestTestCase nodeSettings
Original commit: elastic/x-pack-elasticsearch@855014dd4b
2015-07-16 06:19:57 -04:00
Clinton Gormley
d6d13661e8 Docs: Fix bad ID in Shield intro
Original commit: elastic/x-pack-elasticsearch@61b72d57ae
2015-07-16 10:46:52 +02: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
debadair
79e12ad65b Docs: Revised the Shield intro to be more Shield-centric.
Original commit: elastic/x-pack-elasticsearch@ba7d73fd61
2015-07-15 10:38:38 -07:00
debadair
dce7c48f67 Docs: Reorganized Shield TOC, renamed files, cleaned up hierarchy.
Original commit: elastic/x-pack-elasticsearch@15caf307c4
2015-07-15 10:17:17 -07:00
jaymode
15e2798638 replace .beta1 with -beta1
Original commit: elastic/x-pack-elasticsearch@822a336c4e
2015-07-15 12:58:16 -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
4626fdfcaa remove cruft
Original commit: elastic/x-pack-elasticsearch@b51b9685b6
2015-07-14 14:10:31 -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
a225d3434d Remove redundant dependencies
Original commit: elastic/x-pack-elasticsearch@6a50cb8b01
2015-07-14 13:55:58 -04:00
Robert Muir
5305d46c32 remove redundant plugins
Original commit: elastic/x-pack-elasticsearch@543789fc55
2015-07-14 13:43:55 -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
62615ae60c Remove more redundancy
Original commit: elastic/x-pack-elasticsearch@9721e8707c
2015-07-14 13:04:25 -04:00
Robert Muir
6386c6bfda Remove redundant xml (covered by plugins/pom.xml)
Original commit: elastic/x-pack-elasticsearch@52eed6230b
2015-07-14 12:51:39 -04:00
Robert Muir
8d7df6a617 fix compile
Original commit: elastic/x-pack-elasticsearch@49c1192749
2015-07-14 11:55:40 -04:00
Robert Muir
cd24eeb5a3 fix compile failures (IndexMissingException -> IndexNotFoundException)
Original commit: elastic/x-pack-elasticsearch@c61492d962
2015-07-14 11:52:30 -04:00
Robert Muir
bb6d68bfbf optional -> provided
Original commit: elastic/x-pack-elasticsearch@87f1d8e7b4
2015-07-14 11:32:44 -04:00
Robert Muir
1d2be681f7 fix shield tests
Original commit: elastic/x-pack-elasticsearch@2b521a705b
2015-07-14 10:12:08 -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
acac497acc resolved .gitignore conflicts
Original commit: elastic/x-pack-elasticsearch@960ccc7960
2015-07-13 12:52:20 +02:00
uboness
dbb9c5d918 initial merge of license
Original commit: elastic/x-pack-elasticsearch@d520d6be57
2015-07-13 12:37:12 +02:00
uboness
3f31855ded Merge branch 'migrate_shield'
Original commit: elastic/x-pack-elasticsearch@01cfbf98de
2015-07-13 12:32:03 +02:00
uboness
8babe1c456 initial migration of shield
Original commit: elastic/x-pack-elasticsearch@2bf095d3cb
2015-07-13 12:31:34 +02:00
uboness
09dd30f582 Merge branch 'migrate_watcher'
Original commit: elastic/x-pack-elasticsearch@8cec5e872a
2015-07-13 12:24:03 +02:00
uboness
b5d42a01c7 initial migration of watcher
Original commit: elastic/x-pack-elasticsearch@b70f48d25c
2015-07-13 12:23:07 +02:00
uboness
9501180fe4 initial pom.xml
Original commit: elastic/x-pack-elasticsearch@03ce181538
2015-07-13 12:12:01 +02:00
uboness
5ee82e4ae7 Initial X-Pack commit 2018-04-20 14:16:58 -07:00
Brian Murphy
53a5aa373b Bring Watcher inline with es script changes
This change allows watcher to compile against the latest es core scripting changes.
Instantiate compiled scripts and use those in tests.

Original commit: elastic/x-pack-elasticsearch@edd46a089f
2015-07-12 22:00:48 -04:00
Brian Murphy
4cf56aef12 Bring transport actions in line with master
ES master added IndexNameExpressionResolver class, which is required by all transport actions. This change adds this class to the actions as well as replacing calls to state.metadata.concreteIndices with calls to the new IndexNameExpressionResolver class.

Original commit: elastic/x-pack-elasticsearch@7938330321
2015-07-10 12:20:34 -04:00
jaymode
f71ba1f025 fix compile error due to changes in core with transport actions and MetaData
Original commit: elastic/x-pack-elasticsearch@5db2e18e31
2015-07-10 12:08:25 -04:00
jaymode
082406f364 fix compile errors due to transport action changes in core
Original commit: elastic/x-pack-elasticsearch@2ea759a3e3
2015-07-10 12:01:54 -04:00
Robert Muir
4b246371b4 Merge pull request elastic/elasticsearch#648 from rmuir/fix_version
bump build versions to 2.0.0.beta1-SNAPSHOT

Original commit: elastic/x-pack-elasticsearch@e97c888fca
2015-07-09 22:16:14 -04:00
Robert Muir
35d7c2d61a bump build versions to 2.0.0.beta1-SNAPSHOT
Original commit: elastic/x-pack-elasticsearch@d254c9304f
2015-07-09 21:09:47 -04:00
Robert Muir
9e36796126 Merge pull request elastic/elasticsearch#973 from rmuir/fix_version
bump version to 2.0.0.beta1-SNAPSHOT and fix broken assert.

Original commit: elastic/x-pack-elasticsearch@08c68b3d22
2015-07-09 20:20:11 -04:00
Robert Muir
e516427bfc bump version to 2.0.0.beta1-SNAPSHOT and fix broken assert.
this was already done in ES core, but commercial plugins are now sitting out of sync.

also 'mvn verify' would sometimes fail, because apparently the list of plugins from the plugin api
is not defined (my suspicion: filesystem order, which is undefined). For now I changed the assert
to allow any order.

Original commit: elastic/x-pack-elasticsearch@9ea0ac457f
2015-07-09 20:04:08 -04:00
Robert Muir
311f412742 Merge pull request elastic/elasticsearch#63 from rmuir/fix_version
bump version to 2.0.0.beta1-SNAPSHOT

Original commit: elastic/x-pack-elasticsearch@2159b41e0c
2015-07-09 19:40:14 -04:00