Commit Graph

192 Commits

Author SHA1 Message Date
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
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
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
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
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
Ryan Ernst 28326a2c4c Fix build to still work when not attached to elasticsearch
Original commit: elastic/x-pack-elasticsearch@e7056c2305
2015-11-06 14:03:08 -08:00
Ryan Ernst 33785e5446 Build: Improve behavior and setup for attachment to elasticsearch
Currently, running any task while attached to elasticsearch will also
try to run that task in all elasticsearch projects. This change causes
x-plugins to be moved into a subproject when attached. It does this by
dynamically creating a fake root project, and making this root project
think it is attached to the existing attachments, along with x-plugins
itself.

This also fixes buildSrc so attachment to elasticsearch's buildSrc
actually works.

Original commit: elastic/x-pack-elasticsearch@da0adf1da5
2015-11-06 11:08:03 -08:00
Tanguy Leroux 70f1b5c8f2 Marvel: Client nodes should be able to send metrics
closes elastic/elasticsearch#897

Original commit: elastic/x-pack-elasticsearch@1ebcc9de14
2015-11-06 15:32:13 +01:00
Tanguy Leroux 7e27abca98 Marvel: Add test for unsupported cluster version in HttpExporterTests
Original commit: elastic/x-pack-elasticsearch@556a05e86f
2015-11-06 15:12:12 +01:00
Robert Muir cfb77bf572 Remove confusing pom.xml files
Original commit: elastic/x-pack-elasticsearch@772a1eb5d3
2015-11-05 10:39:28 -05:00
Ryan Ernst d1b5d020f5 Switch to gradle build system.
See elastic/elasticsearchelastic/elasticsearch#13930

Original commit: elastic/x-pack-elasticsearch@b8d26ebd2a
2015-10-29 11:44:48 -07:00
Tanguy Leroux f16dabc2bb Marvel: fix template name in HttpExporter
Original commit: elastic/x-pack-elasticsearch@5f5592ad7f
2015-10-27 15:59:23 +01:00
Tanguy Leroux 496a595c24 Marvel: index_recovery type doesn't need all data indexed
closes elastic/elasticsearch#832

Original commit: elastic/x-pack-elasticsearch@5a8b2ea345
2015-10-27 15:34:07 +01:00
Simon Willnauer 90335855cb Merge pull request elastic/elasticsearch#875 from s1monw/catchup/pull/14293
Cut over to IndexModule to register query cache

Original commit: elastic/x-pack-elasticsearch@e96e6ee6ec
2015-10-27 12:30:41 +01:00
Simon Willnauer 2cb0cbf62a Cut over to IndexModule to register query cache
This commit cuts over to the new query cache registry in IndexModule added in
https://github.com/elastic/elasticsearch/pull/14293

Original commit: elastic/x-pack-elasticsearch@4d56584b01
2015-10-27 12:04:37 +01:00
Tanguy Leroux f3f5381bdc Marvel: fix ShardsCollectorTests
closes elastic/elasticsearch#752

Original commit: elastic/x-pack-elasticsearch@d3aee60d8a
2015-10-27 11:54:05 +01:00
jaymode b9b914408e test: ensure the bulk has been opened before trying to export
The LocalExporter tests seem to fail regularly in CI. It appears as though there is a race condition
where the LocalExporter has not truly been started yet and the tests try to send a collected document
through the exporter. The documents being indexed by the test are never indexed and are dropped.
The tests now wait for the exporter to be started.

Relates to elastic/elasticsearch#847

Original commit: elastic/x-pack-elasticsearch@b391067cae
2015-10-27 06:51:32 -04:00
Areek Zillur 40e1376ec9 fix marvel mock licensing plugin
Original commit: elastic/x-pack-elasticsearch@69e40ad13a
2015-10-26 14:54:37 -04:00
Areek Zillur 2471f73a6b remove register and remove license from license manager service
Original commit: elastic/x-pack-elasticsearch@8e593a126c
2015-10-26 14:18:05 -04:00
Tanguy Leroux ebd2e8e362 Marvel: Remove snapshot condition in HttpExporter
closes elastic/elasticsearch#864

Original commit: elastic/x-pack-elasticsearch@3bc511edcf
2015-10-26 13:44:02 +01:00
jaymode 75c6772c13 fix LocalExporter minimum version checks with non snapshot versions
The LocalExporter checks worked when using a snapshot version but did not work
in a released version even though the template was the correct version.

Original commit: elastic/x-pack-elasticsearch@581f54575b
2015-10-22 11:53:55 -04:00
uboness e9b35af03f Fix mem leak in NodeStatsCollector
Instead of injecting a provider for `DiskThresholdDecider` we now inject the `DiskThresholdDecider` directly.

Original commit: elastic/x-pack-elasticsearch@9aeacbee24
2015-10-21 18:39:17 +02:00
javanna 93065acf59 Remove references to search/exists that was deleted in core
Original commit: elastic/x-pack-elasticsearch@f1da798028
2015-10-21 18:30:30 +02:00
uboness a4c505ceb1 Changed the Marvel module name to Marvel Agent
- this results in a `marvel-agent-2.0.0.zip` artifact, to better differentiate it from the kibana marvel plugin
- post 2.0 when we move the marvel kibana codebase to x-plugins we'll need to differentiate between these two modules anyway.

Closes elastic/elasticsearch#846

Original commit: elastic/x-pack-elasticsearch@6b6a76f7dd
2015-10-21 14:03:23 +02:00
javanna 6b4f9d1405 fix compile errors after optimize api renaming in core
Original commit: elastic/x-pack-elasticsearch@a046fc43af
2015-10-21 09:55:41 +02:00
Nik Everett 8231e856c2 Remove and ban @Test
Original commit: elastic/x-pack-elasticsearch@02425ca13d
2015-10-20 18:20:46 -04:00
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