Commit Graph

1615 Commits

Author SHA1 Message Date
Martijn van Groningen 64ee394460 There is no need to check if the primary shards of the history indices are started, since we don't load watch records any more during the Watcher startup process.
Original commit: elastic/x-pack-elasticsearch@e6bfb37477
2015-08-05 18:58:11 +02:00
Martijn van Groningen 3f0509923a Use custom metadata to remember that Watcher stopped via an explicit stop api call.
Also expose WatcherMetaData in stats api

Original commit: elastic/x-pack-elasticsearch@5581615f9c
2015-08-05 18:55:52 +02:00
Tanguy Leroux e87b3d0681 Marvel: Add Cluster Stats timeout
Original commit: elastic/x-pack-elasticsearch@6a5631d124
2015-08-05 11:31:42 +02:00
uboness 5f932952f2 [watcher] Remove default timezone usage
Closes elastic/elasticsearch#387

Original commit: elastic/x-pack-elasticsearch@5382fecf10
2015-08-05 00:20:14 +02:00
Robert Muir 87f8f6a0a6 Merge pull request elastic/elasticsearch#386 from rmuir/shield_integ_update
adapt shield to integration tests changes

Original commit: elastic/x-pack-elasticsearch@f76cff75ea
2015-08-04 17:11:52 -04:00
Robert Muir 46685fd5ee adapt shield to integration tests changes
we don't use ports 9200/9300 by default for integration tests anymore.
they easily conflict with the user running/debugging es on their machine.

Original commit: elastic/x-pack-elasticsearch@3ff7491459
2015-08-04 16:17:23 -04:00
jaymode e8364d6b50 add a property for attaching assemblies and disable it for public deployment
Currently, we attach the zip assembly for all plugins but Shield when deploying. This is problematic because
we want to track the downloads of the zips through our downloads service. This commit changes the
behavior to not attach the zip assembly when deploying publicly.

The source files were also being attached even for public deployments and this commit adds a property to
stop that for public deployments and a check to ensure that no sources or zip file is attached when deploying
publicly.

Additionally, the default profile overrides the distribution management of the parent pom(s) so that a deploy
without a profile specified will not work. Without this change issuing a deploy command on a machine that
has credentials for sonatype's repositories could have deployed the artifacts to the sonatype OSS repository.

Closes elastic/elasticsearch#321

Original commit: elastic/x-pack-elasticsearch@37a0a6c312
2015-08-04 12:46:04 -04:00
Tanguy Leroux 14b30fd80c Marvel: Fix IndexRecoveryCollectorTests
This commit fixes and simplifies the IndexRecoveryCollectorTests.

closes elastic/elasticsearch#366

Original commit: elastic/x-pack-elasticsearch@9112a45e01
2015-08-04 13:42:40 +02:00
jaymode 571c04dd79 add realm name to connection pool log message
See elastic/elasticsearch#325

Original commit: elastic/x-pack-elasticsearch@c25019cbb9
2015-08-04 07:36:27 -04:00
Tanguy Leroux a7645ed4f0 Fix compilation issue following removal of Streams.copyToStringFromClasspath() from core
Original commit: elastic/x-pack-elasticsearch@d7d0dfd640
2015-08-04 11:42:17 +02:00
Robert Muir d3c0468a6c Merge pull request elastic/elasticsearch#381 from rmuir/redundant_tests
Don't redundantly run shield rest tests in both unit and integ tests.

Original commit: elastic/x-pack-elasticsearch@e5a30c4fdc
2015-08-03 22:48:47 -04:00
Robert Muir 40083d9152 Don't redundantly run rest tests in both unit and integ tests.
We can just run these during the integration test phase: there is
no benefit in running them during `mvn test` too.

Original commit: elastic/x-pack-elasticsearch@4b275920e2
2015-08-03 22:04:33 -04:00
Ryan Ernst 402c55c739 Merge pull request elastic/elasticsearch#380 from rjernst/fix/test-renames
Rename test cases to use new test name patterns

