Rename 'fields' property to 'stored_fields' to adhere to new ES msearch API.
- Upgrade elasticsearch client to 12.0.0-rc4.
This commit is contained in:
parent
b86d78043e
commit
d9cf54f119
|
@ -101,8 +101,8 @@
|
||||||
"csv-parse": "1.1.0",
|
"csv-parse": "1.1.0",
|
||||||
"d3": "3.5.6",
|
"d3": "3.5.6",
|
||||||
"dragula": "3.7.0",
|
"dragula": "3.7.0",
|
||||||
"elasticsearch": "10.1.2",
|
"elasticsearch": "12.0.0-rc4",
|
||||||
"elasticsearch-browser": "10.1.2",
|
"elasticsearch-browser": "12.0.0-rc4",
|
||||||
"even-better": "7.0.2",
|
"even-better": "7.0.2",
|
||||||
"expiry-js": "0.1.7",
|
"expiry-js": "0.1.7",
|
||||||
"exports-loader": "0.6.2",
|
"exports-loader": "0.6.2",
|
||||||
|
|
|
@ -105,7 +105,7 @@ describe('plugins/elasticsearch', function () {
|
||||||
testRoute({
|
testRoute({
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: '/elasticsearch/_msearch?timeout=0&ignore_unavailable=true&preference=1429577952339',
|
url: '/elasticsearch/_msearch?timeout=0&ignore_unavailable=true&preference=1429577952339',
|
||||||
payload: '{"index":"logstash-2015.04.21","ignore_unavailable":true}\n{"size":500,"sort":{"@timestamp":"desc"},"query":{"bool":{"must":[{"query_string":{"analyze_wildcard":true,"query":"*"}},{"bool":{"must":[{"range":{"@timestamp":{"gte":1429577068175,"lte":1429577968175}}}],"must_not":[]}}],"must_not":[]}},"highlight":{"pre_tags":["@kibana-highlighted-field@"],"post_tags":["@/kibana-highlighted-field@"],"fields":{"*":{}}},"aggs":{"2":{"date_histogram":{"field":"@timestamp","interval":"30s","min_doc_count":0,"extended_bounds":{"min":1429577068175,"max":1429577968175}}}},"fields":["*","_source"],"script_fields":{},"fielddata_fields":["timestamp_offset","@timestamp","utc_time"]}\n' // eslint-disable-line max-len
|
payload: '{"index":"logstash-2015.04.21","ignore_unavailable":true}\n{"size":500,"sort":{"@timestamp":"desc"},"query":{"bool":{"must":[{"query_string":{"analyze_wildcard":true,"query":"*"}},{"bool":{"must":[{"range":{"@timestamp":{"gte":1429577068175,"lte":1429577968175}}}],"must_not":[]}}],"must_not":[]}},"highlight":{"pre_tags":["@kibana-highlighted-field@"],"post_tags":["@/kibana-highlighted-field@"],"fields":{"*":{}}},"aggs":{"2":{"date_histogram":{"field":"@timestamp","interval":"30s","min_doc_count":0,"extended_bounds":{"min":1429577068175,"max":1429577968175}}}},"stored_fields":["*"],"_source": true,"script_fields":{},"fielddata_fields":["timestamp_offset","@timestamp","utc_time"]}\n' // eslint-disable-line max-len
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -50,7 +50,8 @@ app.controller('doc', function ($scope, $route, es, timefilter) {
|
||||||
values: [$route.current.params.id]
|
values: [$route.current.params.id]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
fields: computedFields.fields,
|
stored_fields: computedFields.storedFields,
|
||||||
|
_source: computedFields._source,
|
||||||
script_fields: computedFields.scriptFields,
|
script_fields: computedFields.scriptFields,
|
||||||
fielddata_fields: computedFields.fielddataFields
|
fielddata_fields: computedFields.fielddataFields
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,11 +23,11 @@ describe('get computed fields', function () {
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should request all stored fields', function () {
|
it('should request all stored fields', function () {
|
||||||
expect(fn().fields).to.contain('*');
|
expect(fn().storedFields).to.contain('*');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should request _source seperately', function () {
|
it('should request _source seperately', function () {
|
||||||
expect(fn().fields).to.contain('_source');
|
expect(fn()._source).to.be(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should request date fields as fielddata_fields', function () {
|
it('should request date fields as fielddata_fields', function () {
|
||||||
|
|
|
@ -18,7 +18,8 @@ export default function () {
|
||||||
});
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
fields: ['*', '_source'],
|
storedFields: ['*'],
|
||||||
|
_source: true,
|
||||||
scriptFields: scriptFields,
|
scriptFields: scriptFields,
|
||||||
fielddataFields: fielddataFields
|
fielddataFields: fielddataFields
|
||||||
};
|
};
|
||||||
|
|
|
@ -16,7 +16,7 @@ export default function GetIndexPatternIdsFn(es, kbnIndex) {
|
||||||
cachedPromise = es.search({
|
cachedPromise = es.search({
|
||||||
index: kbnIndex,
|
index: kbnIndex,
|
||||||
type: 'index-pattern',
|
type: 'index-pattern',
|
||||||
fields: [],
|
storedFields: [],
|
||||||
body: {
|
body: {
|
||||||
query: { match_all: {} },
|
query: { match_all: {} },
|
||||||
size: 10000
|
size: 10000
|
||||||
|
|
Loading…
Reference in a new issue