Commit Graph

2472 Commits

Author SHA1 Message Date
Tim Sullivan 22d1307134 Merge pull request elastic/elasticsearch#645 from panda01/enhance/node-offline-status
Enhance/node offline status

Original commit: elastic/x-pack-elasticsearch@d2c125cf63
2015-11-11 13:42:23 -07: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
jaymode 1601ce4fba add guava as a test dependency for jimfs
Original commit: elastic/x-pack-elasticsearch@331f834729
2015-11-11 13:40:03 -05:00
jaymode d74de5acc8 shield: only wrap readers if the RequestContext can be located
Previously, when the RequestContext could not be located a FieldSubsetReader was returned that only
allowed meta fields to be read. This was done for safety in case there was an API missed so we did not
leak data. However, this causes issues because some requests in elasticsearch execute on a different
thread than the one with the RequestContext so we effectively lose this context and prevent access to
the fields in the document. This is especially problematic with update requests, because that means that
fields that aren't included in the updated document will be lost.

This commit removes the wrapping of the readers in this case and adds tests for bulk updates.

Closes elastic/elasticsearch#938

Original commit: elastic/x-pack-elasticsearch@74c8059da0
2015-11-11 13:26:49 -05:00
Ryan Ernst 182f5c251d Merge pull request elastic/elasticsearch#968 from rjernst/transitive_goes_poof
Remove transitive dependencies

Original commit: elastic/x-pack-elasticsearch@3b1ad25cf1
2015-11-11 09:28:43 -08: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
Khalah Jones-Golden 47df543c52 Merge remote-tracking branch 'upstream/2.1' into enhance/node-offline-status
Original commit: elastic/x-pack-elasticsearch@1f60bfb379
2015-11-11 11:37:10 -04:00
Lukas Olson 0768a73935 Add logo and use ng-src
Original commit: elastic/x-pack-elasticsearch@0b5eca7e8b
2015-11-10 15:11:48 -07:00
Ryan Ernst 838cb54b9e Merge pull request elastic/elasticsearch#959 from rjernst/version_cleanup
Remove repositories section now that it is included by build-tools

Original commit: elastic/x-pack-elasticsearch@213a117290
2015-11-10 08:10:24 -08:00
Martijn van Groningen 39e58b03d5 Fix upstream changes to IndexSearcherWrapper: https://github.com/elastic/elasticsearch/pull/14654
Original commit: elastic/x-pack-elasticsearch@b32ba2ad78
2015-11-10 23:10:04 +07:00
Ryan Ernst 3a66aeb6a4 Build: Remove repositories section now that it is included by build-tools
With elastic/elasticsearchelastic/elasticsearch#14645, repositories, including the lucene
snapshot repo, are now handled by the build plugin itself. This change
removes this from xplugins.

Original commit: elastic/x-pack-elasticsearch@8e0c7ef894
2015-11-10 07:54:19 -08:00
Tim Sullivan fcc553220c Merge pull request elastic/elasticsearch#639 from tsullivan/chris-rest-refactor
Refactoring to REST architecture for single point of data retrieval from front-end controllers

Original commit: elastic/x-pack-elasticsearch@3734c48709
2015-11-10 07:36:08 -07:00
Tim Sullivan 8895f95cb4 Merge pull request elastic/elasticsearch#619 from panda01/master
Update Readme

Original commit: elastic/x-pack-elasticsearch@8061235189
2015-11-10 07:06:21 -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
Khalah Jones-Golden a8e5dee9b5 Merge remote-tracking branch 'upstream/master'
Original commit: elastic/x-pack-elasticsearch@c983d808bb
2015-11-09 16:31:58 -04:00
Areek Zillur dcae5fb5f0 ensure no operation is blocked before initial license notification
closes elastic/elasticsearch#906

update comment

Original commit: elastic/x-pack-elasticsearch@0bd788720f
2015-11-09 11:31:06 -05:00
Lukas Olson b4aa90b104 Initial commit of kibana security plugin
Original commit: elastic/x-pack-elasticsearch@bb6a86866c
2015-11-06 16:53:11 -07:00
Ryan Ernst 28326a2c4c Fix build to still work when not attached to elasticsearch
Original commit: elastic/x-pack-elasticsearch@e7056c2305
2015-11-06 14:03:08 -08:00
Ryan Ernst dca6b57256 Merge pull request elastic/elasticsearch#945 from rjernst/attach_improvements
Build: Improve behavior and setup for attachment to elasticsearch

Original commit: elastic/x-pack-elasticsearch@1457b07952
2015-11-06 12:02:59 -08: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
Tanguy Leroux 9fc92950c4 Fix Shield zip package
Original commit: elastic/x-pack-elasticsearch@eaf9dfc9ba
2015-11-06 16:17:03 +01:00
Tanguy Leroux 70f1b5c8f2 Marvel: Client nodes should be able to send metrics
closes elastic/elasticsearch#897

