Commit Graph

1355 Commits

Author SHA1 Message Date
Adrien Grand fedfdde216 Fix compilation after elastic/elasticsearchelastic/elasticsearch#16059.
Original commit: elastic/x-pack-elasticsearch@60e083a739
2016-01-19 09:32:52 +01:00
Robert Muir e24dfe2c3e don't depend on localhost
Original commit: elastic/x-pack-elasticsearch@e3c03fcb27
2016-01-18 19:51:00 -08:00
Ryan Ernst 80617ab39e Test: Make rest tests extend ESTestCase
This is the xplugins side of elastic/elasticsearchelastic/elasticsearch#16070.

Original commit: elastic/x-pack-elasticsearch@57d1a9108b
2016-01-18 16:44:56 -08:00
Lee Hinman da3d7177be Add Shield HTTP APIs for users and roles
Relates to elastic/elasticsearch#33

Original commit: elastic/x-pack-elasticsearch@a0942c9334
2016-01-18 16:21:22 -07:00
Nik Everett 1feea91734 Merge pull request elastic/elasticsearch#1235 from nik9000/more_remove_inject
Stop building query parsers with guice

Original commit: elastic/x-pack-elasticsearch@c621cfc94d
2016-01-18 17:40:04 -05:00
Jason Tedor 69ee9d77ad Reflect upstream load average change
This commit addresses the handling of load averages in Marvel due to
upstream changes in core Elasticsearch where the load average field was
changed from an array to an object.

Original commit: elastic/x-pack-elasticsearch@9ea57968bb
2016-01-18 15:50:17 -05:00
Nik Everett d713f203ad Fix compilation error after core shifted
Core is slowly removing raw types. Slowly. And one such removal broke shield.

Original commit: elastic/x-pack-elasticsearch@aa1b668c63
2016-01-18 10:37:39 -05:00
Tanguy Leroux 9e4686536a Marvel: Map renderers by object class rather than by name
Original commit: elastic/x-pack-elasticsearch@8f6dd0c530
2016-01-18 15:12:42 +01:00
Tanguy Leroux a30b894166 Marvel: Check that document count is the same on all data nodes
closes elastic/elasticsearch#1214

Original commit: elastic/x-pack-elasticsearch@1cf352fa3b
2016-01-15 10:51:16 +01:00
javanna 389b2be08a [TEST] blacklist get aliases test against closed indices
Shield expands wildcards to concrete names (aliases or indices) before each request gets executed in es core. It never resolves aliases to concrete indices though, as permissions may be set against aliases rather than indices. During this resolution, it also looks at the state of the indices and the current indices options (expand_wildcards) to expand only to indices with the relevant state. When it comes to aliases though, they may point to multiple indices each one having a different state, so it always expands ignoring expand_wildcards. At that point the request will contain the explicit name of the alias, no wildcards, thus the expand_wildcards option will have no effect in core. ignore_unavailable could be used instead when interacting with shield, which would affect how aliases are resolved to multiple indices. In this case we can only blacklist the test in shield, as it will return both the closed index and the open one.

Original commit: elastic/x-pack-elasticsearch@54c11dfc31
2016-01-14 17:20:23 +01:00
javanna af60f45c4a fix failing DefaultIndicesResolverTests due to upstream change
get aliases api returns now closed indices too by default

Original commit: elastic/x-pack-elasticsearch@d97e18cd71
2016-01-14 15:04:58 +01:00
Alexander Reelsen 9aa5c0ba62 Tests: Disabling Watcher in LdapUserSearchSessionFactoryTests
Due to lingering threads when shutting down when running this in CI
this disables watcher in this tests. It is really hard to reproduce
to get the correct order of start/stop. The reason here is, that watcher
is still starting and not finished, when stop is called on the plugin.

