Commit Graph

2495 Commits

Author SHA1 Message Date
Ryan Ernst 19b7cad39c Build: Add back shield client qa tests
Original commit: elastic/x-pack-elasticsearch@6cecea3992
2015-11-24 16:40:05 -08:00
Ryan Ernst f96a6700c4 Build: Remove hack in shield+watcher rest test for copying config file
Original commit: elastic/x-pack-elasticsearch@e31ef685d0
2015-11-24 16:13:22 -08:00
Robert Muir 737f2e3b29 Merge pull request elastic/elasticsearch#1029 from rmuir/watcher_with_shield_qa
re-enable smoke-test-watcher-with-shield qa test

Original commit: elastic/x-pack-elasticsearch@0c8a0b17cb
2015-11-24 18:56:37 -05:00
Robert Muir 4b35407510 re-enable smoke-test-watcher-with-shield qa test
Original commit: elastic/x-pack-elasticsearch@2710eb67ef
2015-11-24 18:49:15 -05:00
debadair feb247d2a0 Docs: Tweaked release notes for consistency.
Original commit: elastic/x-pack-elasticsearch@bb94d42cbf
2015-11-24 15:32:13 -08:00
Robert Muir a4f596b204 get watcher+groovy QA test working again (without hack)
Original commit: elastic/x-pack-elasticsearch@843a5ea6e4
2015-11-24 17:41:21 -05:00
Ryan Ernst dcfda95175 Merge pull request elastic/elasticsearch#1024 from rjernst/easier_plugin_installs
Build: Simplify plugin installs for integTests

Original commit: elastic/x-pack-elasticsearch@c4dede7b92
2015-11-24 13:09:37 -08:00
Ryan Ernst 4f44ccedb5 Build: Simplify plugin installs for integTests
This is the xplugins side of elastic/elasticsearchelastic/elasticsearch#14986, making use of
the simplification in configuration.

Original commit: elastic/x-pack-elasticsearch@a24ad7b08a
2015-11-24 12:54:11 -08:00
uboness ec3ba81be3 Create GRADLE.CHEATSHEET
Original commit: elastic/x-pack-elasticsearch@d5bbad8873
2015-11-24 21:02:28 +01:00
Robert Muir 59b4177b95 Mark the slowest slowest tests @BadApple
See elastic/elasticsearch#1007

Original commit: elastic/x-pack-elasticsearch@87ebfb1eab
2015-11-24 14:39:16 -05:00
debadair 9b32a4e7c4 Docs: Updated offline install links to show version numbers.
Original commit: elastic/x-pack-elasticsearch@a00efeea1c
2015-11-24 09:50:21 -08:00
Timothy Sullivan f7a69c4e02 Merge remote-tracking branch 'upstream/2.1'
Original commit: elastic/x-pack-elasticsearch@516478e333
2015-11-24 09:26:23 -07:00
Ryan Ernst f3a76118db Merge pull request elastic/elasticsearch#1017 from rjernst/qa/shield_core_rest
Build: Get shield qa test with core rest tests working

Original commit: elastic/x-pack-elasticsearch@0bf9f9ac9f
2015-11-24 08:25:29 -08:00
Ryan Ernst b011490320 Add more retries for wait condition, in case jenkins is slow
Original commit: elastic/x-pack-elasticsearch@04e5648cd9
2015-11-24 08:24:57 -08:00
jaymode d9363085c3 docs: add Shield 1.3.3 release notes
Original commit: elastic/x-pack-elasticsearch@69a525677b
2015-11-24 09:32:06 -05:00
Tanguy Leroux 0138384981 Marvel: Unmute nodes stats tests
Original commit: elastic/x-pack-elasticsearch@9244d6e15a
2015-11-24 12:44:15 +01:00
Tanguy Leroux c190894228 Marvel: Update Node Stats with os.cpu.load_average
Original commit: elastic/x-pack-elasticsearch@fa8ed35105
2015-11-24 12:32:08 +01:00
Ryan Ernst 9da4b6160c Build: Get shield qa test with core rest tests working
This adds back the shield qa rest tests module with gradle. There is
also a small fix in ShieldPlugin for a bug that was discovered around
checking for a custom query cache (which was using the node settings
instead of index settings).

Original commit: elastic/x-pack-elasticsearch@28c6d58f37
2015-11-24 01:05:21 -08:00
Ryan Ernst 5f30602d1a Merge pull request elastic/elasticsearch#1003 from rjernst/maven_cleanup
Build: Remove leftover ant and maven files

Original commit: elastic/x-pack-elasticsearch@a3bdc7917d
2015-11-24 00:54:37 -08:00
Adrien Grand f8ab6f0fb5 Fix compilation of ShieldIndexSearcherWrapperUnitTests.
The break was introduced in elastic/elasticsearchelastic/elasticsearch#14896.

Original commit: elastic/x-pack-elasticsearch@07810b2d2b
2015-11-24 09:28:28 +01:00
Robert Muir e1319be504 Merge pull request elastic/elasticsearch#1016 from rmuir/messy
Watcher and Shield should depend on same guava version.

Original commit: elastic/x-pack-elasticsearch@b76e98576c
2015-11-23 20:14:34 -05:00
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 611db9ba17 Fixing conflicts with Master
Original commit: elastic/x-pack-elasticsearch@63396e9588
2015-11-23 14:00:48 -08:00
debadair bfbf8a252d Fixed conflict in intro.
Original commit: elastic/x-pack-elasticsearch@eee009f4c1
2015-11-23 13:48:01 -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 3aa3376ca6 Docs: Bumped version number to 2.1.0 and added 2.1.0 release notes.
Original commit: elastic/x-pack-elasticsearch@e39cf3e654
2015-11-23 11:55:40 -08:00
debadair e4b7f6af94 Docs: Bumped version number to 2.1.0 and added 2.1.0 release notes.
Original commit: elastic/x-pack-elasticsearch@dc99f25899
2015-11-23 11:53:43 -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
Lukas Olson be6ce90ade Move error message above login form and make it actually red
Original commit: elastic/x-pack-elasticsearch@abe5928e9b
2015-11-20 13:09:16 -07:00
Lukas Olson 25966f03d9 Make specification of encryptionKey required instead of defaulting to secret
Original commit: elastic/x-pack-elasticsearch@14f2e22356
2015-11-20 13:02:31 -07:00
Lukas Olson 7af8bd5de7 Import colors from Kibana rather than specifying custom colors
Original commit: elastic/x-pack-elasticsearch@48a2c0fd88
2015-11-20 12:58:00 -07: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
Tim Sullivan 9c19d82b77 Merge pull request elastic/elasticsearch#666 from simianhacker/2.1
Minor Adjustments for the Nodes Formats from the Plugin

Original commit: elastic/x-pack-elasticsearch@6260bf7c9a
2015-11-19 18:46:22 -07:00
Chris Cowan 932ed158de Fixing issue with nodes
Original commit: elastic/x-pack-elasticsearch@d8ef1d6023
2015-11-19 17:27:42 -06: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