IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-09 23:53:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove _source just for metrics, not logs"

Browse Source 
This reverts commit 611b6922f7.
This commit is contained in:
Ivana 2020-07-15 11:06:15 +02:00
parent 611b6922f7
commit a102ab2894
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/plugins/datasource/elasticsearch/elastic_response.ts
View File

@ -417,13 +417,7 @@ export class ElasticResponse {
if (response.hits && response.hits.hits.length > 0) {
const { propNames, docs } = flattenHits(response.hits.hits);
if (docs.length > 0) {
const series = createEmptyDataFrame(
propNames,
this.targets[0].timeField,
isLogsRequest,
logMessageField,
logLevelField
);
const series = createEmptyDataFrame(propNames, this.targets[0].timeField, logMessageField, logLevelField);
// Add a row for each document
for (const doc of docs) {
@ -560,7 +554,6 @@ const flattenHits = (hits: Doc[]): { docs: Array<Record<string, any>>; propNames
const createEmptyDataFrame = (
propNames: string[],
timeField: string,
isLogsRequest: boolean,
logMessageField?: string,
logLevelField?: string
): MutableDataFrame => {
@ -596,8 +589,8 @@ const createEmptyDataFrame = (
if (fieldNames.includes(propName)) {
continue;
}
// Do not add _source field (besides logs) as we are showing each _source field in table instead.
if (!isLogsRequest && propName === '_source') {
// Do not add _source field as we are showing each _source field in table instead.
if (propName === '_source') {
continue;
}