72c015f82e
DLS: Use the cache keys of the wrapped reader instead of the document subset reader itself.
...
Original commit: elastic/x-pack-elasticsearch@14ff21cc5b
2015-10-11 22:12:36 +02:00
6e0365127a
Marvel: Fix MarvelSettingsTests
...
closes elastic/elasticsearch#753
Original commit: elastic/x-pack-elasticsearch@a7bca03232
2015-10-11 14:22:48 +02:00
70d524c979
Marvel: Fix bug that prevent collectors to collect when license is enabled
...
Original commit: elastic/x-pack-elasticsearch@9f22baa2ee
2015-10-11 14:20:10 +02:00
a80cc90240
Marvel: Fix integration tests in org.elasticsearch.marvel.agent.renderer package
...
Closes elastic/elasticsearch#470
Original commit: elastic/x-pack-elasticsearch@db07ac416d
2015-10-11 13:46:49 +02:00
fa310087ba
Merge remote-tracking branch 'upstream/master'
...
Original commit: elastic/x-pack-elasticsearch@9652147fc2
2015-10-09 19:08:37 -04:00
1fc674abfd
Merge pull request elastic/elasticsearch#771 from jasontedor/guava-be-gone
...
Remove Guava as a dependency
Original commit: elastic/x-pack-elasticsearch@93e65a9fc9
2015-10-09 15:52:35 -04:00
b468c74401
Remove Guava as a dependency
...
This commit removes Guava as a dependency. Note that Guava will remain
as a test-only dependency (transitively through Elasticsearch through
Jimfs).
Relates elastic/elasticsearchelastic/elasticsearch#13224
Original commit: elastic/x-pack-elasticsearch@fe23d5f25f
2015-10-09 14:56:03 -04:00
f6a613fa88
[marvel] Integrated the new unified license model
...
- Added the notion of `Licensee.Status` (holds both the `License.OperationMode` and the `LicenseState`)
- Added a support base class for all `Licensee` implementations. The idea behind this is that implementations will centralized the licensing logic in one class (same as `MarvelLicensee` does), but if there's a requirement for more "proactiveness" on license status change, different components can register a `Licensee.Listener` to be notified on license changes.
- Since we introduced `License.OperationMode` as part of the license refactoring, there's no need anymore for Marvel's `Mode` enum.
Closes elastic/elasticsearch#690
Original commit: elastic/x-pack-elasticsearch@8a66bc163f
2015-10-09 20:14:14 +02:00
59ac529e8b
Merge pull request elastic/elasticsearch#740 from nik9000/immutable_map_be_gone
...
Remove and ban ImmutableMap
Original commit: elastic/x-pack-elasticsearch@7f1dfb5bb6
2015-10-09 12:56:12 -04:00
e8dc52857d
Merge pull request elastic/elasticsearch#735 from jasontedor/straight-cache-homey
...
Remove use of com.google.common.cache.*
Original commit: elastic/x-pack-elasticsearch@c9551c65e6
2015-10-09 12:28:10 -04:00
f18b66fdc4
Handle missing actions when parsing WatchStatus
...
Original commit: elastic/x-pack-elasticsearch@b868aa1a62
2015-10-09 12:27:01 -04:00
2bde3de3f0
Merge branch 'master' into immutable_map_be_gone
...
Original commit: elastic/x-pack-elasticsearch@62358ec345
2015-10-09 12:25:28 -04:00
2f1c88a633
Marvel: Use mock web server in HttpExporterTests
...
Original commit: elastic/x-pack-elasticsearch@b69b28af90
2015-10-09 09:33:55 +02:00
0ebc6198ac
Marvel: Update Shard mapping
...
Closes elastic/elasticsearch#751
Original commit: elastic/x-pack-elasticsearch@af4276785c
2015-10-09 09:12:52 +02:00
daf4a9765c
[License] Feature agnostic licensing model
...
This commit changes the license plugin to work with license that are not tied to any specific feature in a bwc way. It refactors the license plugin api into a lighter weight API, enabling the license plugin to manage license expiration and acknowledgment triggers.
closes elastic/elasticsearch#683 , elastic/elasticsearch#686 , elastic/elasticsearch#687 , elastic/elasticsearch#691
Original commit: elastic/x-pack-elasticsearch@537cd3933a
2015-10-09 00:32:15 -04:00
e962e6a5fb
Merge pull request elastic/elasticsearch#547 from tsullivan/add-google-analytics-tag
...
Add google analytics tag
Original commit: elastic/x-pack-elasticsearch@2fdf44bdee
2015-10-08 20:00:35 -04:00
2229058832
Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel into add-google-analytics-tag
...
Original commit: elastic/x-pack-elasticsearch@925de4d2f4
2015-10-08 14:30:35 -07:00
4c2ea72201
Merge pull request elastic/elasticsearch#560 from kjbekkelund/gulpfile-cleanup
...
Gulpfile cleanup
Original commit: elastic/x-pack-elasticsearch@a820ad2649
2015-10-08 11:12:13 -07:00
c04d6b882d
Merge pull request elastic/elasticsearch#564 from panda01/master
...
Some fixes
Original commit: elastic/x-pack-elasticsearch@fb17bbf650
2015-10-08 11:09:18 -07:00
fdaca47946
Merge pull request elastic/elasticsearch#565 from epixa/fix-marvel-install-readme
...
Fix incorrect install command in readme
Original commit: elastic/x-pack-elasticsearch@45bf83a3ab
2015-10-08 10:44:47 -07:00
53cad5f3c8
Fix incorrect install command in readme
...
Original commit: elastic/x-pack-elasticsearch@c0e292ed3e
2015-10-08 11:16:55 -04:00
fa85d04523
Marvel: update client after move of renderSearchTemplate methods
...
Original commit: elastic/x-pack-elasticsearch@7713f2fc72
2015-10-08 11:11:09 -04:00
e589d2e46e
Marvel: Fixing compilation errors for changed render search template
...
Original commit: elastic/x-pack-elasticsearch@d04257df85
2015-10-08 15:52:44 +02:00
7b0f2628cb
updates to handle renamed RenderSearchTemplateAction
...
Original commit: elastic/x-pack-elasticsearch@03cb49ce52
2015-10-08 09:09:00 -04:00
192526ff00
Marvel: Add state_uuid to cluster_state documents
...
Closes elastic/elasticsearch#750
Original commit: elastic/x-pack-elasticsearch@4005fe0090
2015-10-08 13:40:38 +02:00
fc0548ba58
Merge pull request elastic/elasticsearch#733 from rjernst/key_location
...
Move dummy public key into main resources
Original commit: elastic/x-pack-elasticsearch@264a8e1593
2015-10-08 01:48:46 -07:00
ee5f092eb5
Merge pull request elastic/elasticsearch#736 from jasontedor/replace-inet-addresses
...
Remove use of com.google.common.net.InetAddresses
Original commit: elastic/x-pack-elasticsearch@7fb80c9ff3
2015-10-07 20:29:58 -04:00
144d9e85df
Shield Docs: Fixed GS verification step. Closes elastic/elasticsearch#760 .
...
Original commit: elastic/x-pack-elasticsearch@9a2f810131
2015-10-07 13:46:27 -07:00
a876755fd5
fix compile error. SimilarityLookupService -> SimilarityService
...
Original commit: elastic/x-pack-elasticsearch@d2f7e6dcf4
2015-10-07 16:27:47 -04:00
56981b5fff
watcher: removed calibrating with round clock in ticker trigger engine
...
Closes elastic/elasticsearch#749
Original commit: elastic/x-pack-elasticsearch@f9f2db50d5
2015-10-07 18:12:20 +02:00
98095a5ca8
add shield 2.0.0-rc1 release notes
...
Original commit: elastic/x-pack-elasticsearch@22e6a1499f
2015-10-07 07:18:02 -04:00
0ff0cb7cd5
Merge branch 'master' into immutable_map_be_gone
...
Original commit: elastic/x-pack-elasticsearch@9eb0fb4bd7
2015-10-06 09:41:00 -04:00
fec6ab7c22
Fix compile due to upstream elasticsearch changes.
...
Original commit: elastic/x-pack-elasticsearch@18033465c9
2015-10-06 14:00:50 +02:00
a569951187
docs: updated release notes for elastic/elasticsearch#649 change
...
Original commit: elastic/x-pack-elasticsearch@ee5e009fd2
2015-10-06 11:36:09 +02:00
686c92312f
Prevent Watcher to start if `action.auto_create_index` setting is too restrictive.
...
Closes elastic/elasticsearch#649
Original commit: elastic/x-pack-elasticsearch@afe05332ce
2015-10-06 11:22:06 +02:00
2cdd8c068f
fixed compile error due to upstream change
...
Original commit: elastic/x-pack-elasticsearch@7c745ab463
2015-10-06 11:19:10 +02:00
dab504f6ba
Remove ImmutableMap$Builder
...
Original commit: elastic/x-pack-elasticsearch@f0d3f71887
2015-10-05 17:11:33 -04:00
1d61278b2d
More ImmutableMap banning
...
Original commit: elastic/x-pack-elasticsearch@59fee6e288
2015-10-05 13:35:31 -04:00
eb60d5925a
Start banning ImmutableMap
...
Original commit: elastic/x-pack-elasticsearch@b895e51944
2015-10-05 13:35:31 -04:00
32a2fd0297
Tests: disable more flaky tests.
...
Original commit: elastic/x-pack-elasticsearch@d9825c0ed4
2015-10-05 19:17:20 +02:00
7f7f91cf17
Merge pull request elastic/elasticsearch#739 from s1monw/no_shard_level_injector_baby
...
Remove shard level injector usage
Original commit: elastic/x-pack-elasticsearch@ac3e2dfe7b
2015-10-05 15:13:47 +02:00
b7ca362df5
Remove shard level injector usage
...
This commit catches up with master which removed the shard level injector
and changed the logic how the SearcherWrapper works and is installed.
The way we now install it is via a package private onModule(IndexModule) call.
There is no public API for this anymore.
The wrapper also doesn't need to watch the IndexShards state since now it will only
be used when the shard is STARTED or RECOVERED.
Original commit: elastic/x-pack-elasticsearch@42b9eeef3d
2015-10-05 14:43:45 +02:00
01db047053
Marvel: Mute IndexStatsIT
...
Original commit: elastic/x-pack-elasticsearch@80676d3433
2015-10-05 10:56:16 +02:00
79f8a7c233
Marvel: Mute ClusterStatsTests
...
Original commit: elastic/x-pack-elasticsearch@597980db05
2015-10-05 09:25:26 +02:00
c9c02c6a90
Remove unused imports in o.e.m.a.r.c.ClusterInfoRenderer
...
Original commit: elastic/x-pack-elasticsearch@dcb63514cc
2015-10-04 16:42:02 -04:00
cae3efaa49
Merge pull request elastic/elasticsearch#737 from jasontedor/hash-be-gone
...
Remove use of com.google.common.hash.Hashing
Original commit: elastic/x-pack-elasticsearch@803492b382
2015-10-04 16:26:23 -04:00
6103d96e83
Use abstraction from core
...
Original commit: elastic/x-pack-elasticsearch@01b66264e0
2015-10-04 16:25:15 -04:00
ba86e3968c
Use a cloned instance of MessageDigest
...
This commit adds a micro-optimization for obtaining a MessageDigest
instance for calculating SHA-256 message digests. Benchmarking with JMH
showed the micro-benchmarking of getting new instances versus cloning
existing instances to be around twice as slow.
Original commit: elastic/x-pack-elasticsearch@d558ed961f
2015-10-02 16:16:18 -04:00
86596f4194
Remove use of com.google.common.hash.Hashing
...
This commit removes all uses of com.google.common.hash.Hashing across
the codebase. This is one of the few remaining steps in the eventual
removal of Guava as a dependency.
Relates elastic/elasticsearchelastic/elasticsearch#13224
Original commit: elastic/x-pack-elasticsearch@5b90c9a496
2015-10-02 17:24:51 +02:00
556e8ca401
Remove use of com.google.common.net.InetAddresses
...
This commit removes all uses of com.google.common.net.InetAddresses
across the codebase. This is one of the few remaining steps in the
eventual removal of Guava as a dependency.
Relates elastic/elasticsearchelastic/elasticsearch#13224
Original commit: elastic/x-pack-elasticsearch@f6a0ed1395
2015-10-02 15:28:19 +02:00
Martijn van Groningen
Tanguy Leroux
Khalah Jones-Golden
Jason Tedor
uboness
Nik Everett
Areek Zillur
Chris Cowan
Court Ewing
jaymode
Alexander Reelsen
Ryan Ernst
debadair
Adrien Grand
Simon Willnauer
Simon Willnauer