Commit Graph

2140 Commits

Author SHA1 Message Date
Tanguy Leroux 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
Jason Tedor 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
Jason Tedor 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
uboness 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
Nik Everett 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
Jason Tedor 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
Nik Everett f18b66fdc4 Handle missing actions when parsing WatchStatus
Original commit: elastic/x-pack-elasticsearch@b868aa1a62
2015-10-09 12:27:01 -04:00
Nik Everett 2bde3de3f0 Merge branch 'master' into immutable_map_be_gone
Original commit: elastic/x-pack-elasticsearch@62358ec345
2015-10-09 12:25:28 -04:00
Tanguy Leroux 2f1c88a633 Marvel: Use mock web server in HttpExporterTests
Original commit: elastic/x-pack-elasticsearch@b69b28af90
2015-10-09 09:33:55 +02:00
Tanguy Leroux 0ebc6198ac Marvel: Update Shard mapping
Closes elastic/elasticsearch#751

Original commit: elastic/x-pack-elasticsearch@af4276785c
2015-10-09 09:12:52 +02:00
Areek Zillur 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
jaymode fa85d04523 Marvel: update client after move of renderSearchTemplate methods
Original commit: elastic/x-pack-elasticsearch@7713f2fc72
2015-10-08 11:11:09 -04:00
Alexander Reelsen 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
jaymode 7b0f2628cb updates to handle renamed RenderSearchTemplateAction
Original commit: elastic/x-pack-elasticsearch@03cb49ce52
2015-10-08 09:09:00 -04:00
Tanguy Leroux 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
Ryan Ernst 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
Jason Tedor 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
debadair 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
jaymode a876755fd5 fix compile error. SimilarityLookupService -> SimilarityService
Original commit: elastic/x-pack-elasticsearch@d2f7e6dcf4
2015-10-07 16:27:47 -04:00
Martijn van Groningen 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
jaymode 98095a5ca8 add shield 2.0.0-rc1 release notes
Original commit: elastic/x-pack-elasticsearch@22e6a1499f
2015-10-07 07:18:02 -04:00
Nik Everett 0ff0cb7cd5 Merge branch 'master' into immutable_map_be_gone
Original commit: elastic/x-pack-elasticsearch@9eb0fb4bd7
2015-10-06 09:41:00 -04:00
Adrien Grand fec6ab7c22 Fix compile due to upstream elasticsearch changes.
Original commit: elastic/x-pack-elasticsearch@18033465c9
2015-10-06 14:00:50 +02:00
Martijn van Groningen 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
Martijn van Groningen 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
Martijn van Groningen 2cdd8c068f fixed compile error due to upstream change
Original commit: elastic/x-pack-elasticsearch@7c745ab463
2015-10-06 11:19:10 +02:00
Nik Everett dab504f6ba Remove ImmutableMap$Builder
Original commit: elastic/x-pack-elasticsearch@f0d3f71887
2015-10-05 17:11:33 -04:00
Nik Everett 1d61278b2d More ImmutableMap banning
Original commit: elastic/x-pack-elasticsearch@59fee6e288
2015-10-05 13:35:31 -04:00
Nik Everett eb60d5925a Start banning ImmutableMap
Original commit: elastic/x-pack-elasticsearch@b895e51944
2015-10-05 13:35:31 -04:00
Adrien Grand 32a2fd0297 Tests: disable more flaky tests.
Original commit: elastic/x-pack-elasticsearch@d9825c0ed4
2015-10-05 19:17:20 +02:00
Simon Willnauer 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
Simon Willnauer 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
Tanguy Leroux 01db047053 Marvel: Mute IndexStatsIT
Original commit: elastic/x-pack-elasticsearch@80676d3433
2015-10-05 10:56:16 +02:00
Tanguy Leroux 79f8a7c233 Marvel: Mute ClusterStatsTests
Original commit: elastic/x-pack-elasticsearch@597980db05
2015-10-05 09:25:26 +02:00
Jason Tedor 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
Jason Tedor 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
Jason Tedor 6103d96e83 Use abstraction from core
Original commit: elastic/x-pack-elasticsearch@01b66264e0
2015-10-04 16:25:15 -04:00
Jason Tedor 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
Jason Tedor 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
Jason Tedor 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
Jason Tedor 5c0b4b04ca Remove use of com.google.common.cache.*
This commit removes the use of com.google.common.cache.Cache,
com.google.common.cache.CacheBuilder and
com.google.common.cache.CacheLoader.

Relates elastic/elasticsearchelastic/elasticsearch#13224, elastic/elasticsearchelastic/elasticsearch#13717

Original commit: elastic/x-pack-elasticsearch@04c254ee95
2015-10-02 13:09:42 +02:00
uboness 42dac35d98 fixed ClusterStatsIT test (take 2)
Original commit: elastic/x-pack-elasticsearch@28f0f7bc9d
2015-09-30 11:22:15 +02:00
Robert Muir 71127c7b4f disable flaky tests, see elastic/elasticsearch#730
Original commit: elastic/x-pack-elasticsearch@a916919e7f
2015-09-29 22:09:22 -04:00
Robert Muir e11191fd03 disable flaky tests, see elastic/elasticsearch#729
Original commit: elastic/x-pack-elasticsearch@be8fbc156e
2015-09-29 21:32:41 -04:00
Robert Muir 4d71d18f50 Disable flaky test. See elastic/elasticsearch#728
Original commit: elastic/x-pack-elasticsearch@9210df1844
2015-09-29 21:27:18 -04:00
uboness 6ad26f1248 fixed ClusterStatsIT test
- `ClusterStatsIT` is now `ClusterStatsTests` (moving it to maven `test` phase)
- Simplified and restructured the test
- changed the `LocalExporter` to handle the case where the marvel template was deleted. Now every time the cluster state is updated, it'll make sure the template still exists and if not put it back.
- moved all the marvel template logic to a centrailzed place (`MarvelTemplateUtils`)
- moved all es/marvel version logic to a cernralized place (`VersionUtils`)
- now the `MarvelIntegTestCase` doesn't allow the marvel template to be deleted by the test infra
- improved logging output

Original commit: elastic/x-pack-elasticsearch@502532ddad
2015-09-29 15:57:56 +02:00
Robert Muir 9e9b835213 Move watcher REST tests that require groovy to smoke-test-watcher-with-groovy
See https://github.com/elastic/x-plugins/issues/724

Original commit: elastic/x-pack-elasticsearch@ab95aef8e3
2015-09-29 07:49:44 -04:00
Robert Muir 15bb2581a0 Fix compile and unit test phase by disabling unit tests with direct groovy dependencies (temporary!)
See https://github.com/elastic/x-plugins/issues/724

Original commit: elastic/x-pack-elasticsearch@27862a76cb
2015-09-29 07:06:51 -04:00
Tanguy Leroux 9b4a2c906e Marvel: Mute ClusterInfoCollectorTests until licensing stuff is updated
Original commit: elastic/x-pack-elasticsearch@d1b03e7cd3
2015-09-28 11:02:32 +02:00
uboness 794fd3805b fixed ClusterInfoCollectorTests#testClusterInfoCollector
Original commit: elastic/x-pack-elasticsearch@fa7accf6f5
2015-09-26 14:51:23 +02:00