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
jaymode
868b6b01cf
add isClosed method to SensitiveXContentParser
...
Original commit: elastic/x-pack-elasticsearch@b1cada3bfc
2015-07-24 14:44:52 -04:00
Alexander Reelsen
ba5900cf0b
Documentation: Fix calls for bin/plugin to be compatible with master
...
Original commit: elastic/x-pack-elasticsearch@e9ce3f401c
2015-07-24 12:24:44 +02:00
jaymode
92e6d301f2
[Test] don't use the shard AnalyzeAction when checking action mapping
...
Original commit: elastic/x-pack-elasticsearch@6501695edf
2015-07-24 06:08:24 -04:00
jaymode
1e63141bf2
update ShieldActionMapper to handle the change to use TransportSingleShardAction
...
This relates to commit cafc7078e2
in elasticsearch
Original commit: elastic/x-pack-elasticsearch@72f8a92b80
2015-07-23 13:55:48 -04:00
Robert Muir
4b5faf00ac
Add description elements to pom.xml's for plugins, it goes in their metadata file
...
Original commit: elastic/x-pack-elasticsearch@753f7a67f4
2015-07-22 21:57:30 -04:00
jaymode
3d74a68e00
shield publishes the zip for internal deployments and x-dev-tools doesn't need a parent
...
This removes the parent from x-dev-tools because we won't be publishing this artifact to sonatype's repository.
Original commit: elastic/x-pack-elasticsearch@013efb50e9
2015-07-22 12:23:18 -04:00
Robert Muir
ab3962517a
Merge pull request elastic/elasticsearch#319 from rmuir/plugin_descriptor
...
Fix plugins to the new world
Original commit: elastic/x-pack-elasticsearch@f9d0e75ef0
2015-07-22 11:22:23 -04:00
Robert Muir
aa5356e1ad
revert temporary change
...
Original commit: elastic/x-pack-elasticsearch@91bcd36ffa
2015-07-22 11:13:58 -04:00
jaymode
d7d8ca125a
load shield for external cluster client
...
Original commit: elastic/x-pack-elasticsearch@96e8df2ac3
2015-07-22 10:25:20 -04:00
Robert Muir
2dbeb1273d
fix marvel unit tests
...
Original commit: elastic/x-pack-elasticsearch@6ab4a90805
2015-07-22 10:03:21 -04:00
jaymode
187be6c602
tell shield tests to explicitly load shield and license plugins
...
Original commit: elastic/x-pack-elasticsearch@4f70d6ee93
2015-07-22 10:01:44 -04:00
Robert Muir
8dea4500c5
get watcher verify working
...
Original commit: elastic/x-pack-elasticsearch@56978b71f9
2015-07-22 09:49:57 -04:00
Robert Muir
b7470ea469
Fix compilation/verify works
...
Original commit: elastic/x-pack-elasticsearch@62001c83cb
2015-07-22 09:38:22 -04:00
Robert Muir
de61163c1b
add back shield assembly
...
Original commit: elastic/x-pack-elasticsearch@14c7d7ea8e
2015-07-22 09:31:51 -04:00
Robert Muir
360a302511
fix test compilation
...
Original commit: elastic/x-pack-elasticsearch@53074ee0c1
2015-07-22 09:10:34 -04:00