Commit Graph

2195 Commits

Author SHA1 Message Date
Alexander Reelsen ea032cd3a9 HttpClient: Add proxy support
Allows to configure watcher.http.proxy.host and watcher.http.proxy.port properties to
configure a HTTP proxy as well as specify a proxy whenever a HTTP request is executed.

Closes elastic/elasticsearch#587

Original commit: elastic/x-pack-elasticsearch@75ef260fef
2015-10-21 17:24:35 +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
jaymode f5e9c826b4 docs: remove configuration path setting from plugin install commands
The additional setting to specify the configuration path is no longer needed with elasticsearch 2.0, so
we should remove it from the documentation. Also cleans up the installation commands to be in line
with what 2.0 requires.

Original commit: elastic/x-pack-elasticsearch@b269568a67
2015-10-21 07:14:34 -04:00
javanna 45d0ea6014 update action names after optimize and count removal from core
Original commit: elastic/x-pack-elasticsearch@614e51bd31
2015-10-21 13:01:37 +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
Lee Hinman bfdf01131c [TESTS] Rename optimize to forcemerge for internal transport action
Original commit: elastic/x-pack-elasticsearch@4fca4fe3cb
2015-10-20 23:04:32 -06:00
Nik Everett d34265d0fd Merge pull request elastic/elasticsearch#811 from nik9000/no_test_annotation
Remove @Test annotation

Original commit: elastic/x-pack-elasticsearch@ca4c3e2e74
2015-10-20 18:33:58 -04:00
Nik Everett 8231e856c2 Remove and ban @Test
Original commit: elastic/x-pack-elasticsearch@02425ca13d
2015-10-20 18:20:46 -04:00
jaymode 7380e45abb document the user_group_attribute setting for LDAP realms
Closes elastic/elasticsearch#284

Original commit: elastic/x-pack-elasticsearch@d90aecbe3b
2015-10-20 14:43:08 -04:00
debadair 84ffc956a8 Shield Docs: Clarified that Shield does not support AD distribution groups. Closes elastic/elasticsearch#520.
Original commit: elastic/x-pack-elasticsearch@39f57ff08d
2015-10-20 10:34:52 -07:00
debadair 0123d33e87 Shield Docs: Updated Marvel config and license management for 2.0.
Original commit: elastic/x-pack-elasticsearch@3d225c2562
2015-10-20 10:13:51 -07:00
debadair aeffd696ff Watcher Docs: Added license management topic. Closes elastic/elasticsearch#706.
Original commit: elastic/x-pack-elasticsearch@477d14ecd3
2015-10-20 10:03:04 -07:00
Steve Kearns e1dde82724 Update LICENSE.txt for shield and watcher with new EULA
Original commit: elastic/x-pack-elasticsearch@9dd554efff
2015-10-20 15:47:00 +02: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
Jay Modi 5f3ba2cd43 Merge pull request elastic/elasticsearch#827 from jaymode/docs_alias_dls
update the wording around filtered aliases and document level security

Original commit: elastic/x-pack-elasticsearch@86958f1404
2015-10-19 10:10:42 -04:00
Nik Everett bdc464cf0e Merge pull request elastic/elasticsearch#810 from nik9000/drop_test_shard_routing
Remove TestShardRouting

Original commit: elastic/x-pack-elasticsearch@fb3e619135
2015-10-19 10:00:25 -04:00
jaymode f7a8d31d6a update the wording around filtered aliases and document level security
Also, remove an extra period in DLS/FLS section title.

Closes elastic/elasticsearch#542
Closes elastic/elasticsearch#798

Original commit: elastic/x-pack-elasticsearch@a1556b37c7
2015-10-19 09:48:54 -04: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
Alexander Reelsen f523a476e1 Tests: Change queries to reflect latest master changes (removed filter query)
Original commit: elastic/x-pack-elasticsearch@6c57eb0d1f
2015-10-16 17:03:42 +02:00
javanna 7ec03c040b [TEST] fix test problem after search refactoring
Original commit: elastic/x-pack-elasticsearch@10d4f061ce
2015-10-16 15:42:41 +02:00
Alexander Reelsen 215a554555 Tests: Fixing more tests in Watcher after query refactoring
Original commit: elastic/x-pack-elasticsearch@1a0b654c56
2015-10-16 15:04:05 +02:00
Colin Goodheart-Smithe f1bd2cdab7 [TEST] fix WatcherUtilsTests
Original commit: elastic/x-pack-elasticsearch@c2ac559b2d
2015-10-16 13:32:42 +01:00
Colin Goodheart-Smithe 4f1f535937 [TEST] fix template comparisons in watcher tests
Original commit: elastic/x-pack-elasticsearch@8edc47089b
2015-10-16 13:29:58 +01:00
Colin Goodheart-Smithe acec3c9216 [TEST] Fixes to failing watcher tests
Original commit: elastic/x-pack-elasticsearch@4d592b9c92
2015-10-16 10:09:13 +01:00
Colin Goodheart-Smithe 7a5fe13c34 Fixes to ensure the watcher context is added to templates
Original commit: elastic/x-pack-elasticsearch@a1dfecdd6b
2015-10-16 09:35:14 +01:00
Colin Goodheart-Smithe 4cd02142a2 fixes for compile errors due to search request refactoring in core
Original commit: elastic/x-pack-elasticsearch@8808789912
2015-10-16 08:18:20 +01:00
Tanguy Leroux 4dd5bfe0e7 Shield: Fix compilation error in IndexAuditTrailTests
Original commit: elastic/x-pack-elasticsearch@744d133fc4
2015-10-16 08:52:15 +02:00
uboness 68f85b5527 Added missing privileges for the marvel_user role
Original commit: elastic/x-pack-elasticsearch@f3d629a878
2015-10-15 18:03:00 -07: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
uboness fbca52e71c Merge pull request elastic/elasticsearch#813 from PhaedrusTheGreek/shield-reference-docs-fix
fixed a single character in reference docs

