Commit Graph

2390 Commits

Author SHA1 Message Date
Lukas Olson efec86ecfe Merge remote-tracking branch 'upstream/master' into shield-kibana-auth
Original commit: elastic/x-pack-elasticsearch@8d28f52ffd
2015-12-16 15:07:46 -07:00
Ryan Ernst 60659c39fc Merge pull request elastic/elasticsearch#1145 from rjernst/http_type
Use NetworkModule for transport/http related extensions

Original commit: elastic/x-pack-elasticsearch@731ea8b2aa
2015-12-16 11:54:43 -08:00
Britta Weber 267b86c57f Marvel: add implementation for synced flush to SecuredClient
see elastic/elasticsearch#15396

Original commit: elastic/x-pack-elasticsearch@c60c271738
2015-12-16 17:41:04 +01:00
Britta Weber 6cf8f261e1 Update handler list to include synced flush
see elastic/elasticsearch#15396

Original commit: elastic/x-pack-elasticsearch@e41ddbf9fa
2015-12-16 17:19:21 +01:00
Tim Sullivan 892938d7ef Merge pull request elastic/elasticsearch#1113 from tsullivan/marvel-registration-link
Marvel: license expiration handling and access to registration link

Original commit: elastic/x-pack-elasticsearch@e00f6f7005
2015-12-15 20:40:56 -07:00
Ryan Ernst 1a9a79caa4 Use NetworkModule for transport/http related extensions
This is the xplugins side of elastic/elasticsearch#15434.

Original commit: elastic/x-pack-elasticsearch@728d8b728a
2015-12-15 19:38:11 -08:00
Lukas Olson eb7c323796 Merge branch 'master' into shield-kibana-auth
Original commit: elastic/x-pack-elasticsearch@cb77a17842
2015-12-15 14:35:36 -07:00
Robert Muir 1d5e5b6459 Merge pull request elastic/elasticsearch#1138 from rmuir/ip6_localhost_2
fix smoke-test-plugins-ssl to work when ::1 does not resolve at all.

Original commit: elastic/x-pack-elasticsearch@06ca563b74
2015-12-15 01:11:13 -05:00
Robert Muir d85bb59d57 fix smoke-test-plugins-ssl to work when ::1 does not resolve at all.
My previous change only fixed it when it resolves to something different than localhost.
But in some cases, it does not resolve at all, we must specify the IP.

Original commit: elastic/x-pack-elasticsearch@547eb4c42f
2015-12-15 01:04:37 -05:00
Robert Muir e574552288 Merge pull request elastic/elasticsearch#1137 from rmuir/ip6_localhost
fix smoke-test-plugins-ssl to work with ip6-localhost

Original commit: elastic/x-pack-elasticsearch@ebdb867e90
2015-12-14 23:10:09 -05:00
Robert Muir fb22b54202 fix smoke-test-plugins-ssl to work with ip6-localhost
Original commit: elastic/x-pack-elasticsearch@747714b0d1
2015-12-14 22:48:56 -05:00
Tim Sullivan fbc8da8c4d Merge pull request elastic/elasticsearch#1131 from tsullivan/marvel-fix-node-listing-name-filter
Marvel - node listing - copy node fields to top level

Original commit: elastic/x-pack-elasticsearch@3cf6b341aa
2015-12-14 07:17:42 -07:00
Tanguy Leroux f6fdc1a7ad Watcher: Ignore REST test "Getting started - Monitor cluster health"
Test is blacklisted until it can work with dynamic port number

Original commit: elastic/x-pack-elasticsearch@5990e9436a
2015-12-14 12:09:00 +01:00
Ryan Ernst cfdfd4ed7c Add todo comment for disabled rest test
Original commit: elastic/x-pack-elasticsearch@6f4dae5903
2015-12-11 18:24:27 -08:00
Ryan Ernst 5739d4d921 Fixes for integ tests not using hardcoded ports
Original commit: elastic/x-pack-elasticsearch@9cc86da9e0
2015-12-11 18:23:01 -08:00
Jason Tedor d0c4e79b3f Merge pull request elastic/elasticsearch#1102 from jasontedor/collections-shuffle-reproducibility
Remove usage of Collections#shuffle(List)

Original commit: elastic/x-pack-elasticsearch@76edae4539
2015-12-11 11:48:25 -05:00
Jason Tedor de293ec225 Remove usage of Collections#shuffle(List)
This commit removes usage of Collections#shuffle(List) as this is a
forbidden method in upstream Elasticsearch.

Relates elastic/elasticsearchelastic/elasticsearch#15287, relates elastic/elasticsearchelastic/elasticsearch#15299