Original commit: elastic/x-pack-elasticsearch@2de85bcba6
2016-01-13 18:29:30 +01:00
Daniel Mitterdorfer 5a9289d777 Correct load average structure for NodeStatsRendererTests
In elastic/elasticsearchelastic/elasticsearch#15907, we changed the load average
structure to also include 5 and 15 minute load averages. This
commit adjusts the expected JSON structure for
NodeStatsRendererTests.

Original commit: elastic/x-pack-elasticsearch@59f6a1e9d9
2016-01-12 08:29:51 +01:00
Nik Everett b94670acc0 Remove serialVersionUID
It doesn't do anything and Elasticsearch will likely ban using it.

Original commit: elastic/x-pack-elasticsearch@c243c913c4
2016-01-11 13:34:05 -05:00
Simon Willnauer 07a4146068 Fix import after IndexingOperationListeners infrastructure cleanup in elasticsearch/15875
Original commit: elastic/x-pack-elasticsearch@aa1bc847eb
2016-01-10 20:23:33 +01:00
jaymode 94ce98ad9f always debug the user dn role mapping
When debugging role mapping it is useful to know the actual user DN, which is only logged
when something is actually mapped to the DN. Since this is logged at debug level, we should
always log it.

Original commit: elastic/x-pack-elasticsearch@b690c757d3
2016-01-08 14:32:22 -05:00
Jason Tedor 2b5c28242d Remove use of j.u.c.ThreadLocalRandom
This commit removes all uses of java.util.concurrent.ThreadLocalRandom
across the codebase.

Original commit: elastic/x-pack-elasticsearch@eca3701357
2016-01-08 12:21:30 -05:00
Nik Everett 2d50c77717 Merge pull request elastic/elasticsearch#1258 from nik9000/unneeded_suppress
Remove unneeded SuppressWarnings

Original commit: elastic/x-pack-elasticsearch@1c20a8c3fc
2016-01-08 11:21:28 -05:00
jaymode c5592ee3be add the ability to utilize load balancing and failover for ldap
Previously we only exposed the use of a single URL for LDAP realms, while the code supported
multiple URLs. Internally we always used a failover server set, which would have provided failover
to another LDAP server if multiple existed. This change introduces a new setting `load_balance.type`
on the realm that indicates the type of load balancing. Valid options are:

* `failover` - the first server in the list will be used until it fails and then additional servers will be tried until
one succeeds. The first successful server will be used from now on. This is the default.
* `round_robin` - continuously iterates through the list of servers for each new connection. If a server is down,
the iteration will continue until a successful connection is made. The downfall here is that the list does not
get reordered on a down server, so there is overhead for always trying the servers in order.
* `dns_failover` - This server set takes a single URL that uses a DNS that will resolve to multiple IP addresses.
Connections will be consistently attempted to servers in the order they are retrieved from the name service; there
is no re-ordering and the first successful connection will be used.
* `dns_round_robin` - This server set takes a single URL that uses a DNS that will resolve to multiple IP addresses.
The addresses retrieved from the name service will connected to in the same order as `round_robin`.

Closes elastic/elasticsearch#31

Original commit: elastic/x-pack-elasticsearch@9ce9a1bf23
2016-01-07 09:14:41 -05:00
Alexander Reelsen f68f9aa268 Watcher: Fix test failure by ensuring non-null argument for equality check
Original commit: elastic/x-pack-elasticsearch@b811dcdf7e
2016-01-07 15:09:38 +01:00
Alexander Reelsen 39403028db Watcher: Added missing equals/hashcode methods to EmailAttachments
In order to correctly check for equality in an EmailAction, all the email
attachments have to implement equals/hashCode methods.

This has already been added to the 2.x branch in elastic/x-pack@ebde22507f

Original commit: elastic/x-pack-elasticsearch@bb980ea934
2016-01-07 14:25:51 +01:00
Tanguy Leroux cdb3869b1b Marvel: Do not collect data in SecuredClientTests
closes elastic/elasticsearch#1242