Original commit: elastic/x-pack-elasticsearch@1ebcc9de14
2015-11-06 15:32:13 +01:00
Tanguy Leroux 7e27abca98 Marvel: Add test for unsupported cluster version in HttpExporterTests
Original commit: elastic/x-pack-elasticsearch@556a05e86f
2015-11-06 15:12:12 +01: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
Chris Cowan 04dc3d4c91 Merge branch 'chris-rest-refactor' of github.com:tsullivan/elasticsearch-marvel into rest-refactor
Original commit: elastic/x-pack-elasticsearch@f05242978f
2015-11-05 14:09:51 -07:00
Chris Cowan f84d2481f3 Initial indexing for nodes
Original commit: elastic/x-pack-elasticsearch@45988280b7
2015-11-05 14:09:19 -07:00
Simon Willnauer a9028da5d1 Merge pull request elastic/elasticsearch#933 from s1monw/catchup/14518
Fix API usage after index-level guice was removed

Original commit: elastic/x-pack-elasticsearch@06400cc58d
2015-11-05 18:39:12 +01:00
Robert Muir f517fc8680 Merge pull request elastic/elasticsearch#935 from rmuir/nuke_poms
Remove confusing pom.xml files

Original commit: elastic/x-pack-elasticsearch@87c28d8cdc
2015-11-05 12:07:40 -05:00
Robert Muir cfb77bf572 Remove confusing pom.xml files
Original commit: elastic/x-pack-elasticsearch@772a1eb5d3
2015-11-05 10:39:28 -05:00
Simon Willnauer ad2835f6d3 Fix API usage after index-level guice was removed
See https://github.com/elastic/elasticsearch/pull/14518

Original commit: elastic/x-pack-elasticsearch@2428ee47c2
2015-11-05 13:18:58 +01:00
Robert Muir 5311da746b Add jimfs as shield test dep and conditionalize file permissions changing in tests.
See elastic/elasticsearch#928 for followup work

Original commit: elastic/x-pack-elasticsearch@d435cf9000
2015-11-04 14:25:20 -05:00
Ryan Ernst 09b6e3cfdc Add attachment docs to README
Original commit: elastic/x-pack-elasticsearch@49cbc9c66a
2015-11-04 11:19:13 -08:00
Ryan Ernst dc2fcf22b0 Add jcenter to buildSrc repos so that when elasticsearch/buildSrc is
attached it finds it for the dummy perforce dependency.

Original commit: elastic/x-pack-elasticsearch@6bd377ab6a
2015-11-04 10:58:27 -08:00
Chris Cowan 695be800ef Merge branch '2.1' of github.com:elasticsearch/elasticsearch-marvel into rest-refactor
Original commit: elastic/x-pack-elasticsearch@236829a082
2015-11-04 09:58:43 -07:00
Chris Cowan 1eceb0b568 Merge branch 'rest-refactor' of github.com:simianhacker/elasticsearch-marvel into rest-refactor
Original commit: elastic/x-pack-elasticsearch@897e1a0ad0
2015-11-04 09:57:10 -07:00
Chris Cowan c0edaca67b Fixing recovery indexer
Original commit: elastic/x-pack-elasticsearch@cd39dd8ac0
2015-11-04 09:55:52 -07:00
Chris Cowan dacfe77365 Merge branch '2.1' of github.com:elasticsearch/elasticsearch-marvel into rest-refactor
Original commit: elastic/x-pack-elasticsearch@3ac660d147
2015-11-04 09:49:35 -07:00
Tim Sullivan ae8b7afe22 Merge pull request elastic/elasticsearch#638 from simianhacker/indexer-fixes
Fix Index Recovery Process

Original commit: elastic/x-pack-elasticsearch@4c7956fdd7
2015-11-04 09:47:18 -07: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
Martijn van Groningen b7b9fa3ba5 fixed shield due to the IndexQueryParseService removal change
Original commit: elastic/x-pack-elasticsearch@ad826b9245
2015-11-04 13:10:42 +07:00
Martijn van Groningen 8fe5a03aae fixed compile error by removing unused imports
Original commit: elastic/x-pack-elasticsearch@59384c6a10
2015-11-04 11:39:19 +07:00
Chris Cowan 13ee16c1d5 Fixing recovery indexer
Original commit: elastic/x-pack-elasticsearch@d045a4a805
2015-11-03 13:44:00 -07:00
javanna e6409ea171 [TEST] resolve compile error due to upstream changes
Original commit: elastic/x-pack-elasticsearch@b16c56ae6a
2015-10-31 10:31:54 +01:00
Ryan Ernst a9037c296f Fix lucene snapshot setup to automatically use lucene version ES uses
Original commit: elastic/x-pack-elasticsearch@cb42014e1c
2015-10-31 00:48:40 -07:00
Lee Hinman 439ba93a2f Add .dir-locals.el and .projectile
Relates to https://github.com/elastic/elasticsearch/pull/14227

Original commit: elastic/x-pack-elasticsearch@7db90740dc
2015-10-30 11:16:29 -06: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