Original commit: elastic/x-pack-elasticsearch@aeee09434b
2015-10-15 14:53:23 -07: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
PhaedrusTheGreek 6707b5d847 fixed a single character in reference docs
Original commit: elastic/x-pack-elasticsearch@6fdbe33ff9
2015-10-15 13:28:30 -04:00
uboness 21bb43ce3c Updated the marvel & kibana roles
- kibana 2.x explicitly creates the `.kibana` index now and it requires the indices/create permission
- added back the marvel agent/user roles

Closes elastic/elasticsearch#696

Original commit: elastic/x-pack-elasticsearch@bb9f22219e
2015-10-15 08:15:34 -07:00
Nik Everett 79b8541582 [test] Remove TestShardRouting
This fixes jarhell issues running watcher tests in Eclipse but it requires
that elasticsearch core export its copy of TestShardRouting in its test jar.

Original commit: elastic/x-pack-elasticsearch@2a83d52553
2015-10-15 09:54:16 -04:00
Jason Tedor a0b9d424e6 Reflect upstream changes to o.e.c.m.IndexMetaData
This commit reflects some upstream method removals from
o.e.c.m.IndexMetaData.

Original commit: elastic/x-pack-elasticsearch@74b25628dc
2015-10-14 21:05:35 -04:00
jaymode 05befa5ebb test: start at 0 instead of 1
In the test we always create at least one type_ factory but the test incorrectly used type_1
as the first, when it should have been type_0

Original commit: elastic/x-pack-elasticsearch@e4128cbc26
2015-10-14 17:23:25 -04:00
jaymode f19e68ecb8 shield: only enable custom realms with a platinum or trial license
In elastic/elasticsearch#788, the enabling and disabling of features was added for shield, but custom realms were not
being enabled/disabled based on license type. This commit adds that functionality.

Relates to elastic/elasticsearch#689

Original commit: elastic/x-pack-elasticsearch@625c3ef18a
2015-10-14 15:29:53 -04:00
Alexander Reelsen b927fd08bc Watcher: Adhere to new licensing requirements
* Basic license equlas disabling
* trial/gold/platinum: everything is allowed
* On expiry: actions of watches do not execute, PUT/GET on watches is disabled

Closes elastic/elasticsearch#688

Original commit: elastic/x-pack-elasticsearch@7017c62136
2015-10-14 17:59:09 +02:00
jaymode 6dbad15e56 always sign messages when message signing is enabled
This change allows for messages to be signed when message signing is enabled and a system
key is not present. This is accomplished by generating a random key on startup and then using
HKDF with HmacSHA1 to generate the keying material to be used to sign the messages. The random
key from the originating node is added to the signed message so that the signing key can be
derived on the receiving node.

When a system key is present, the system key is used for signing and the preexisting behavior
is maintained.

Closes elastic/elasticsearch#711

Original commit: elastic/x-pack-elasticsearch@c41fdc0ac3
2015-10-14 06:44:22 -04:00
Simon Willnauer baa06fb6fb Delegate CoreCacheKey for all reader wrappers
This change removes obsolete forbidden API usage, cuts over
from an interface to an abstract class for IndexSearcherWrapper and
delegates all core cache keys to the wrapped reader.

Relates to elastic/elasticsearch#774

Original commit: elastic/x-pack-elasticsearch@3799bab0d9
2015-10-14 10:29:47 +02:00
Rashmi Kulkarni 245614c9cb actual _watcher/stats response
Original commit: elastic/x-pack-elasticsearch@e7911244cf
2015-10-13 15:19:03 -07: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
Konrad Beiske 4a780637e9 Change found-license-plugin to use standard value for install name and initial smoke test for found-license-plugin
Original commit: elastic/x-pack-elasticsearch@526c0c6da4
2015-10-13 14:00:27 -04:00
Alexander Reelsen b95101f7a0 Documentation: Repleace search_type=count with size=0 in the docs
Relates elastic/elasticsearch#787

Original commit: elastic/x-pack-elasticsearch@f0183cedc3
2015-10-13 18:24:36 +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