Original commit: elastic/x-pack-elasticsearch@cd8f8ce2fa
2016-01-07 11:58:36 +01:00
Alexander Reelsen 75ab4f9470 Watcher: Allow for external email attachments
This feature is mainly done for the integration with the commercial reporting, but can be used
for anything else as well.

This adds a `attachments` to the email configuration, which can be used like this

```
"attachments" : {
  "some_id" : {
    "http" : {
      "request" : {
        "url" : "http://example.org/foo.pdf"
      }
    }
  },
  "other_id" : {
    "data" : {
      "format" : "json"
    }
  }
}
```

The main reason to pick this format is extensibility. If we would like to support another
attachment type, like an file reader, we could do so easily from an API point of view.

Closes elastic/elasticsearch#870

Original commit: elastic/x-pack-elasticsearch@66d14be965
2016-01-07 10:49:13 +01:00
Adrien Grand 2bab66dcb5 Remove warmers from the known actions.
Original commit: elastic/x-pack-elasticsearch@325f77518f
2016-01-07 10:30:35 +01:00
Tanguy Leroux 54215200ba Marvel: HttpExporter should not clean indices
This commit removes the current implementation in HttpExporter so that it does not automatically clean indices anymore.

Original commit: elastic/x-pack-elasticsearch@7d30338355
2016-01-07 10:05:02 +01:00
Tanguy Leroux 57b7c7eb85 Marvel: Automatic deletion of expired timestamped indices
closes elastic/elasticsearch#1057

Original commit: elastic/x-pack-elasticsearch@6cf24a0a0d
2016-01-07 10:05:02 +01:00
Alexander Reelsen 080c2afc55 Watcher: Allow execute Watch API fields in request params
In order to have a shortcut for the execution of a watch and
specifying the record_execution and ignore_condition booleans,
so are now supported in the HTTP request parameters as well.

Closes elastic/elasticsearch#918

Original commit: elastic/x-pack-elasticsearch@bed5da40b7
2016-01-07 10:00:11 +01:00
Nik Everett 38dcbc50b6 Remove unneeded SuppressWarnings
Original commit: elastic/x-pack-elasticsearch@46d86d555e
2016-01-06 20:07:27 -05:00
Alexander Reelsen 9108001c73 Watcher: Remove pre 2.0 compatibility code
This code is not needed anymore in any 2.x version.

Original commit: elastic/x-pack-elasticsearch@8346b0120e
2016-01-06 17:25:13 +01:00
Martijn van Groningen 996a9a9891 shield: add percolator query terms fields to the allowed fields if FLS is enabled
Fixes issue that came from upstream change elastic/elasticsearch#13646

Original commit: elastic/x-pack-elasticsearch@53f796c9c3
2016-01-06 17:04:59 +01:00
Martijn van Groningen 6f2208cc86 test: upstream changes for elastic/elasticsearch#13646
Original commit: elastic/x-pack-elasticsearch@0b2bff1b06
2016-01-06 16:09:25 +01:00
Alexander Reelsen 9709036024 Watcher: Adding PagerDuty Action
* This action enables sending notifications to pager duty services.
* Utilizes pager duty's REST API
* Similar to the `email`, `hipchat` and `slack` actions, multiple `pagerduty` accounts can be configured, each with its own Service API key
* A `pagerduty` account is roughly mapped to a service in your pagerduty service.
* `pagerduty` actions are associated with an account, or if not, their events will be sent via the default account.
* An incident can be acknowledged, resolved or triggered

Closes elastic/elasticsearch#492

Original commit: elastic/x-pack-elasticsearch@72cc21d119
2016-01-06 08:58:46 +01:00
Nik Everett de12d4b58d Stop building query parsers with guice
This is the fallout from
https://github.com/elastic/elasticsearch/pull/15761

Original commit: elastic/x-pack-elasticsearch@9509feb310
2016-01-05 13:53:40 -05:00
jaymode e8eb0fa312 test: only specify the XPackPlugin once
Original commit: elastic/x-pack-elasticsearch@46249d54c6
2016-01-05 13:37:43 -05:00
Igor Motov 852aac0b9c Add support for the task management framework
These changes are required to support elastic/elasticsearchelastic/elasticsearch#15347

