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

DataSourceMeta: add an option to get hidden queries (#17124)

Browse Source 
* add an option to get hidden queries

* make sure you have meta

* supportsHiddenQueries

* remove spaces

* DataSources: hidden queries flag
This commit is contained in:
Ryan McKinley
2019-05-21 04:46:19 -07:00
committed by Torkel Ödegaard
parent 73e4178aef
commit 1033f0f905
5 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/dashboard/state/PanelQueryRunner.ts
View File

@@ -108,9 +108,6 @@ export class PanelQueryRunner {
delayStateNotification,
} = options;
// filter out hidden queries & deep clone them
const clonedAndFilteredQueries = cloneDeep(queries.filter(q => !q.hide));
const request: DataQueryRequest = {
requestId: getNextRequestId(),
timezone,
@@ -120,7 +117,7 @@ export class PanelQueryRunner {
timeInfo,
interval: '',
intervalMs: 0,
targets: clonedAndFilteredQueries,
targets: cloneDeep(queries),
maxDataPoints: maxDataPoints || widthPixels,
scopedVars: scopedVars || {},
cacheTimeout,
@@ -135,6 +132,10 @@ export class PanelQueryRunner {
try {
const ds = await getDataSource(datasource, request.scopedVars);
if (ds.meta && !ds.meta.hiddenQueries) {
request.targets = request.targets.filter(q => !q.hide);
}
// Attach the datasource name to each query
request.targets = request.targets.map(query => {
if (!query.datasource) {