Original commit: elastic/x-pack-elasticsearch@e07ce966f4
2015-08-03 18:50:48 -07:00
Ryan Ernst cfc4c6eca2 Rename integ tests back from IT extension
Original commit: elastic/x-pack-elasticsearch@e4ffa393ba
2015-08-03 18:47:33 -07:00
Ryan Ernst ae02762b95 Rename test cases to use new test name patterns
With elastic/elasticsearchelastic/elasticsearch#12623 base test classes were renamed
to use "TestCase" suffix. This updates x-plugins to reflect those
name changes. It also renames some tests that were marked
with @Slow (which was forbidden with elastic/elasticsearchelastic/elasticsearch#12617 and
elastic/elasticsearch elastic/elasticsearch#12618) to use the IT suffix to run
under `mvn verify`.

Original commit: elastic/x-pack-elasticsearch@05ffe2f202
2015-08-03 18:18:18 -07:00
Robert Muir 06862df7dd Merge pull request elastic/elasticsearch#378 from rmuir/home_file_cleanup
switch over uses of homeFile() to binFile().getParent().

Original commit: elastic/x-pack-elasticsearch@83f229934a
2015-08-03 13:55:07 -04:00
Robert Muir aca4133fbd Fix mocking here
Original commit: elastic/x-pack-elasticsearch@39903ee7b5
2015-08-03 13:46:28 -04:00
Robert Muir 875e2e67c5 switch over uses of homeFile() to binFile().getParent().
homeFile() is removed and should not be used, we need to cleanup,
but this is just a rote change to get builds green.

Original commit: elastic/x-pack-elasticsearch@05d0fb4a7c
2015-08-03 13:36:22 -04:00
Martijn van Groningen 0c05349d93 Use maven metadata to download the latest es snapshot
Original commit: elastic/x-pack-elasticsearch@99466d1b8f
2015-08-03 14:39:38 +02:00
jaymode 77eb27001b fix WatcherF compile error
Original commit: elastic/x-pack-elasticsearch@a8383fa2bb
2015-08-03 07:10:09 -04:00
jaymode 462d1b335f fix shield integration tests
Original commit: elastic/x-pack-elasticsearch@fb063b5ad1
2015-07-31 14:20:18 -04:00
debadair 25d7dfa555 Added step-by-step instructions for using Kibana with Shield. Closes elastic/elasticsearch#283.
Original commit: elastic/x-pack-elasticsearch@f3aab8e6a4
2015-07-31 09:38:24 -07:00
Tanguy Leroux 101ea6deab Remove usage of Streams.copyToBytesFromClasspath()
Original commit: elastic/x-pack-elasticsearch@8f813e9275
2015-07-31 16:37:30 +02:00
jaymode 3713b3dfdd use NetworkUtils instead of InetAddress.getLocalHost
Prior to this commit, we were InetAddress.getLocalHost() to get the hostname and host
address when auditing. This is different than how we report the node's hostname and host
address in other places where we use NetworkUtils. This caused false failures to be seen
with the IndexAuditTrail tests. This commit switches the audit trails to use the NetworkUtils
methods.

Closes elastic/elasticsearch#285

Original commit: elastic/x-pack-elasticsearch@c0bd7e94f6
2015-07-31 09:42:01 -04:00
Tanguy Leroux ed6f38b3b0 Remove unnecessary assertion from test
closes elastic/elasticsearch#368

Original commit: elastic/x-pack-elasticsearch@3076c87509
2015-07-31 13:45:02 +02:00
Martijn van Groningen b1f7724790 Added watcher smoke tester
Original commit: elastic/x-pack-elasticsearch@1fc0ba79fb
2015-07-31 13:35:42 +02:00
Suyog Rao 63a04169a2 Docs: Add PKI auth support for Logstash http protocol
Closes elastic/elasticsearch#328

Original commit: elastic/x-pack-elasticsearch@04235e714a
2015-07-30 14:05:59 -07:00
jaymode 4e9b7581b2 [Test] mute testNodeStatsCollector on windows
See elastic/elasticsearch#368

Original commit: elastic/x-pack-elasticsearch@ca16052340
2015-07-30 15:52:21 -04:00
jaymode 4b779b6fd6 allow ldap user search connection pool creation to be retried if it fails on startup
Today, if a LDAP server is down and the LDAP realm uses the user search mechanism this will prevent the
node from starting up. This is not ideal because users can still authenticate with another realm if it is
configured. This change tries to create the connection pool on initialization but if it fails, creation will retried
on each attempted authentication until the server is available again.

Closes elastic/elasticsearch#107

Original commit: elastic/x-pack-elasticsearch@f2ccf858ff
2015-07-30 14:24:52 -04:00
jaymode 135ee1c6c8 [Test] mute failing NodeStatsRendererTests and IndexRecoveryCollectorTests
See elastic/elasticsearch#366
See elastic/elasticsearch#367

Original commit: elastic/x-pack-elasticsearch@6799bbd16e
2015-07-30 13:34:06 -04:00
Tanguy Leroux 7f42d04bf2 Marvel: Add Recovery collector
closes elastic/elasticsearch-marvelelastic/elasticsearch#452

Original commit: elastic/x-pack-elasticsearch@0cfb9b5c57
2015-07-30 17:12:32 +02:00
Alexander Reelsen 7ec8a7ab27 CLI tool: Fix exit status changes
In elastic/elasticsearch#12165 the return value of the CLITool was changed from an integer
to the ExitStatus enum. This commit adapts the cli tools of x-plugins.

Original commit: elastic/x-pack-elasticsearch@fc6478bfa5
2015-07-30 16:06:54 +02:00
Tanguy Leroux 5a6e142bc8 Marvel: Add Node Stats collector
Original commit: elastic/x-pack-elasticsearch@1381905198
2015-07-30 14:37:12 +02:00
Tanguy Leroux 5b519935be Marvel: Add Cluster State collector
closes elastic/elasticsearch-marvelelastic/elasticsearch#445

Original commit: elastic/x-pack-elasticsearch@28c8b0f5af
2015-07-30 13:50:07 +02:00
jaymode 52be1aa943 [Test] mute the cat node attributes rest test
The integration tests do not have any node attributes so the body that is returned is empty
and causes the test to fail.

Original commit: elastic/x-pack-elasticsearch@ad846796f1
2015-07-30 07:03:03 -04:00
Tanguy Leroux b8da63deba Marvel: Add Cluster Stats tests
Original commit: elastic/x-pack-elasticsearch@d6eb8160d0
2015-07-30 10:31:40 +02:00
Tanguy Leroux ae3c569bea Marvel: Add Cluster Stats collector
Original commit: elastic/x-pack-elasticsearch@dd96d33a00
2015-07-30 10:31:40 +02:00
Tanguy Leroux 63ddbc9adb Marvel: Refactor IndexStatsCollector to use Renderer/XContentFiltering (aka 'filter_path') feature
Original commit: elastic/x-pack-elasticsearch@562ffea0b8
2015-07-29 17:28:49 +02:00
Tanguy Leroux bedab83929 Marvel: fix test in IndexStatsCollectorTests
Closes  elastic/elasticsearch#357

Original commit: elastic/x-pack-elasticsearch@5e37eb2fcc
2015-07-29 16:37:34 +02:00
Tanguy Leroux 1628ce2061 Marvel: mute test in IndexStatsCollectorTests
Original commit: elastic/x-pack-elasticsearch@ab1230549f
2015-07-29 16:13:02 +02:00
Tanguy Leroux 597d704c17 Marvel: Add dedicated settings service
This commit adds a dedicated MarvelSettingsService to centralized all Marvel settings.

Original commit: elastic/x-pack-elasticsearch@f7b97be396
2015-07-29 15:13:49 +02:00
Tanguy Leroux e1c4285482 Marvel: Clean HttpESExporterTests and AgentUtilsTests classes
Original commit: elastic/x-pack-elasticsearch@9cd271333e
2015-07-29 11:51:00 +02:00
jaymode 6a479a6dc8 apply the useBaseVersion fix to marvel as well
Original commit: elastic/x-pack-elasticsearch@b749d78e76
2015-07-28 13:20:42 -04:00
jaymode d3cbea6f4c use correct cluster state when starting index audit trail
Currently, we use the local cluster state when determining if the index audit trail can be
started. This is correct when we are logging to the same cluster but is incorrect when we
log to a remote cluster. Instead we should try to initialize the client and get the remote
cluster's state.

This also changes the enqueue method to stop throwing an exception on failing to add a
message to the queue. The exception was unnecessary and causing hard to read logs.
It is now replaced with a simple warn log message.

Closes elastic/elasticsearch#317

Original commit: elastic/x-pack-elasticsearch@238e9159b3
2015-07-28 12:37:51 -04:00
jaymode 5de2b799e0 don't attach audit user to remote requests and fix rest origin address
Currently, we attach the internal audit user to all requests. This is incorrect for requests that
need to be sent to a remote cluster. For these cases, we should require a user to be defined
to access the remote cluster if it is protected by Shield.

Additionally, the origin_address field for rest request fields is formatted differently than other
address fields. This changes the field to only be the remote address.

Closes elastic/elasticsearch#278
Closes elastic/elasticsearch#279

Original commit: elastic/x-pack-elasticsearch@a5f86b1974
2015-07-28 12:37:51 -04:00
jaymode 78068bd66f apply the useBaseVersion fix to watcher as well
Original commit: elastic/x-pack-elasticsearch@f3b5d76c11
2015-07-28 11:35:20 -04:00
Alexander Reelsen bf2f1e35ea Testing: Fix copying of files in shield integration tests
In order to correctly copy the license plugin version, we have
to enable useBaseVersion in order to strip the snapshot version
number.

Original commit: elastic/x-pack-elasticsearch@025da92c35
2015-07-28 16:55:07 +02:00
Areek Zillur ac1ba2add5 Merge pull request elastic/elasticsearch#322 from areek/fix/licensor-build
[LICENSOR] Fix licensor tool build

Original commit: elastic/x-pack-elasticsearch@8c7becb0b4
2015-07-27 15:25:56 -04:00
jaymode 7e78f09a1d update shield limitations around document level security
Original commit: elastic/x-pack-elasticsearch@4afbf69ce2
2015-07-27 13:25:19 -04:00
Martijn van Groningen 3abe6e02d6 fixed compile error due to an upstream change in the MetaData class
Original commit: elastic/x-pack-elasticsearch@b74276d43c
2015-07-24 22:26:36 +02:00