Original commit: elastic/x-pack-elasticsearch@37adf4fc83
2016-01-05 11:09:31 -05:00
Simon Willnauer ebcca4f3c2 Prepare for removal of #getIndexTimeInMillis
In `https://github.com/elastic/elasticsearch/pull/14632/` IndexingStats#getIndexTimeInMillis()
has been removed and is superseeded by IndexingStats#getIndexTime() which is already avaliable

Original commit: elastic/x-pack-elasticsearch@2caba81352
2016-01-05 09:39:32 +01:00
Igor Motov c4569432d1 Fixes a race condition in HandshakeWaitingHandlerTests
Closes elastic/elasticsearch#1210

Original commit: elastic/x-pack-elasticsearch@bf130a969e
2016-01-04 11:46:53 -05:00
Tanguy Leroux 2cec08798b Marvel: Merge ClusterInfoCollector in ClusterStatsCollector
This commit merge the ClusterInfoCollector in the ClusterStatsCollector so that cluster stats are retrieved only once.

Original commit: elastic/x-pack-elasticsearch@fe70149210
2016-01-04 14:45:31 +01:00
Tanguy Leroux eeb5842730 Marvel: Use versioned index templates
This commit changes the templates so that they are now versionned using a number (starting from 1). This number is used in index templates names (ex: .marvel-es-data-1, .marvel-es-1) as well as in indices names (ex: .marvel-es-1-2015-12-30, .marvel-es-data-1).

If the template does not exist, it is created. Otherwise nothing (no update) is done.

Original commit: elastic/x-pack-elasticsearch@66c1a8bed0
2015-12-31 16:26:17 +01:00
Tanguy Leroux a931e4e0b8 Marvel: Add tribe nodes support
This commit enable tribe nodes support for Marvel. It avoid ElasticsearchSecurityException when a tribe node is connected to a cluster that has been configured for both Shield and Marvel by loading the MarvelShieldIntegration support on tribe node even if marvel.enabled is set to false. It also allows tribe nodes to be monitored using Marvel with their own marvel settings.

closes elastic/elasticsearch#1088

Original commit: elastic/x-pack-elasticsearch@e0401c1288
2015-12-30 12:20:49 +01:00
Alexander Reelsen d3ced7161b Watcher: Allow `url` as shortcut in requests
Instead of having to specify `scheme`, `host`, `port`, `path` and `params` each
one can now use the `url` field and specify something like `http://example.org/foo?bar=baz`

This works for HttpRequest and HttpRequestTemplate

Original commit: elastic/x-pack-elasticsearch@8c052cf419
2015-12-30 12:18:17 +01:00
Tanguy Leroux cc0933733c Marvel: Reimplement SecuredClient
closes elastic/elasticsearch#1150

i#Update after Uri's review

Original commit: elastic/x-pack-elasticsearch@2526dc9da1
2015-12-30 11:32:41 +01:00
Robert Muir 2655db3d72 remove outdated build.gradle parameter
Original commit: elastic/x-pack-elasticsearch@63bc9907e6
2015-12-29 09:25:34 -05:00
Adrien Grand fbe777005b Use currentName instead of text() to parse field names.
Original commit: elastic/x-pack-elasticsearch@f4b75c3f2d
2015-12-28 16:44:16 +01:00
Tanguy Leroux d904fa5931 Marvel: Restore cluster_state.nodes
Original commit: elastic/x-pack-elasticsearch@7cf33baf2a
2015-12-23 16:59:29 +01:00
Adrien Grand ff0217d80d Merge pull request elastic/elasticsearch#1153 from jpountz/remove/index_name_back_compat
x-pack sibling of elastic/elasticsearchelastic/elasticsearch#15488

