Commit Graph

163 Commits

Author SHA1 Message Date
uboness c2c7cbf2f5 updated LICENSE.txt and NOTES.txt
Closes elastic/elasticsearch#837
Closes elastic/elasticsearch#310

Original commit: elastic/x-pack-elasticsearch@164817c0c8
2015-10-20 14:58:36 +02:00
Alexander Reelsen d90f29ad98 Marvel: Dont skip deployment
This had been disabled in the past due to marvel not being ready, but needs
to be reenabled to make sure marvel is released.

Original commit: elastic/x-pack-elasticsearch@269d5623d0
2015-10-20 14:06:33 +02:00
javanna baa36f7bae adapt to upstream java count api removal
Original commit: elastic/x-pack-elasticsearch@ea6c53b88e
2015-10-19 15:10:59 +02:00
Areek Zillur ae552efc3c [license] simplify Licensee interface
Currently, Licensee#onChange is called with a license and its status, It would be
cleaner if it accepted the license's operationMode and status as parameters instead.
This hides the license responsible for the notification from the consumer plugins and only
provides the license information used by the commercial plugins to turn features on via
operationMode and status to act on whether the current license is enabled, in
grace_period or disabled.

Original commit: elastic/x-pack-elasticsearch@b0ea7ec32b
2015-10-15 17:57:54 -04:00
Tanguy Leroux dd37624adc Marvel: fix wrong SSL settings resolution
Original commit: elastic/x-pack-elasticsearch@70ab3df255
2015-10-15 20:34:40 +02:00
Tanguy Leroux 159ec9b226 Marvel: add process CPU percent to node_stats document
closes elastic/elasticsearch#808

Original commit: elastic/x-pack-elasticsearch@410000c913
2015-10-15 20:24:09 +02:00
uboness 077eec83df Merge pull request elastic/elasticsearch#793 from tlrx/fix-load-remote-cluster-version
Marvel: fix load remote cluster version

Original commit: elastic/x-pack-elasticsearch@f106717cda
2015-10-13 14:39:32 -07:00
jaymode b698cde334 make AbstractLicenseeComponents compatible with the found license plugin
Original commit: elastic/x-pack-elasticsearch@6b664d3956
2015-10-13 14:42:37 -04:00
Tanguy Leroux 185f765d03 Marvel: fix load remote cluster version
Original commit: elastic/x-pack-elasticsearch@ab7bb3cdd9
2015-10-13 20:32:25 +02:00
jaymode 28948f8930 shield: enable and disable features based on license type
Shield now supports the ability to disable or enable individual features based on the type of
license that is currently installed. The change replaces the LicenseService in shield with a
ShieldLicensee that is notified on changes to the license. The ShieldLicensee then updates
a ShieldLicenseState object, which contains the logic and methods to check for features being
enabled or disabled. The ShieldLicenseState object is used by consumers to check the status
of a feature. The decoupling of the feature enablement from the ShieldLicensee class was done
to work around circular dependency issues.

Closes elastic/elasticsearch#689

Original commit: elastic/x-pack-elasticsearch@442514496d
2015-10-13 10:57:19 -04:00
Tanguy Leroux 704f9b12bc Marvel: remove remaining @AwaitsFix and re enable licensing tests
Original commit: elastic/x-pack-elasticsearch@5e2eedae6d
2015-10-13 14:36:57 +02:00
Tanguy Leroux 6862cf6996 Marvel: stabilize LocalExporterTests
closes elastic/elasticsearch#779

Original commit: elastic/x-pack-elasticsearch@8b5e80e246
2015-10-12 11:10:42 +02:00
Tanguy Leroux 6e0365127a Marvel: Fix MarvelSettingsTests
closes elastic/elasticsearch#753

