Commit Graph

2218 Commits

Author SHA1 Message Date
Robert Muir 415dff083f Watcher and Shield should depend on same guava version.
This causes hellaciousness at least with eclipse, possibly qa tests
too. the sanitiser just wants 11+, so make it the same version
as shield's (dragged in by jimfs).

Also remove unnecessary usage of guava in a test

Original commit: elastic/x-pack-elasticsearch@ea9ac88fdc
2015-11-23 19:52:01 -05:00
Ryan Ernst 3f856e7939 Merge pull request elastic/elasticsearch#1015 from rjernst/attach_without_subdir
Build: Change x-plugins setup with elasticsearch to a sibling directory

Original commit: elastic/x-pack-elasticsearch@d9f309c6db
2015-11-23 15:51:41 -08:00
Ryan Ernst c53390cbdf Change to x-plugins directory name instead of extra-plugin-x-plugins
Original commit: elastic/x-pack-elasticsearch@2b609414b7
2015-11-23 14:45:24 -08:00
Ryan Ernst 2f4dca744f Build: Change x-plugins setup with elasticsearch to a sibling directory
This change is the x-plugins side of elastic/elasticsearchelastic/elasticsearch#14952. It
now requires x-plugins to be checked out as a sibling of elasticsearch
called extra-plugin-x-plugins.

Original commit: elastic/x-pack-elasticsearch@f69b167407
2015-11-23 14:20:48 -08:00
debadair 90cb7d38b3 Docs: Added dates to Shield & Watcher release notes.
Original commit: elastic/x-pack-elasticsearch@2d42762b84
2015-11-23 13:20:51 -08:00
debadair c365da861f Shield Docs: Added information about enabling DLS/FLS.
Original commit: elastic/x-pack-elasticsearch@23f9ad66d4
2015-11-23 11:19:09 -08:00
debadair a973cbcd72 Shield Docs: Added release notes for 2.1.
Original commit: elastic/x-pack-elasticsearch@042904968b
2015-11-23 11:05:21 -08:00
debadair 9f6398127c Shield Docs: Added release notes for 2.0.1.
Original commit: elastic/x-pack-elasticsearch@a35092bc06
2015-11-23 11:03:45 -08:00
Colin Goodheart-Smithe 135f62fe6e Merge pull request elastic/elasticsearch#1005 from colings86/fix/eclipseError
Provides generics for action in ESUsersRealmTests

Original commit: elastic/x-pack-elasticsearch@d3be388f99
2015-11-23 11:26:07 +00:00
Colin Goodheart-Smithe 0a009e355c [TEST] Provides generics for action in ESUsersRealmTests
Although the build passes on the command line the Eclipse compiler complains that the client.execute() call on line 216 does not have correct arguments because of the lack of generics. This changes adds the generics to the action variable to solve the error in Eclipse. The change is very low risk and should not adversely affect the build on the command line nor in intelliJ IDEA

Original commit: elastic/x-pack-elasticsearch@08f3548556
2015-11-23 11:01:10 +00:00
Ryan Ernst 0a78332c3e Build: Remove leftover ant and maven files
A number of unused files still exist for maven assemblies and ant
integration test overrides. This change removes them. There are still
some files left which need to be examined more, for instance, the shield
overrides ant file.

Original commit: elastic/x-pack-elasticsearch@1d9b277ff0
2015-11-23 00:09:47 -08:00
uboness b752b79a29 [docs] fixed `chain` input example
Original commit: elastic/x-pack-elasticsearch@6ac4ac4ac9
2015-11-22 21:21:54 +01:00
Ryan Ernst 11e17752a9 Merge pull request elastic/elasticsearch#1000 from rjernst/extra_plugins
Build: Remove project attachment and use ES extra-plugins instead

