Commit Graph

2140 Commits

Author SHA1 Message Date
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 3ecc12963b Merge pull request elastic/elasticsearch#653 from jasontedor/ints-be-gone
Remove use of com.google.common.primitives.Ints

Original commit: elastic/x-pack-elasticsearch@35a7b4a6ec
2015-09-18 09:45:50 -04: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 c91b5d9a5a Replace Integers.checkedCast with built-in method
Original commit: elastic/x-pack-elasticsearch@6c69849863
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
Tanguy Leroux 4d829951b4 Marvel: Disable indexing for nodes attribute in cluster state documents
Closes elastic/elasticsearch#658

Original commit: elastic/x-pack-elasticsearch@bb501aa5b8
2015-09-18 14:24:52 +02:00
Tanguy Leroux db13d99cdf Marvel: Mute IndexStatsCollectorTests
Original commit: elastic/x-pack-elasticsearch@c8746d7ea2
2015-09-18 14:24:28 +02: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
Tanguy Leroux fdae10ff74 Marvel: Additional metrics for marvel_node_stats
indices.indexing.index_total
indices.indexing.index_time_in_millis
indices.search.query_total
indices.search.query_time_in_millis

closes elastic/elasticsearch#661

Original commit: elastic/x-pack-elasticsearch@f9892e5b85
2015-09-18 10:25:56 +02:00
Tanguy Leroux a640ab6bec Marvel: Store shards as individual documents in marvel_shards
Closes elastic/elasticsearch#581

Original commit: elastic/x-pack-elasticsearch@059ad5f09f
2015-09-18 10:16:32 +02:00
Tanguy Leroux 81dc0ee210 Marvel: Use Version in index template
Original commit: elastic/x-pack-elasticsearch@6ee3300773
2015-09-18 10:05:33 +02:00
jaymode ba13e3bf1c test: add the index audit trail template to the excluded list when it is used
Closes elastic/elasticsearch#639

Original commit: elastic/x-pack-elasticsearch@111231b3b5
2015-09-17 09:21:58 -04: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
jaymode 04178cbc30 fix compilation errors caused by changes to wipe method
This commit keeps the behavior the same and does not exclude the index audit trail template from
being wiped, that will be done in a future commit.

Original commit: elastic/x-pack-elasticsearch@1ac9e22923
2015-09-17 08:02:45 -04:00
Clinton Gormley d7f15b8999 Bad asciidoc
Original commit: elastic/x-pack-elasticsearch@5afb635e64
2015-09-17 12:31:54 +02:00
Martijn van Groningen 0a807f0b1d test: fix the rest spec test resource directory location
Original commit: elastic/x-pack-elasticsearch@59b2b6923f
2015-09-17 11:52:54 +02:00
Tanguy Leroux e08e587eb9 Marvel: Add heap to ClusterStats
Closes elastic/elasticsearch#593

Original commit: elastic/x-pack-elasticsearch@87a467ff13
2015-09-17 09:51:20 +02:00
Ryan Ernst fcaa8d6a37 Merge pull request elastic/elasticsearch#659 from rjernst/spec_in_resources
Move rest-api-spec tests to resources dirs

Original commit: elastic/x-pack-elasticsearch@1e732faa91
2015-09-16 11:15:10 -07: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
jaymode 52eaa0404c use a released version of attached-artifact-enforcer instead of snapshot
Original commit: elastic/x-pack-elasticsearch@9c54acfbce
2015-09-16 09:21:38 -04:00
Konrad Beiske cf16b79842 Merge pull request elastic/elasticsearch#557 from beiske/master
License plugin for Found

Original commit: elastic/x-pack-elasticsearch@46da745226
2015-09-16 15:05:17 +02:00
Konrad Beiske d56df6e04c Merge pull request elastic/elasticsearch#4 from elastic/master
update from upstream

Original commit: elastic/x-pack-elasticsearch@d8bdb10cd5
2015-09-16 13:01:35 +02:00
jaymode a0557e23a6 sync smoke test plugins list with core lists
Closes elastic/elasticsearch#636

Original commit: elastic/x-pack-elasticsearch@418bceef64
2015-09-16 06:47:16 -04:00
Robert Muir 4c96458185 Upgrade to securemock 1.1, so spies and mocks work without suppressAccessChecks
Original commit: elastic/x-pack-elasticsearch@a706545b06
2015-09-16 04:07:54 -04:00
Jason Tedor 8942e1e559 Merge pull request elastic/elasticsearch#650 from jasontedor/joiner-be-gone
Remove use of com.google.common.base.Joiner

Original commit: elastic/x-pack-elasticsearch@fad27ff46b
2015-09-15 10:29:34 -04:00
Simon Willnauer d1c2698595 Fix forbidden API usage from upstream
Original commit: elastic/x-pack-elasticsearch@2bfcc83477
2015-09-15 15:51:22 +02: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
Martijn van Groningen 920b92ffd3 test: re-enabled tribe qa test
Original commit: elastic/x-pack-elasticsearch@7cffe1b9f5
2015-09-15 14:50:20 +02:00
jaymode a3ae0827fa fix the indexing of the request class for the IndexAuditTrail
The IndexAuditTrail was checking the logger level of the class before adding the request
class to the message, which was an error. The logger level should not control anything
about the IndexAuditTrail.