Original commit: elastic/x-pack-elasticsearch@a7bca03232
2015-10-11 14:22:48 +02:00
Tanguy Leroux 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
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
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
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
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
Adrien Grand 32a2fd0297 Tests: disable more flaky tests.
Original commit: elastic/x-pack-elasticsearch@d9825c0ed4
2015-10-05 19:17:20 +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 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
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
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
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
uboness dd2f0dbce5 fixed tests when shield is disabled
- also turned shield testing to be random

Original commit: elastic/x-pack-elasticsearch@9f236826ea
2015-09-26 04:30:35 +02:00
Tanguy Leroux 00f8e40a99 Fix tests
Original commit: elastic/x-pack-elasticsearch@3d76fda9d8
2015-09-26 04:30:35 +02:00
Tanguy Leroux 047022ab0f Move MarvelRestIT.java in a rest package
Original commit: elastic/x-pack-elasticsearch@b2e90bb3ea
2015-09-26 04:30:35 +02:00
Tanguy Leroux 6f557f3640 Remove static in MarvelIntegTestCase.java so that LocalExporterTests can be executed after HttpExporterTests
Original commit: elastic/x-pack-elasticsearch@d8363ed606
2015-09-26 04:30:35 +02:00
Tanguy Leroux 72675e711d Remove static stuff in MarvelSettings
Original commit: elastic/x-pack-elasticsearch@e534397299
2015-09-26 04:30:35 +02:00
uboness 78d006dbcc cleanup
- moved `MIN_SUPPORTED_TEMPLATE_VERSION` to `Exporter`

Original commit: elastic/x-pack-elasticsearch@75df7cb083
2015-09-26 04:30:35 +02:00
uboness 1cd5b51283 cleaned up forbidden apis
Original commit: elastic/x-pack-elasticsearch@9d42f8d07d
2015-09-26 04:30:35 +02:00
uboness 71b0b121f7 Fixed the cluster state handling in local exporter
- addded additional tests for local exporter

Original commit: elastic/x-pack-elasticsearch@b188394078
2015-09-26 04:30:35 +02:00
uboness 8fa83b9109 Cleaned up local exporter
- remove state - the existing of the internal `bulk` is enough to determine the state of the exporter. When the exporter is started, the bulk is instantiated.
- simplified & structured the startup of the exporter - now it listens to cluster state events and acts on those, rather than fetching & checking the cluster state on demand.
- the master is responsible for "putting" the marvel template... everything else will just wait for the right template to appear in the cluster state.
- started to fix the local exporter tests

Original commit: elastic/x-pack-elasticsearch@7fae23d166
2015-09-26 04:30:35 +02:00
uboness 899f359946 Enhanced local exporter
- fixed concurrency issues
- started to work on fixing the tests

Original commit: elastic/x-pack-elasticsearch@3cfc4d2cda
2015-09-26 04:30:35 +02:00
uboness a86bb7b140 Introduced `ExportBulk`
- bulk abstraction on top of exporter
- removed queuing and bulk processor from local exporter
- started to adjust tests to shield (require a lot of helper methods in `MarvelInegTestCase`)
- moved index name resolution to `Exporter` (functionality shared between all exporters)

Original commit: elastic/x-pack-elasticsearch@86b495622c
2015-09-26 04:30:34 +02:00
uboness 3162097ce8 disabled licensing tests until license refactoring is done
Original commit: elastic/x-pack-elasticsearch@e5673fedd9
2015-09-26 04:30:34 +02:00
uboness 075707e12c cleanup for local exporter
Original commit: elastic/x-pack-elasticsearch@b715ab7ca1
2015-09-26 04:30:34 +02:00
Tanguy Leroux e2719ab213 Add tests for LocalExporter
Original commit: elastic/x-pack-elasticsearch@a1866a9c39
2015-09-26 04:30:34 +02:00
Tanguy Leroux da4b259c48 Remove start/stop in Exporter(s)
Original commit: elastic/x-pack-elasticsearch@9ddcb8119b
2015-09-26 04:30:34 +02:00