Original commit: elastic/x-pack-elasticsearch@d4bb18746e
2015-11-22 09:04:05 -08:00
Ryan Ernst db09ee8d2a Merge branch 'master' into extra_plugins
Original commit: elastic/x-pack-elasticsearch@fa264a1ce4
2015-11-22 08:48:04 -08:00
Robert Muir 82d9247efe Merge pull request elastic/elasticsearch#1001 from rmuir/lock_down_system_property_writes
Ban write access to system properties

Original commit: elastic/x-pack-elasticsearch@919cf17b14
2015-11-22 11:28:32 -05:00
Robert Muir f1a9b50e9e Ban write access to system properties
Followup to https://github.com/elastic/elasticsearch/pull/14914

Shield has to request read-write access to all system properties
due to silliness in UnboundID sdk (556a203094/src/com/unboundid/util/Debug.java (L166))

We should followup with a pull request to them, to not use System.getProperties() here which
returns a mutable map (hence: read-write to "*").

Furthermore, the hack has to be wrapped in another hack because gradle doesn't add
shield's plugin metadata to the classpath. Of course, if we weren't testing with two
plugins in the classpath (which is not very realistic) this would be a non-issue.

Original commit: elastic/x-pack-elasticsearch@612cacde6a
2015-11-21 23:01:37 -05:00
Ryan Ernst 8119451a7b Build: Remove project attachment and use ES extra-plugins instead
This change removes the project attachment support, and instead relies
on x-plugins being checked out under extra-plugins/x-plugins within an
elasticsearch checkout. The only real change, other than removing
unnecessary code, was to rename the license/core project because gradle
project substitution has a bug which causes it to try and use ES core as
the substitution. (Unfortunately this is not reproduceable with a simple
example, so I have not yet filed an issue with gradle).

Original commit: elastic/x-pack-elasticsearch@fa315ffcb5
2015-11-21 11:13:32 -08:00
Martijn van Groningen d4fe344be1 Merge pull request elastic/elasticsearch#999 from martijnvg/watcher/unmute_slow_watches_tests
unmuted slow watches test

Original commit: elastic/x-pack-elasticsearch@0d55bd53f8
2015-11-20 14:09:51 +01:00
Martijn van Groningen f2900f71c5 test: unmuted slow watches test.
Removed the dependency on groovy and added a script impl. that allows to run Thread.sleep(...) in order to simulate a slow watch.

Relates to elastic/elasticsearch#724

Original commit: elastic/x-pack-elasticsearch@b18dd89b46
2015-11-20 14:02:17 +01:00
Tanguy Leroux a47adfb270 Marvel: Index Nodes in Time Based Index and Data Index
Closes elastic/elasticsearch#946

Original commit: elastic/x-pack-elasticsearch@0f5721ffbf
2015-11-19 21:09:23 +01:00
Tanguy Leroux ff1e6ec776 Marvel: Fix memory leak when something goes wrong in LocalExporter
When the bulk request executed by the LocalExporter has at least 1 failure, an exception is thrown and the BulkRequestBuilder is not reset. Then the next time Marvel collects data it will contain all the previous requests plus the new ones... leading to an OOM. IThis behavior was reproduced with a closed marvel index but it also happen in case of unassigned shards.

Original commit: elastic/x-pack-elasticsearch@9c3caa08eb
2015-11-19 16:07:01 +01:00
debadair 5809bbdb5d Docs: Deleting unused Marvel doc files. Marvel docs are currently in elasticsearch-marvel/docs.
Original commit: elastic/x-pack-elasticsearch@be7a7e2243
2015-11-18 17:46:21 -08:00
debadair fb4ba6f89d Watcher Docs: Edited chain input topic & added chain to customizing watches.
Original commit: elastic/x-pack-elasticsearch@9e1d7f09c6
2015-11-18 11:15:24 -08:00
jaymode 5b72d1768d test: add throws InterruptedException for InternalTestCluster#beforeTest calls
Original commit: elastic/x-pack-elasticsearch@b89a58a408
2015-11-18 13:48:54 -05:00
Tanguy Leroux 36dd391d4d Marvel: mute NodeStats tests
Original commit: elastic/x-pack-elasticsearch@f32464f864
2015-11-18 19:04:41 +01:00
Tanguy Leroux 37921036cb Marvel: ignore IndexNotFoundException for _all index when Shield is enabled
When Shield and Marvel are installed together and no indices exist in the cluster yet, Shield returns an IndexNotFoundException. This commit ignores and logs at DEBUG level any IndexNotFoundException iff a) Shield is enabled and 2) marvel.agent.indices setting is empty.

