Commit Graph

201 Commits

Author SHA1 Message Date
Robert Muir 415dff083f Watcher and Shield should depend on same guava version.
This causes hellaciousness at least with eclipse, possibly qa tests
too. the sanitiser just wants 11+, so make it the same version
as shield's (dragged in by jimfs).

Also remove unnecessary usage of guava in a test

Original commit: elastic/x-pack-elasticsearch@ea9ac88fdc
2015-11-23 19:52:01 -05:00
debadair 90cb7d38b3 Docs: Added dates to Shield & Watcher release notes.
Original commit: elastic/x-pack-elasticsearch@2d42762b84
2015-11-23 13:20:51 -08:00
uboness b752b79a29 [docs] fixed `chain` input example
Original commit: elastic/x-pack-elasticsearch@6ac4ac4ac9
2015-11-22 21:21:54 +01:00
Ryan Ernst db09ee8d2a Merge branch 'master' into extra_plugins
Original commit: elastic/x-pack-elasticsearch@fa264a1ce4
2015-11-22 08:48:04 -08:00
Robert Muir f1a9b50e9e Ban write access to system properties
Followup to https://github.com/elastic/elasticsearch/pull/14914

Shield has to request read-write access to all system properties
due to silliness in UnboundID sdk (556a203094/src/com/unboundid/util/Debug.java (L166))

We should followup with a pull request to them, to not use System.getProperties() here which
returns a mutable map (hence: read-write to "*").

Furthermore, the hack has to be wrapped in another hack because gradle doesn't add
shield's plugin metadata to the classpath. Of course, if we weren't testing with two
plugins in the classpath (which is not very realistic) this would be a non-issue.

Original commit: elastic/x-pack-elasticsearch@612cacde6a
2015-11-21 23:01:37 -05:00
Ryan Ernst 8119451a7b Build: Remove project attachment and use ES extra-plugins instead
This change removes the project attachment support, and instead relies
on x-plugins being checked out under extra-plugins/x-plugins within an
elasticsearch checkout. The only real change, other than removing
unnecessary code, was to rename the license/core project because gradle
project substitution has a bug which causes it to try and use ES core as
the substitution. (Unfortunately this is not reproduceable with a simple
example, so I have not yet filed an issue with gradle).

Original commit: elastic/x-pack-elasticsearch@fa315ffcb5
2015-11-21 11:13:32 -08:00
Martijn van Groningen f2900f71c5 test: unmuted slow watches test.
Removed the dependency on groovy and added a script impl. that allows to run Thread.sleep(...) in order to simulate a slow watch.

Relates to elastic/elasticsearch#724

Original commit: elastic/x-pack-elasticsearch@b18dd89b46
2015-11-20 14:02:17 +01:00
debadair fb4ba6f89d Watcher Docs: Edited chain input topic & added chain to customizing watches.
Original commit: elastic/x-pack-elasticsearch@9e1d7f09c6
2015-11-18 11:15:24 -08: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
Lee Hinman 7f0863ce83 Merge remote-tracking branch 'dakrone/fix-nullable'
Original commit: elastic/x-pack-elasticsearch@4ce4f5c3eb
2015-11-11 12:27:41 -07: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
Lee Hinman c9dd618a0b Fix @Nullable import in watcher
Original commit: elastic/x-pack-elasticsearch@017ead8ff7
2015-11-11 10:00:24 -07:00
Martijn van Groningen c916c5e35b watcher: If during startup a watch record couldn't be saved because of a version conflict then overwrite it.
In certain cases this could cause Watcher to prevent from being started (either automatically or manually):
* The watch of the triggered watch doesn't exist
* The execution service rejected the execution the watch. (due to not enough threads in the thread pool)

If a watch record gets overwritten this means it has been executed before when watcher was running, but we were unable to delete the triggered watch. So we executed the a watch twice with the same trigger event. This can happen if watcher was stopped before because of the node running Watcher unexpectedly stopped (master left, power loss etc.)

In stead of failing to write the watch record, we overwrite it set the state 'executed_multiple_times'.

Closes elastic/elasticsearch#695

Original commit: elastic/x-pack-elasticsearch@20f805cb99
2015-11-10 09:24:15 +07: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
Your Full Name bf4c42a40f XContentExtraction: Fix state bug
This fixes a nasty bug, when trying to extract arrays, that contain objects
from a searchinput. Reason for this is, that we reset the state to early, while
still being in an array and not having read all of the embedded objects.

With Jackson 2.6 we should reuse jacksons capabilities to not only filter for
xcontent builders, but also for parsers. Not the nicest code ever.

