Commit Graph

1960 Commits

Author SHA1 Message Date
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
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
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
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
Tanguy Leroux 415f6eda79 Add LocalExporter implementation
Original commit: elastic/x-pack-elasticsearch@36a683294c
2015-09-26 04:30:34 +02:00
uboness 1c5e03a239 fixed tests
Original commit: elastic/x-pack-elasticsearch@bea8d61278
2015-09-26 04:30:34 +02:00
uboness 57561f9a03 cleaned up `HttpExporterUtils`
Original commit: elastic/x-pack-elasticsearch@2db95799ea
2015-09-26 04:30:34 +02:00
uboness c85f0f4564 Fixed the integration tests
- prepared the ground for shield integration tests.
- for now, `shield` is disabled for all integration tests (once we have the `local` exporter we'll be able to turn shield on.

Original commit: elastic/x-pack-elasticsearch@cf5d660f58
2015-09-26 04:30:34 +02:00
uboness 345efb38d6 Cleaned up warnings in `SecuredClient`
Original commit: elastic/x-pack-elasticsearch@b8f52f1518
2015-09-26 04:30:34 +02:00
uboness 53b2fb9826 cleaned up `Exporters`
- also added additional unit tests for this class

Original commit: elastic/x-pack-elasticsearch@c16891a50a
2015-09-26 04:30:33 +02:00
uboness 7206de9c2a Adding multiple exporter types
- an exporter is no longer fixed construct. Instead, this commit creates an `Exporter` abstraction. An exporter has a type and is responsible for exporting marvel documents.
- multiple exporters can be configured, each can be of a different type.
- an exporter can be of a "singleton" type, indicating that there can only be one exporter of that type at any point in time.
- exporters are configured in the settings. Each exporters is identified by a unique name/id and has its own settings (the type of the exporter defines what settings that exporter expects)
- exporters are loaded at start up time, but it is also possible to update the exporter settings at runtime (all exporter settings are registered as dynamic cluster settings). When updated, all the exporters will be rebuild & reloaded.
- there are two types of exporters: `http` and `local`
- `http` exporter exports documents to external elasticsearch clusters using the REST API
- the new `http` exporter doesn't support user info as part of the URL (it's pron to security info leak). Instead a new `auth.username` and `auth.password` settings were added that can be set per `http` exporter (when shield is installed, the passwords are filtered out from the node info API)
- `local` exporter exports documents to the same cluster the agent is installed on, using the internal node client.
- when no exporter is configured, a default `local` exporter is created (for best ootb experience)

Original commit: elastic/x-pack-elasticsearch@d1d7c8aefd
2015-09-26 04:30:33 +02:00
uboness 334e090902 Shield Integration
- Adds internal `__marvel_user`
- Adds a `SecuredClient` that binds the internal marvel user to all requests it sends

Original commit: elastic/x-pack-elasticsearch@77c4716261
2015-09-26 04:30:33 +02:00
Nik Everett bee764b9ee Merge pull request elastic/elasticsearch#713 from elastic/immutable_set_be_gone
Remove ImmutableSet

Original commit: elastic/x-pack-elasticsearch@fe06937bc7
2015-09-25 21:46:22 -04:00
jaymode 44cd14d5f1 test: cleanup usages of node builder where we actually need Shield loaded
Some tests are still using a node builder for nodes that need to load Shield, which is not currently
supported by elasticsearch. This changes some to use a MockNode and awaits fix a tribe test
that was previously testing nothing.

Original commit: elastic/x-pack-elasticsearch@57d0c902b6
2015-09-25 13:05:07 -04:00
Nik Everett c6e7c9c1d6 Merge branch 'master' into immutable_set_be_gone
Original commit: elastic/x-pack-elasticsearch@faa212ffbd
2015-09-25 10:47:16 -04:00
javanna 22edda4044 [TEST] fix method clashes due to randomTimeValue addition to ESTestCase
Original commit: elastic/x-pack-elasticsearch@74bd522bf8
2015-09-25 16:45:11 +02:00
jaymode dd8ce6017b test: update certificates to have more localhost subject alternative names
This updates our test certificates to have more subject alternative names and adds a script
to make regeneration easier in the future. Also added are the private keys in PEM format and
a .p12 version of the keystore. In the future we may want to start supporting PKCS12 keystores
and this will be a starting point for that.

Original commit: elastic/x-pack-elasticsearch@92c94c9f28
2015-09-25 10:36:28 -04:00
Nik Everett 81970a564f Fix Set->String conversion
Original commit: elastic/x-pack-elasticsearch@c34f2d252d
2015-09-25 10:16:34 -04:00
javanna 90a11b20e6 [TEST] fix method clash due to randomTimeValue addition to ESTestCase
Original commit: elastic/x-pack-elasticsearch@cbcdfa641b
2015-09-25 16:13:32 +02:00