Closes elastic/elasticsearch#887

Original commit: elastic/x-pack-elasticsearch@5d227d775d
2015-11-18 16:58:08 +01:00
jaymode 16848c6043 shield: disable document and field level security by default
This change disables document and field level security by default so that we are able to maintain
bulk update functionality. Users that enable DLS/FLS will not have this functionality. Additionally,
if a user tries to configure DLS/FLS in a role without enabling it, the role will be skipped during
parsing and a log message will be logged at the error level.

See elastic/elasticsearch#938

Original commit: elastic/x-pack-elasticsearch@60c7519092
2015-11-18 08:02:29 -05:00
jaymode cc2096b4f9 add the option to disable DLS and FLS completely
This commit reverts a previous change where searcher were not wrapped when the RequestContext
could not be found. If DLS/FLS is enabled, which is the default, any bulk request that contains an
update request will not be permitted. This change also exposes the ability to completely disable DLS
and FLS so that users who are not using these features can still use bulk updates.

See elastic/elasticsearch#938

Original commit: elastic/x-pack-elasticsearch@513782db1c
2015-11-17 12:55:26 -05:00
Ryan Ernst 722bc3713e Merge pull request elastic/elasticsearch#987 from rjernst/clean_more
Build: Clean buildSrc on gradle clean

Original commit: elastic/x-pack-elasticsearch@a672ad7d33
2015-11-17 09:10:21 -08:00
Ryan Ernst cfba6af6c9 Merge pull request elastic/elasticsearch#988 from rjernst/disable_snapshot_cache
Build: Do not cache snapshots

Original commit: elastic/x-pack-elasticsearch@0fcbaad1ab
2015-11-16 13:43:17 -08:00
Ryan Ernst fc1d043c0d Build: Do not cache snapshots
Gradle marks dependencies with a version containing "SNAPSHOT" as
"changing", and caches them for 24 hours by default. This updates the
configuration to not cache them at all.

Original commit: elastic/x-pack-elasticsearch@ac95e30a96
2015-11-16 13:04:46 -08:00
Ryan Ernst 0d67caa468 Build: Clean buildSrc on gradle clean
Same change as elastic/elasticsearchelastic/elasticsearch#14785 but for xplugins.

Original commit: elastic/x-pack-elasticsearch@02e8247686
2015-11-16 12:45:03 -08:00
Tanguy Leroux 891d348dd1 Checks the number of actions in bulk request
Original commit: elastic/x-pack-elasticsearch@33678eb7f6
2015-11-16 15:57:18 +01:00
Tanguy Leroux a901aeef86 Marvel: reset buffer in HttpExporter
The BytesStreamOutput buffer is not reset when exporting multiple documents. It causes the same marvel doc to be indexed many times and it creates very large bulk requests. Bug introduced in elastic/x-pack@8575fd91c4

Original commit: elastic/x-pack-elasticsearch@adac96677d
2015-11-16 15:56:10 +01:00
Tanguy Leroux 0b50bbb5e5 Fix compilation errors with org.elasticsearch.cluster.health.ClusterHealthStatus
Original commit: elastic/x-pack-elasticsearch@68988b2163
2015-11-16 15:34:26 +01:00
Martijn van Groningen 46044a4fe0 test: use one IndexSetting instance
Original commit: elastic/x-pack-elasticsearch@1f35455ebe
2015-11-16 12:01:42 +01:00
Martijn van Groningen 101e4ff7ce test: added test that ensures that field data cache is not bypassed for segment and global ordinal caching when field subset reader hides the requested field.
Original commit: elastic/x-pack-elasticsearch@c4864d18ac
2015-11-16 11:38:02 +01:00
Martijn van Groningen 6e482d1a3d shield: Also prohibit update requests inside bulk requests if FLS is enabled.
We do this already for update requests, but this was forgotten to be checked for bulk requests.

