Skip to content

Commit 0df7f91

Browse files
authored
Don't set cache-skip header if async caching enabled (#17)
1 parent 25475e2 commit 0df7f91

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/DatasourceWithAsyncBackend.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
DataSourceInstanceSettings,
77
DataSourceJsonData,
88
} from '@grafana/data';
9-
import { BackendDataSourceResponse, DataSourceWithBackend, getBackendSrv, toDataQueryResponse } from '@grafana/runtime';
9+
import { BackendDataSourceResponse, DataSourceWithBackend, config, getBackendSrv, toDataQueryResponse } from '@grafana/runtime';
1010
import { merge, Observable, of } from 'rxjs';
1111
import { catchError,map } from 'rxjs/operators';
1212
import { getRequestLooper } from './requestLooper';
@@ -136,7 +136,8 @@ export class DatasourceWithAsyncBackend<
136136
};
137137

138138
let headers = {};
139-
if (isRunning(status)) {
139+
const cachingDisabled = !config.featureToggles.useCachingService || !config.featureToggles.awsAsyncQueryCaching
140+
if (cachingDisabled && isRunning(status)) {
140141
// bypass query caching for Grafana Enterprise to
141142
// prevent an infinite loop
142143
headers = { 'X-Cache-Skip': true };

0 commit comments

Comments
 (0)