IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Elasticsearch: Allow fields starting with underscore (#27520)

Browse Source
This commit is contained in:
Giordano Ricci
2020-09-15 09:14:47 +01:00
committed by GitHub
parent 0d2fbd2acd
commit a0beaa3bbe
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/plugins/datasource/elasticsearch/datasource.test.ts
View File

@@ -378,8 +378,12 @@ describe('ElasticDatasource', function(this: any) {
mappings: { mappings: {
metricsets: { metricsets: {
_all: {}, _all: {},
_meta: {
test: 'something',
},
properties: { properties: {
'@timestamp': { type: 'date' }, '@timestamp': { type: 'date' },
__timestamp: { type: 'date' },
beat: { beat: {
properties: { properties: {
name: { name: {
@@ -426,6 +430,7 @@ describe('ElasticDatasource', function(this: any) {
const fields = _.map(fieldObjects, 'text'); const fields = _.map(fieldObjects, 'text');
expect(fields).toEqual([ expect(fields).toEqual([
'@timestamp', '@timestamp',
'__timestamp',
'beat.name.raw', 'beat.name.raw',
'beat.name', 'beat.name',
'beat.hostname', 'beat.hostname',
@@ -455,7 +460,7 @@ describe('ElasticDatasource', function(this: any) {
}); });
const fields = _.map(fieldObjects, 'text'); const fields = _.map(fieldObjects, 'text');
expect(fields).toEqual(['@timestamp']); expect(fields).toEqual(['@timestamp', '__timestamp']);
}); });
}); });

24
public/app/plugins/datasource/elasticsearch/datasource.ts
View File

@@ -22,6 +22,20 @@ import { TemplateSrv } from 'app/features/templating/template_srv';
import { TimeSrv } from 'app/features/dashboard/services/TimeSrv'; import { TimeSrv } from 'app/features/dashboard/services/TimeSrv';
import { DataLinkConfig, ElasticsearchOptions, ElasticsearchQuery } from './types'; import { DataLinkConfig, ElasticsearchOptions, ElasticsearchQuery } from './types';
// Those are metadata fields as defined in https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-fields.html#_identity_metadata_fields.
// custom fields can start with underscores, therefore is not safe to exclude anything that starts with one.
const ELASTIC_META_FIELDS = [
'_index',
'_type',
'_id',
'_source',
'_size',
'_field_names',
'_ignored',
'_routing',
'_meta',
];
export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, ElasticsearchOptions> { export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, ElasticsearchOptions> {
basicAuth?: string; basicAuth?: string;
withCredentials?: boolean; withCredentials?: boolean;
@@ -426,6 +440,10 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
}); });
} }
isMetadataField(fieldName: string) {
return ELASTIC_META_FIELDS.includes(fieldName);
}
getFields(query: any) { getFields(query: any) {
const configuredEsVersion = this.esVersion; const configuredEsVersion = this.esVersion;
return this.get('/_mapping').then((result: any) => { return this.get('/_mapping').then((result: any) => {
@@ -441,8 +459,8 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
nested: 'nested', nested: 'nested',
}; };
function shouldAddField(obj: any, key: any, query: any) { const shouldAddField = (obj: any, key: string, query: any) => {
if (key[0] === '_') { if (this.isMetadataField(key)) {
return false; return false;
} }
@@ -452,7 +470,7 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
// equal query type filter, or via typemap translation // equal query type filter, or via typemap translation
return query.type === obj.type || query.type === typeMap[obj.type]; return query.type === obj.type || query.type === typeMap[obj.type];
} };
// Store subfield names: [system, process, cpu, total] -> system.process.cpu.total // Store subfield names: [system, process, cpu, total] -> system.process.cpu.total
const fieldNameParts: any = []; const fieldNameParts: any = [];