DataSource: don't filter hidden queries automatically (#20088)

This commit is contained in:
Ryan McKinley
2019-10-30 09:51:13 -07:00
committed by GitHub
parent e940edc79f
commit 2bb4684741
10 changed files with 22 additions and 33 deletions

View File

@@ -4,7 +4,6 @@
"id": "cloudwatch",
"category": "cloud",
"hiddenQueries": true,
"metrics": true,
"alerting": true,
"annotations": true,

View File

@@ -6,7 +6,6 @@
"includes": [{ "type": "dashboard", "name": "Graphite Carbon Metrics", "path": "dashboards/carbon_metrics.json" }],
"hiddenQueries": true,
"metrics": true,
"alerting": true,
"annotations": true,

View File

@@ -49,6 +49,9 @@ export class InputDatasource extends DataSourceApi<InputQuery, InputOptions> {
query(options: DataQueryRequest<InputQuery>): Promise<DataQueryResponse> {
const results: DataFrame[] = [];
for (const query of options.targets) {
if (query.hide) {
continue;
}
let data = this.data;
if (query.data) {
data = query.data.map(v => toDataFrame(v));

View File

@@ -37,13 +37,6 @@ export class MixedDatasource extends DataSourceApi<DataQuery> {
mergeMap((dataSourceApi: DataSourceApi) => {
const datasourceRequest = cloneDeep(request);
// Remove any unused hidden queries
let newTargets = targets.slice();
if (!dataSourceApi.meta.hiddenQueries) {
newTargets = newTargets.filter((t: DataQuery) => !t.hide);
}
datasourceRequest.targets = newTargets;
datasourceRequest.requestId = `${dsName}${datasourceRequest.requestId || ''}`;
// all queries hidden return empty result for for this requestId

View File

@@ -6,7 +6,6 @@
"builtIn": true,
"mixed": true,
"metrics": true,
"hiddenQueries": true,
"queryOptions": {
"minInterval": true

View File

@@ -27,6 +27,9 @@ export class TestDataDataSource extends DataSourceApi<TestDataQuery> {
// Start streams and prepare queries
for (const target of options.targets) {
if (target.hide) {
continue;
}
if (target.scenarioId === 'streaming_client') {
streams.push(runStream(target, options));
} else {