Commit Graph

157 Commits

Author SHA1 Message Date
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
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
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
Rashmi Kulkarni 245614c9cb actual _watcher/stats response
Original commit: elastic/x-pack-elasticsearch@e7911244cf
2015-10-13 15:19:03 -07: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
Alexander Reelsen ef86ea87f6 Tests: Fix DataAttachmentTests to not use System.lineSeparator
The DataAttachmentsTests used the default line separator for checking
JSON syntax and indendation. This is not working anymore due to
elastic/elasticsearchelastic/elasticsearch#13816 and thus fails on windows.

This commit just uses `\n` everywhere as Elasticsearch does as well.

Closes elastic/elasticsearch#728

Original commit: elastic/x-pack-elasticsearch@dce572e272
2015-10-13 10:49:22 +02:00
Jason Tedor b468c74401 Remove Guava as a dependency
This commit removes Guava as a dependency. Note that Guava will remain
as a test-only dependency (transitively through Elasticsearch through
Jimfs).

Relates elastic/elasticsearchelastic/elasticsearch#13224

Original commit: elastic/x-pack-elasticsearch@fe23d5f25f
2015-10-09 14:56:03 -04:00
Nik Everett f18b66fdc4 Handle missing actions when parsing WatchStatus
Original commit: elastic/x-pack-elasticsearch@b868aa1a62
2015-10-09 12:27:01 -04:00
Nik Everett 2bde3de3f0 Merge branch 'master' into immutable_map_be_gone
Original commit: elastic/x-pack-elasticsearch@62358ec345
2015-10-09 12:25:28 -04:00
Areek Zillur daf4a9765c [License] Feature agnostic licensing model
This commit changes the license plugin to work with license that are not tied to any specific feature in a bwc way. It refactors the license plugin api into a lighter weight API, enabling the license plugin to manage license expiration and acknowledgment triggers.

closes elastic/elasticsearch#683, elastic/elasticsearch#686, elastic/elasticsearch#687, elastic/elasticsearch#691

Original commit: elastic/x-pack-elasticsearch@537cd3933a
2015-10-09 00:32:15 -04:00
Martijn van Groningen 56981b5fff watcher: removed calibrating with round clock in ticker trigger engine
Closes elastic/elasticsearch#749

Original commit: elastic/x-pack-elasticsearch@f9f2db50d5
2015-10-07 18:12:20 +02:00
Nik Everett 0ff0cb7cd5 Merge branch 'master' into immutable_map_be_gone
Original commit: elastic/x-pack-elasticsearch@9eb0fb4bd7
2015-10-06 09:41:00 -04:00
Adrien Grand fec6ab7c22 Fix compile due to upstream elasticsearch changes.
Original commit: elastic/x-pack-elasticsearch@18033465c9
2015-10-06 14:00:50 +02:00
Martijn van Groningen a569951187 docs: updated release notes for elastic/elasticsearch#649 change
Original commit: elastic/x-pack-elasticsearch@ee5e009fd2
2015-10-06 11:36:09 +02:00
Martijn van Groningen 686c92312f Prevent Watcher to start if `action.auto_create_index` setting is too restrictive.
Closes elastic/elasticsearch#649

Original commit: elastic/x-pack-elasticsearch@afe05332ce
2015-10-06 11:22:06 +02:00
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
Nik Everett dab504f6ba Remove ImmutableMap$Builder
Original commit: elastic/x-pack-elasticsearch@f0d3f71887
2015-10-05 17:11:33 -04:00
Nik Everett 1d61278b2d More ImmutableMap banning
Original commit: elastic/x-pack-elasticsearch@59fee6e288
2015-10-05 13:35:31 -04:00
Nik Everett eb60d5925a Start banning ImmutableMap
Original commit: elastic/x-pack-elasticsearch@b895e51944
2015-10-05 13:35:31 -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
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
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 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
Martijn van Groningen e16894fb9d Removed dynamic index names in favour for ES' date math index names.
Original commit: elastic/x-pack-elasticsearch@267084f163
2015-09-25 15:55:22 +02:00
Nik Everett 3ce9d903e8 Fix test that relied on iteration order
Original commit: elastic/x-pack-elasticsearch@5523c877ab
2015-09-25 09:02:15 -04:00
Nik Everett 7fe90ba03c Switch from Set to String comparison
Original commit: elastic/x-pack-elasticsearch@385ae531ee
2015-09-25 09:00:26 -04:00
Nik Everett 7fb98b60b4 Merge pull request elastic/elasticsearch#712 from elastic/remove_eclipse
Remove eclipse configuration files

Original commit: elastic/x-pack-elasticsearch@2d217b3e57
2015-09-25 08:24:06 -04:00
Martijn van Groningen 1ce6f9ddba http input: The http input should only url encode once
Java's URI class already does url encoding, so we don't need to do this on out side.