Original commit: elastic/x-pack-elasticsearch@cccaee133b
2015-12-23 15:02:49 +01:00
Yannick Welsch 4ddd7af334 Fix issue where license metadata deserialization swallows other custom metadata
Closes elastic/elasticsearch#1190

Original commit: elastic/x-pack-elasticsearch@5c5280fee5
2015-12-22 15:49:25 +01:00
Alexander Reelsen 0cd636422c Watcher: Prevent double creation of node services
Because of specifying the concrete implementations in WatcherPlugin.nodeServices(),
all of those services got created twice for each node (guice requires the interface here).
This resulted in NPEs as the first instantiation did not run doStart() and thus had empty
settings, that resulted in a NPE.

Closes elastic/elasticsearch#1179

Original commit: elastic/x-pack-elasticsearch@c6a1f5093f
2015-12-22 11:29:04 +01:00
Adrien Grand dbc863add7 Upgrade to lucene-5.5.0-snapshot-1721183.
Original commit: elastic/x-pack-elasticsearch@2dea406d5f
2015-12-21 17:30:20 +01:00
Ryan Ernst c86e8b9c2e Remove wildcard imports
Original commit: elastic/x-pack-elasticsearch@65b2fee336
2015-12-18 14:15:06 -08:00
Robert Muir 114184b5dd disable license headers check for x-plugins, until we figure out what it should do
Original commit: elastic/x-pack-elasticsearch@48bc84865c
2015-12-18 13:27:52 -05:00
Simon Willnauer 1d95a7593f Merge pull request elastic/elasticsearch#1162 from s1monw/update_to_new_settings_infra
Upgrade X-Pack to new ClusterSettings infrastructure

Original commit: elastic/x-pack-elasticsearch@82df682838
2015-12-18 11:12:40 +01:00
Simon Willnauer 9713041fb4 Merge branch 'master' into update_to_new_settings_infra
Original commit: elastic/x-pack-elasticsearch@bf4eb0ef46
2015-12-18 10:21:34 +01:00
Martijn van Groningen de37a6e3ed shield: Enable fls and dls by default
* allow bulk requests with updates if fls/dls isn't configured for targetted index
* throw a hard error if the current call can't resolve an associated transport request
marvel: node stats collector should use the client instead of the internal apis, because otherwise the index searcher wrapper can't locate the transport request that is associated with current call and would then throw an exception, which then prevents the marvel agent from collecting stats.
* if both field or document level security is enabled then all forbidden operations should fail

Original commit: elastic/x-pack-elasticsearch@b2c40d6559
2015-12-18 10:16:08 +01:00
Ryan Ernst 0a69d22cdc Build: Rename test framework project
Xplugins side of elastic/elasticsearchelastic/elasticsearch#15522

Original commit: elastic/x-pack-elasticsearch@e296285562
2015-12-17 21:27:19 -08:00
Zachary Tong 9db8c73025 Fix compile due to change in InternalSearchResponse signature
Original commit: elastic/x-pack-elasticsearch@a442dc5efe
2015-12-17 16:24:15 -05:00
Zachary Tong 40b7f97559 Fix compile due to change in InternalSearchResponse signature
Original commit: elastic/x-pack-elasticsearch@8415605621
2015-12-17 15:52:49 -05:00
jaymode 7f97a1bf5d test: set anonymousEnabled in a before class method to prevent changes between tests
Original commit: elastic/x-pack-elasticsearch@e1496ca725
2015-12-17 14:16:45 -05:00
Adrien Grand a14dc4c5bf Fix compilation.
Original commit: elastic/x-pack-elasticsearch@f9c3fe924f
2015-12-17 18:56:52 +01:00
Adrien Grand 53a757a5de Fix compilation due to changes in elastic/elasticsearchelastic/elasticsearch#15511.
Original commit: elastic/x-pack-elasticsearch@5a6e77a246
2015-12-17 18:08:28 +01:00
jaymode 7691859baa add REST authenticate API
The REST authenticate API can be used to test credentials and retrieve details about the
user that has been authenticated. This currently includes retrieving the user's username
and roles.