Closes elastic/elasticsearch#546

Original commit: elastic/x-pack-elasticsearch@35ee8ab453
2015-09-15 07:54:15 -04:00
Jason Tedor 52e58b8de0 Merge pull request elastic/elasticsearch#644 from jasontedor/iterables-be-gone
Remove use of com.google.common.collect.Iterables

Original commit: elastic/x-pack-elasticsearch@e24afb5c45
2015-09-15 07:52:37 -04:00
jaymode 8860364f72 update settings for tribes to fail if shield is not enabled or mandatory
In 2.0, plugins cannot specify mandatory settings, they can only specify a default additional
set of settings. For tribe nodes, we require shield to be enabled and be a mandatory plugin.
If the settings specified by the user conflict with this, we now throw an exception and fail
startup.

Closes elastic/elasticsearch#426

Original commit: elastic/x-pack-elasticsearch@db4d6d7923
2015-09-15 06:44:35 -04:00
debadair 8e343d21cc Shield Docs: Added links to the topics for the new features.
Original commit: elastic/x-pack-elasticsearch@1fcdecb940
2015-09-14 13:35:27 -07:00
debadair 019b63e5fb Shield Docs: Adding information about how to run as another user.
Original commit: elastic/x-pack-elasticsearch@7cc8fb28ad
2015-09-14 13:29:00 -07:00
debadair 326e55528c Shield Docs: New topic about using custom realms.
Original commit: elastic/x-pack-elasticsearch@e07d945d97
2015-09-14 13:21:28 -07: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
jaymode 3676d6e370 add 2.0.0-beta2 release notes for Shield
This adds the release notes to the documentation for Shield. Note, two new features do not
have links as the documentation for these are still pending.

Original commit: elastic/x-pack-elasticsearch@e66df5cf14
2015-09-14 11:09:56 -04:00
jaymode d5a44a6496 test: use test cluster scope for remote index audit trail tests
The SSL randomization can cause issues when running this test multiple times to look for an issue
since the suite cluster may have a different SSL value than the remote cluster during subsequent
runs.

Closes elastic/elasticsearch#607

Original commit: elastic/x-pack-elasticsearch@8ba3140c52
2015-09-14 09:34:19 -04:00
Martijn van Groningen 5e7bfcfa75 test: echo log file after the index is created to find out why sometimes on CI the indices of that index don't get into a started state.
Original commit: elastic/x-pack-elasticsearch@4213d162d6
2015-09-14 14:55:34 +02:00
Martijn van Groningen 2ec09c140e test: increased logging for http and improved assertion failure
Original commit: elastic/x-pack-elasticsearch@e41901f5c8
2015-09-14 14:19:30 +02:00
Martijn van Groningen 96b5558966 test: increased logging and reduced the noise by letting this test only run with 1 node.
Original commit: elastic/x-pack-elasticsearch@7c73a03d5b
2015-09-14 14:00:12 +02:00
Simon Willnauer 2032c93da1 Catch up with core changes
This commit cuts over to StandardCharset vs. guavas Charsets, removes
obsolete uses of Collections2 / Function and replaces all LoadingCaches
with simple CHM#loadIfAbsent

Original commit: elastic/x-pack-elasticsearch@7d1d607e9e
2015-09-14 13:48:50 +02:00
Martijn van Groningen cccebda245 test: added more logging
Original commit: elastic/x-pack-elasticsearch@5bb3c97e49
2015-09-14 12:22:53 +02:00
Tanguy Leroux 4ac8b87f3b Marvel: Update release notes
Original commit: elastic/x-pack-elasticsearch@31b17e5115
2015-09-14 11:17:34 +02:00
Simon Willnauer 6fb4f7817c Use method references rather than Class instances to register transport handler.
This is caused by upstream changes in core.

Original commit: elastic/x-pack-elasticsearch@67f602abd1
2015-09-14 10:07:35 +02:00
Robert Muir ddcc757bb3 Merge pull request elastic/elasticsearch#637 from rmuir/this_must_go
Remove remaining uses of setAccessible

Original commit: elastic/x-pack-elasticsearch@bb25e156da
2015-09-13 00:40:07 -04:00
Robert Muir 53cd14deda Remove remaining uses of setAccessible
This corresponds with https://github.com/elastic/elasticsearch/pull/13539

Original commit: elastic/x-pack-elasticsearch@29d235b8ed
2015-09-12 21:11:10 -04:00
Robert Muir 61c47634bd Fix wrong access modifiers for injected ctors, setAccessible is no longer used.
See https://github.com/elastic/elasticsearch/pull/13531

Original commit: elastic/x-pack-elasticsearch@658672b5fb
2015-09-12 03:30:33 -04:00
Rashmi Kulkarni 30be286607 Merge pull request elastic/elasticsearch#634 from rasroh/audit_qa
Shield Audit IndexTrail Test

Original commit: elastic/x-pack-elasticsearch@75c2ced828
2015-09-11 14:38:48 -07:00
Rashmi Kulkarni 71f630e07b Shield Audit IndexTrail Test
closes elastic/elasticsearch#630

Original commit: elastic/x-pack-elasticsearch@6deeb07412
2015-09-11 14:27:12 -07:00