Closes elastic/elasticsearch#699

Original commit: elastic/x-pack-elasticsearch@612dc99945
2015-09-25 12:20:58 +02:00
Nik Everett e3b3ef3ef2 Remove ImmutableSet
Yet another step in the de-guava-ification process.

Original commit: elastic/x-pack-elasticsearch@d8c597c7ba
2015-09-24 16:51:45 -04:00
Nik Everett 974ae21899 Remove eclipse configuration files
These files are generated automatically with eclipse:eclipse so they shouldn't
be tracked in the repository.

Original commit: elastic/x-pack-elasticsearch@3869ddebfa
2015-09-24 14:08:49 -04:00
Nik Everett 56bb508254 Merge pull request elastic/elasticsearch#694 from nik9000/immutable_map_entry_set_be_gone
Stop using ImmutableMap#entrySet

Original commit: elastic/x-pack-elasticsearch@43d6598d27
2015-09-23 08:29:17 -04:00
Nik Everett f5398a739a Stop using ImmutableMap#entrySet
This is the first in a series of changes that will support banning Guava's
ImmutableSet.

Original commit: elastic/x-pack-elasticsearch@7f95900186
2015-09-22 16:49:10 -04:00
debadair 4ed8ed4ced Watcher Docs: Fixed LS config example to work with latest ES output plugin.
Original commit: elastic/x-pack-elasticsearch@57b37e8d5f
2015-09-22 12:22:55 -07:00
jaymode 138582db2a fix compilation error due to changed XContentParser interface
Original commit: elastic/x-pack-elasticsearch@386c8d357c
2015-09-22 07:29:45 -04:00
Robert Muir f610a347f0 Fix all doclint errors and warnings (so compile does not break with https://github.com/elastic/elasticsearch/pull/13702)
Original commit: elastic/x-pack-elasticsearch@6a05dcd6a2
2015-09-22 00:09:11 -04:00
uboness 006364279e Fixed bad defaults for html sanitization
- Corrected the `_tables` element list. now it contains the following elements: `<table>`, `<th>`, `<tr>`, `<td>`, `<caption>`, `<col>`, `<colgroup>`, `<thead>`, `<tbody>`, `<tfoot>`

- Added support for empty `<span>` elements

Closes elastic/elasticsearch#660

Original commit: elastic/x-pack-elasticsearch@ce5e57c4aa
2015-09-18 17:39:25 +02:00
Jason Tedor 1a14f7f1a3 Reflect migration of method in core
Original commit: elastic/x-pack-elasticsearch@0039f35646
2015-09-18 08:55:08 -04:00
Jason Tedor 517b9eaa91 Remove use of com.google.common.primitives.Ints
This commit removes all uses of com.google.common.primitives.Ints
across the codebase.

Relates elastic/elasticsearchelastic/elasticsearch#13224

Original commit: elastic/x-pack-elasticsearch@9500282387
2015-09-18 08:55:08 -04:00
Martijn van Groningen 288274c3c2 test: removed test logging
Original commit: elastic/x-pack-elasticsearch@9ce8f5e7d8
2015-09-18 11:07:35 +02:00
Martijn van Groningen 1e5d2cac11 test: make sure the watch doesn't get throttled
Closes elastic/elasticsearch#640

Original commit: elastic/x-pack-elasticsearch@f1041f6929
2015-09-18 11:02:30 +02:00
Martijn van Groningen 08698fda29 test: don't remove the watcher templates in between tests
Original commit: elastic/x-pack-elasticsearch@652c8d16ec
2015-09-17 14:37:09 +02:00
Clinton Gormley d7f15b8999 Bad asciidoc
Original commit: elastic/x-pack-elasticsearch@5afb635e64
2015-09-17 12:31:54 +02:00
Ryan Ernst 018dd53ffc Move rest-api-spec tests to resources dirs
See elastic/elasticsearchelastic/elasticsearch#13611

Original commit: elastic/x-pack-elasticsearch@cc26a1a9db
2015-09-16 11:09:46 -07:00
Jason Tedor f650e18045 Remove use of com.google.common.base.Joiner
This commit removes all uses of com.google.common.base.Joiner across
the codebase.

Relates elastic/elasticsearchelastic/elasticsearch#13224

Original commit: elastic/x-pack-elasticsearch@f69b2addca
2015-09-15 09:44:41 -04:00
Jason Tedor 08de4a4ab1 Remove use of com.google.common.collect.Iterables
This commit removes all uses of com.google.common.collect.Iterables
across the codebase.

Relates elastic/elasticsearchelastic/elasticsearch#13224

Original commit: elastic/x-pack-elasticsearch@ca517de412
2015-09-14 13:26:04 -04:00