IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

ES: return .raw fields in field lookups, closes #8975

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-08-02 16:52:43 +02:00
parent a5d5f3d82f
commit a5bdfec0de
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/plugins/datasource/elasticsearch/datasource.js
View File

@ -272,10 +272,17 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
var subObj = obj[key]; var subObj = obj[key];
// Check mapping field for nested fields // Check mapping field for nested fields
if (subObj.hasOwnProperty('properties')) { if (_.isObject(subObj.properties)) {
fieldNameParts.push(key); fieldNameParts.push(key);
getFieldsRecursively(subObj.properties); getFieldsRecursively(subObj.properties);
} else { }
if (_.isObject(subObj.fields)) {
fieldNameParts.push(key);
getFieldsRecursively(subObj.fields);
}
if (_.isString(subObj.type)) {
var fieldName = fieldNameParts.concat(key).join('.'); var fieldName = fieldNameParts.concat(key).join('.');
// Hide meta-fields and check field type // Hide meta-fields and check field type

6
public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
View File

@ -129,7 +129,10 @@ describe('ElasticDatasource', function() {
'@timestamp': {type: 'date'}, '@timestamp': {type: 'date'},
beat: { beat: {
properties: { properties: {
name: {type: 'string'}, name: {
fields: {raw: {type: 'keyword'}},
type: 'string'
},
hostname: {type: 'string'}, hostname: {type: 'string'},
} }
}, },
@ -169,6 +172,7 @@ describe('ElasticDatasource', function() {
var fields = _.map(fieldObjects, 'text'); var fields = _.map(fieldObjects, 'text');
expect(fields).to.eql([ expect(fields).to.eql([
'@timestamp', '@timestamp',
'beat.name.raw',
'beat.name', 'beat.name',
'beat.hostname', 'beat.hostname',
'system.cpu.system', 'system.cpu.system',