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

Explore: Fix showing of results of queries in table (#24018)

Browse Source 
* Fix: Show results of instant queries in Explore tables

* Add PreferredVisualisationType to meta

* Implement visualisation exception for Prometheus

* Implement visualisation exception for Elastic
This commit is contained in:
Ivana Huckova
2020-04-30 12:41:03 +02:00
committed by GitHub
parent f2254081c2
commit e2436b29c0
6 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -452,7 +452,11 @@ export class ElasticResponse {
this.nameSeries(tmpSeriesList, target);
for (let y = 0; y < tmpSeriesList.length; y++) {
const series = toDataFrame(tmpSeriesList[y]);
let series = toDataFrame(tmpSeriesList[y]);
// When log results, show aggregations only in graph. Log fields are then going to be shown in table.
series = addPreferredVisualisationType(series, 'graph');
dataFrame.push(series);
}
}
@@ -568,3 +572,14 @@ const createEmptyDataFrame = (
return series;
};
const addPreferredVisualisationType = (series: any, type: string) => {
let s = series;
s.meta
? (s.meta.preferredVisualisationType = type)
: (s.meta = {
preferredVisualisationType: type,
});
return s;
};