Original commit: elastic/x-pack-elasticsearch@8d864a7c98
2015-11-16 05:49:33 +01:00
Chris Earle 6ef51d5dc0 Merge branch 'master' of https://github.com/elastic/x-plugins
Original commit: elastic/x-pack-elasticsearch@22a9ade30e
2015-11-13 14:44:59 -05:00
Lee Hinman 557f0d4f83 Fix compilation for `newIndexSettings` arity change
Original commit: elastic/x-pack-elasticsearch@f94fabfcc9
2015-11-13 09:35:46 -07:00
Chris Earle 8c5fdc7023 Fixing references to bin/plugin -i
Original commit: elastic/x-pack-elasticsearch@708d381742
2015-11-12 13:45:38 -05:00
Tanguy Leroux 3aa76795f9 Marvel: Ensure ClusterStatsTests waits enough for marvel documents
The should wait a bit more and refreshes index between each assertBusy()

Closes elastic/elasticsearch#729

Original commit: elastic/x-pack-elasticsearch@8ec702c1dc
2015-11-12 14:11:26 +01:00
Lee Hinman 7f0863ce83 Merge remote-tracking branch 'dakrone/fix-nullable'
Original commit: elastic/x-pack-elasticsearch@4ce4f5c3eb
2015-11-11 12:27:41 -07:00
jaymode 1601ce4fba add guava as a test dependency for jimfs
Original commit: elastic/x-pack-elasticsearch@331f834729
2015-11-11 13:40:03 -05:00
jaymode d74de5acc8 shield: only wrap readers if the RequestContext can be located
Previously, when the RequestContext could not be located a FieldSubsetReader was returned that only
allowed meta fields to be read. This was done for safety in case there was an API missed so we did not
leak data. However, this causes issues because some requests in elasticsearch execute on a different
thread than the one with the RequestContext so we effectively lose this context and prevent access to
the fields in the document. This is especially problematic with update requests, because that means that
fields that aren't included in the updated document will be lost.

This commit removes the wrapping of the readers in this case and adds tests for bulk updates.

Closes elastic/elasticsearch#938

Original commit: elastic/x-pack-elasticsearch@74c8059da0
2015-11-11 13:26:49 -05:00
Ryan Ernst 182f5c251d Merge pull request elastic/elasticsearch#968 from rjernst/transitive_goes_poof
Remove transitive dependencies

Original commit: elastic/x-pack-elasticsearch@3b1ad25cf1
2015-11-11 09:28:43 -08:00
Ryan Ernst 26c8e949a4 Build: Remove transitive dependencies
In elastic/elasticsearchelastic/elasticsearch#14668, transitive dependencies were removed
from elasticsearch, and plugins now no longer get transitive deps
either. This commit fixes xplugins to remove transitive deps.

Original commit: elastic/x-pack-elasticsearch@5c41657b6e
2015-11-11 09:18:24 -08:00
Lee Hinman c9dd618a0b Fix @Nullable import in watcher
Original commit: elastic/x-pack-elasticsearch@017ead8ff7
2015-11-11 10:00:24 -07:00
Ryan Ernst 838cb54b9e Merge pull request elastic/elasticsearch#959 from rjernst/version_cleanup
Remove repositories section now that it is included by build-tools

Original commit: elastic/x-pack-elasticsearch@213a117290
2015-11-10 08:10:24 -08:00
Martijn van Groningen 39e58b03d5 Fix upstream changes to IndexSearcherWrapper: https://github.com/elastic/elasticsearch/pull/14654
Original commit: elastic/x-pack-elasticsearch@b32ba2ad78
2015-11-10 23:10:04 +07:00