Original commit: elastic/x-pack-elasticsearch@2943569ee1
2015-12-11 11:36:41 -05:00
Adrien Grand 295d250a9f Merge pull request elastic/elasticsearch#1114 from jpountz/fix/safe_write_raw
Simplify xcontent usage.

Original commit: elastic/x-pack-elasticsearch@5e7eca08b9
2015-12-11 12:17:15 +01:00
Adrien Grand aefd963327 Simplify xcontent usage.
This commit simplifies xcontent usage in x-pack in a way that is compatible with
elastic/elasticsearchelastic/elasticsearch#15358.

Original commit: elastic/x-pack-elasticsearch@0d6ce5f22f
2015-12-11 11:14:10 +01:00
Ryan Ernst 1f931f705b Remove uses of NodeBuilder
This is the xplugins side of removing NodeBuilder in ES.

Original commit: elastic/x-pack-elasticsearch@ae82f14daf
2015-12-10 20:13:05 -08:00
Lukas Olson 0087126649 Merge branch 'master' into shield-kibana-auth
Original commit: elastic/x-pack-elasticsearch@f7a15fb35c
2015-12-10 14:33:19 -07:00
Robert Muir bc6c4470f7 bump securemock to 1.2 for https://github.com/elastic/elasticsearch/pull/15378
Original commit: elastic/x-pack-elasticsearch@a069ed2b4d
2015-12-10 15:26:32 -05:00
Robert Muir 5c480e118c fix x-pack compile/tests to work with https://github.com/elastic/elasticsearch/pull/15328
Squashed commit of the following:

commit 54de841112778b01e817e465d2f59840970bb4f3
Author: Robert Muir <rmuir@apache.org>
Date:   Thu Dec 10 08:47:12 2015 -0500

    see exactly how far MessyTestPlugin can go (unit tests depend on both groovy and mustache!)

commit 743b5a4e0cc9a05e307339dfcb4569feed31f337
Author: Robert Muir <rmuir@apache.org>
Date:   Thu Dec 10 08:35:03 2015 -0500

    fix x-pack compile/tests to work with https://github.com/elastic/elasticsearch/pull/15328