Closes elastic/elasticsearch#1019

Original commit: elastic/x-pack-elasticsearch@117a226187
2015-12-17 12:00:41 -05:00
Simon Willnauer 080590f56c Upgrade X-Pack to new ClusterSettings infrastructure
This change adds compatability with https://github.com/elastic/elasticsearch/pull/15278

Original commit: elastic/x-pack-elasticsearch@100c5c0efb
2015-12-17 17:21:47 +01:00
Robert Muir 2d5cdf8ed8 lenient -> missingClasses
Original commit: elastic/x-pack-elasticsearch@bf19d3d843
2015-12-17 03:44:51 -05:00
Jack Conradson 9370ea99d0 Updated the plumbing for scripts to accept compile time parameters.
Closes elastic/elasticsearch#1155

Original commit: elastic/x-pack-elasticsearch@a7fd92f052
2015-12-16 18:29:10 -08:00
Ryan Ernst 3529231b5d Merge pull request elastic/elasticsearch#1157 from rjernst/disable_mock_plugins
Fix xplugins to suppress mock transport and transport service

Original commit: elastic/x-pack-elasticsearch@5e3f7041fd
2015-12-16 18:22:10 -08:00
Ryan Ernst 134cdb22bb Fix xplugins to suppress mock transport and transport service
This is the xplugins side of elastic/elasticsearchelastic/elasticsearch#15495

Original commit: elastic/x-pack-elasticsearch@9c29c057a5
2015-12-16 18:13:56 -08:00
Robert Muir 3375993e99 add third party audit for x-pack build
Original commit: elastic/x-pack-elasticsearch@fbb2016934
2015-12-16 18:57:05 -05: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
Adrien Grand 9bec5b6f6d x-pack sibling of elastic/elasticsearchelastic/elasticsearch#15488
Original commit: elastic/x-pack-elasticsearch@db5f78fe19
2015-12-16 19:44:47 +01: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
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
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 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
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 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 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
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
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
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
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
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
jaymode aca0c96d6a remove leftover use of onIndexService and disable license check
Original commit: elastic/x-pack-elasticsearch@1cdf5c9f95
2015-12-03 11:16:41 -05:00
jaymode 9b2dd0c11d fixes after rebase
Original commit: elastic/x-pack-elasticsearch@6896b88829
2015-12-03 16:24:40 +01:00
jaymode 628febf3f7 fix integration tests after reorganization
This commit fixes the integration tests and qa test after the reorganization to be
packaged as a single plugin.

Original commit: elastic/x-pack-elasticsearch@d6f488627f
2015-12-03 16:24:40 +01:00
jaymode e1c1552eb2 fix tests so gradle test passes
Original commit: elastic/x-pack-elasticsearch@30683bd771
2015-12-03 16:24:40 +01:00
uboness 13a8c98cb2 [WIP] unified x-pack repo restructuring
- added the license-plugin dir as a src dir

- Made XPackPlugin customizable for tests. Now tests that need to plug in different behaviours (e.g. a custom license plugin) can do that by simply resetting the relevant delegee plugins (i.e. shield, marvel, license, watcher) in the ctor of a new XPackPlugin.

Original commit: elastic/x-pack-elasticsearch@ab83104955
2015-12-03 16:24:40 +01:00
Ryan Ernst 7ef87632ab Moved shield, watcher, marvel and license plugin into common x-pack
project, and combined their gradle builds. Everything builds, but many
many tests fail.

Original commit: elastic/x-pack-elasticsearch@d18d4614aa
2015-12-03 16:24:40 +01:00
jaymode e5b0e7f5cb reorganize directory layout
See elastic/elasticsearch#1022

Original commit: elastic/x-pack-elasticsearch@3ee8761312
2015-12-03 16:22:37 +01:00