Closes elastic/elasticsearch#852

Original commit: elastic/x-pack-elasticsearch@2682254644
2015-11-06 09:48:07 +01:00
debadair 6106128272 Docs: Added uninstall topics to Watcher & Shield. Closes elastic/elasticsearch#801.
Original commit: elastic/x-pack-elasticsearch@b990c64647
2015-11-05 17:54:35 -08:00
Robert Muir cfb77bf572 Remove confusing pom.xml files
Original commit: elastic/x-pack-elasticsearch@772a1eb5d3
2015-11-05 10:39:28 -05:00
Daniel Mitterdorfer 081ffbeced Allow System#exit() from command line tools
This commit adds SuppressForbidden annotations to command line tools to
still allow to call System#exit() (see also issue 12596 in ES core).

Original commit: elastic/x-pack-elasticsearch@1dd3f1dcb1
2015-11-04 14:54:27 +01:00
Martijn van Groningen 1d6845190f test: removed small change that should not have been committed
Original commit: elastic/x-pack-elasticsearch@3b069b775a
2015-11-04 19:07:14 +07:00
Martijn van Groningen 418c341e32 test: re-enabled a number of Watcher tests that were disabled
Relates to elastic/elasticsearch#724

Original commit: elastic/x-pack-elasticsearch@3bdd118f2e
2015-11-04 18:39:37 +07:00
Alexander Reelsen 496ab1d033 Tests: Fixing ChainIntegrationTest to work without timewarp as well
Original commit: elastic/x-pack-elasticsearch@ba0b61022d
2015-10-30 13:51:29 +01:00
Alexander Reelsen 04a8fb3202 Watcher: Add chained input
```
Chained input for now works like this
{
"chain" : [
  { "first" : { "simple" : { "foo" : "bar" } } },
  { "second" : { "simple" : { "spam" : "eggs" } } }
]
```

This allows to access the payload via ctx.payload.first.foo for example

The array notation is needed to guarantee order, as JSON itself does not guarantee
order of objects.

Closes elastic/elasticsearch#353

Original commit: elastic/x-pack-elasticsearch@7ab32c43a8
2015-10-30 10:22:26 +01: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
debadair fa49b5c62f Fixed download links. Closes elastic/elasticsearch#894.
Original commit: elastic/x-pack-elasticsearch@9f8bc6d6bc
2015-10-28 16:47:57 -07:00
Alexander Reelsen 6920a09cd2 Docs: Updated watcher java docs to show that plugin must be loaded
Using the new addPlugin() instead of plugin.types setting.

Original commit: elastic/x-pack-elasticsearch@e1deea853c
2015-10-28 11:54:11 +01:00
debadair a705b6fb3e Watcher Docs: Fixed typo in float tag.
Original commit: elastic/x-pack-elasticsearch@afc0a19b26
2015-10-27 19:18:57 -07:00
debadair e81e640190 Docs: Consolidated Watcher 2.0 release notes. Fixed pkg install cmds and subscription links for Watcher & Shield.
Original commit: elastic/x-pack-elasticsearch@1387a61a8f
2015-10-27 18:01:41 -07:00
Clinton Gormley 604975d2c1 Updated docs links to point to master branches
Original commit: elastic/x-pack-elasticsearch@2f15df4847
2015-10-28 01:33:59 +01:00
Robert Muir 8aa8d88d3d x-plugins security changes for elastic/elasticsearch#14311
* watcher needs setFactory at least for now
* fix watcher build to include security.policy (it duplicates too much build logic, this is hard)
* fix watcher build to respect test logging parameters.

Original commit: elastic/x-pack-elasticsearch@d2dc5f82e7
2015-10-27 20:07:38 -04:00
Simon Willnauer c74ae7aad2 [TEST] Don't wrap query in wrapper query
This is caused by a breaking change in https://github.com/elastic/elasticsearch/pull/14304

Original commit: elastic/x-pack-elasticsearch@b376ad2042
2015-10-27 21:47:11 +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
debadair 388f8cec6b Watcher Docs: Fixed messed up cross document links.
Original commit: elastic/x-pack-elasticsearch@c36c546d16
2015-10-21 14:29:23 -07:00
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
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
Nik Everett 8231e856c2 Remove and ban @Test
Original commit: elastic/x-pack-elasticsearch@02425ca13d
2015-10-20 18:20:46 -04: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
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
javanna baa36f7bae adapt to upstream java count api removal
Original commit: elastic/x-pack-elasticsearch@ea6c53b88e
2015-10-19 15:10:59 +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
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
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