Original commit: elastic/x-pack-elasticsearch@4307bb163b
2015-12-10 08:47:55 -05:00
Alexander Reelsen 45f2223d57 Watcher: Fix compilation issue against core (PR elastic/elasticsearch#15337)
Original commit: elastic/x-pack-elasticsearch@a1215ea494
2015-12-10 10:42:08 +01:00
Areek Zillur f0cc7fefa8 add primary transport handlers corresponding to elasticsearchelastic/elasticsearch#14852
Original commit: elastic/x-pack-elasticsearch@25d52cccbf
2015-12-10 01:42:56 -05:00
Tanguy Leroux fdcf1f44e4 Marvel: Update template management in Local/Http Exporters
This commit update the Local & Http exporters so that they have the same behavior. Exporters now try to update the mappings of the current marvel indices if they exist (only new document types will be added)

It also adds dedicated tests to verify that the Marvel template is correctly updated depending of the current template version.

Original commit: elastic/x-pack-elasticsearch@ac650f5aba
2015-12-09 16:10:25 +01:00
Tanguy Leroux d377168a7f Marvel: Be more precise about the required stats
Original commit: elastic/x-pack-elasticsearch@2a0385ea85
2015-12-09 15:43:08 +01:00
jaymode fc321a02a1 fix logging audit trail to not cause guice issues
When the logging audit trail is configured to add the node hostname or ip address
as a prefix, the logging audit trail can invoke guice dependency injection issues since
the transport that is injected is a proxy. This change makes the logging audit trail a
lifecycle component and waits for the transport to be started before initializing the
prefix.

Closes elastic/elasticsearch#1104

Original commit: elastic/x-pack-elasticsearch@3b19283969
2015-12-09 07:35:53 -05:00
Alexander Reelsen 62cd783942 Watcher: Fix sending of emails
In order to be able to send emails, the thread context classs loader
must be set to the watcher plugin class loader (and reset afterwards),
otherwise some javax.activation classes needed to create mime attachments
cannot be found.

In addition the activation jar dependency has been removed.

Closes elastic/elasticsearch#1066
Closes elastic/elasticsearch#708

Original commit: elastic/x-pack-elasticsearch@10042375ec
2015-12-09 10:04:15 +01:00
Ryan Ernst b6ce09a361 Switch messy watcher+groovy tests to messy-test plugin
Original commit: elastic/x-pack-elasticsearch@8163f0f129
2015-12-08 19:52:22 -08:00
Ryan Ernst 4bbd4c25b0 Enable security manager for messy groovy tests
Original commit: elastic/x-pack-elasticsearch@4b2b256a04
2015-12-08 17:26:53 -08:00
Timothy Sullivan c040840e7e Merge branch 'master' of github.com:elastic/x-plugins
Original commit: elastic/x-pack-elasticsearch@338f72d58b
2015-12-07 10:15:43 -07:00
Lukas Olson 4cdd0f3bc2 Move to new directory structure
Original commit: elastic/x-pack-elasticsearch@de5f703b6d
2015-12-07 08:38:36 -07:00
Lukas Olson a4670211e5 Merge branch 'master' into shield-kibana-auth
Original commit: elastic/x-pack-elasticsearch@fa6658c1e4
2015-12-07 08:36:16 -07:00
uboness 1c4c25fbf6 Initial cleanup of shield integration in watcher and marvel
- Removed Marvel/WatcherUserHolder in favour of the new `InternalMarvelUser`/`InternalWatcherUser`

Original commit: elastic/x-pack-elasticsearch@8181630144
2015-12-07 14:08:43 +01:00
jaymode 68e3c0a08e test: disable marvel for watcher with groovy tests
This commit disables marvel when running the watcher with groovy tests. Marvel creates
indices and expect the cluster to be green, which won't happen with the marvel indices
existing and expecting a replica.

See elastic/elasticsearch#1087

Original commit: elastic/x-pack-elasticsearch@8d163a53b7
2015-12-07 06:39:33 -05:00
Timothy Sullivan ea4bae5149 Merge branch 'master-reorganize' of /Users/tsullivan/code/marvel
Original commit: elastic/x-pack-elasticsearch@4218807caf
2015-12-06 01:16:31 -07:00
Timothy Sullivan d3fb668346 move public code to kibana/marvel
Original commit: elastic/x-pack-elasticsearch@13d409da5d
2015-12-06 00:51:20 -07:00
Robert Muir f3fd72c9d0 Use Date instead of System in groovy script... its absurd to expect scripts can use System
Original commit: elastic/x-pack-elasticsearch@9b32e621c7
2015-12-05 22:13:50 -05:00
Tim Sullivan d022e8d276 Merge pull request elastic/elasticsearch#672 from tsullivan/initial-server-tests
Initial server tests

Original commit: elastic/x-pack-elasticsearch@30f3a762f7
2015-12-04 16:50:53 -07:00
Ryan Ernst ad36c3f0dd Merge pull request elastic/elasticsearch#1086 from rjernst/jigsaw
Build: Changes to tests for modules in elasticsearch

Original commit: elastic/x-pack-elasticsearch@95e0c53939
2015-12-04 11:53:05 -08:00
Ryan Ernst 3e9d29d9b9 Update plugins smoke test to use correct plugin count for xpack
Original commit: elastic/x-pack-elasticsearch@40f464acbd
2015-12-04 11:52:31 -08:00
Ryan Ernst 2521e567f1 Merge branch 'master' into jigsaw
Original commit: elastic/x-pack-elasticsearch@c7534cfcf0
2015-12-04 11:39:33 -08:00
jaymode 8e5b5688f5 test: change watcher rest tests to wait for yellow
Since we combined all of the plugins marvel will also be enabled and will cause
the cluster to never get to a green state since we only have a single node.

Original commit: elastic/x-pack-elasticsearch@60fbfa97f1
2015-12-04 14:18:07 -05:00
Ryan Ernst c8de04ae14 make smoke test plugins (and ssl) work again
Original commit: elastic/x-pack-elasticsearch@3d2413823e
2015-12-03 23:38:48 -08:00
Robert Muir 3ec04ba40f fix tests
Original commit: elastic/x-pack-elasticsearch@54d56efdbd
2015-12-04 02:12:22 -05:00
Ryan Ernst b56aa9064d remove adding groovy as an explicit module in watcher qa test
Original commit: elastic/x-pack-elasticsearch@2e7e3cfd94
2015-12-03 23:09:31 -08:00
Robert Muir b63bb69cff Merge branch 'master' into jigsaw
Original commit: elastic/x-pack-elasticsearch@6fb2ef0249
2015-12-04 01:48:18 -05:00
Ryan Ernst afb8b2a890 changes for ES modularization
Original commit: elastic/x-pack-elasticsearch@1e130f1693
2015-12-03 15:17:02 -08:00
jaymode a039acf578 more fixes for the combined plugin
* move static initialization hack for UnboundID Debug to XPackPlugin
* cleanup bundlePlugin calls in build file
* properly disable watcher and marvel for shield core tests

Original commit: elastic/x-pack-elasticsearch@2b89cf2225
2015-12-03 14:56:12 -05:00