2361 Commits

Author SHA1 Message Date
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
Chris Cowan
d28e337689 Closes elastic/elasticsearch#534 - Remove marvel_ prefix for all doc types
Original commit: elastic/x-pack-elasticsearch@bdea3f915f
2015-09-22 10:48:29 -07:00
jaymode
7c8bad6b53 create basic interface for a caching realm
This extracts an interface for methods that a caching realm must implement. The idea for this
interface is to allow for custom realms to integrate easily with the clear cache api. With this change
a custom realm can implement this API and the clear cache action can call the evict or evictAll
methods on the realm.

Closes elastic/elasticsearch#544

Original commit: elastic/x-pack-elasticsearch@62b0029689
2015-09-22 13:28:39 -04: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
Chris Cowan
f0a160000e Merge pull request elastic/elasticsearch#531 from tsullivan/handle-missing-nodeIndex
fix - handle missing nodeIndex on node detail page

Original commit: elastic/x-pack-elasticsearch@86624d845a
2015-09-21 11:43:31 -07:00
Khalah Jones Golden
457112250d Merge pull request elastic/elasticsearch#538 from panda01/master
Metrics improvements

Original commit: elastic/x-pack-elasticsearch@c015d6baec
2015-09-21 13:58:03 -04:00
Tim Sullivan
4a46991d62 Merge pull request elastic/elasticsearch#532 from simianhacker/index-detail-metrics
Index Detail Metrics

Original commit: elastic/x-pack-elasticsearch@e4f401080a
2015-09-21 10:07:59 -07:00
Tanguy Leroux
a5dcb52ba8 Marvel: Add Fielddata stats to index_stats
Closes elastic/elasticsearch#671

Original commit: elastic/x-pack-elasticsearch@eabd7eab20
2015-09-21 16:27:02 +02:00
Tanguy Leroux
34937604e1 Marvel: Remove marvel_ prefix from Marvel document types
Closes elastic/elasticsearch#669

Original commit: elastic/x-pack-elasticsearch@2e04ce186a
2015-09-21 15:58:39 +02:00
Khalah Jones Golden
e4947575f2 Merge pull request elastic/elasticsearch#525 from simianhacker/index-overview-metrics
Index Overview Metrics

Original commit: elastic/x-pack-elasticsearch@cbd82d924f
2015-09-21 07:41:39 -04:00
Tim Sullivan
b727a18dfa Merge pull request elastic/elasticsearch#533 from panda01/master
Some small bug fixes

Original commit: elastic/x-pack-elasticsearch@2f1abb455e
2015-09-18 13:02:31 -07:00
Tim Sullivan
e7e47214f6 Merge pull request elastic/elasticsearch#523 from simianhacker/node-detail-stats
Finalize Node Stats

Original commit: elastic/x-pack-elasticsearch@a142eddd56
2015-09-18 11:56:11 -07: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
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
Chris Cowan
5b72d28557 Merge branch 'master' into node-detail-stats
Original commit: elastic/x-pack-elasticsearch@30869d1556
2015-09-17 10:53:58 -07:00
Chris Cowan
a5cfeef811 Merge branch 'master' into node-detail-stats
Original commit: elastic/x-pack-elasticsearch@ab2bc389a0
2015-09-17 09:21:27 -07:00
Chris Cowan
0fa6791690 Merge pull request elastic/elasticsearch#512 from tsullivan/pagination-component
React Pagination component updates

Original commit: elastic/x-pack-elasticsearch@59bfede078
2015-09-17 08:19:04 -07:00
Chris Cowan
2c7d57bfef Merge branch 'master' of github.com:elasticsearch/elasticsearch-marvel into node-detail-stats
Original commit: elastic/x-pack-elasticsearch@5876aa4e56
2015-09-17 08:11:43 -07:00
Chris Cowan
1a804d0438 Merge pull request elastic/elasticsearch#513 from panda01/master
Sticky Tooltips!

Original commit: elastic/x-pack-elasticsearch@620b32e388
2015-09-17 08:10:58 -07: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
Tim Sullivan
fe08ebd35f Merge pull request elastic/elasticsearch#515 from simianhacker/cluster-state-mapping-update
Update Cluster State Mapping

Original commit: elastic/x-pack-elasticsearch@4fb88a37db
2015-09-16 11:55:51 -07:00
Chris Cowan
c6c334cfa1 Merge branch 'node-stats' into cluster-state-mapping-update
Original commit: elastic/x-pack-elasticsearch@f6ff8a4577
2015-09-16 11:50:18 -07: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
Chris Cowan
c1d05b8ee5 Changing cluster state and fixing the indexPattern for Kibana
Original commit: elastic/x-pack-elasticsearch@9838dd5bd7
2015-09-16 08:42:03 -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