mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
DataSource: don't filter hidden queries automatically (#20088)
This commit is contained in:
@@ -4,7 +4,6 @@
|
||||
"id": "cloudwatch",
|
||||
"category": "cloud",
|
||||
|
||||
"hiddenQueries": true,
|
||||
"metrics": true,
|
||||
"alerting": true,
|
||||
"annotations": true,
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
|
||||
"includes": [{ "type": "dashboard", "name": "Graphite Carbon Metrics", "path": "dashboards/carbon_metrics.json" }],
|
||||
|
||||
"hiddenQueries": true,
|
||||
"metrics": true,
|
||||
"alerting": true,
|
||||
"annotations": true,
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
"builtIn": true,
|
||||
"mixed": true,
|
||||
"metrics": true,
|
||||
"hiddenQueries": true,
|
||||
|
||||
"queryOptions": {
|
||||
"minInterval": true
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user