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

CloudWatch Logs: If Grafana Live isn't enabled, don't use the Live Channel (#36358)

Browse Source 
* If Live isn't enabled, don't use the Live Channel

* ..Import Config if you want to use it!
This commit is contained in:
Thomas Cave 2021-07-07 12:39:32 +01:00 committed by GitHub
parent a241f03167
commit 3e95c3826a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/cloudwatch/datasource.ts
View File

@ -64,6 +64,7 @@ import { CloudWatchLanguageProvider } from './language_provider';
import { VariableWithMultiSupport } from 'app/features/variables/types'; import { VariableWithMultiSupport } from 'app/features/variables/types';
import { AwsUrl, encodeUrl } from './aws_url'; import { AwsUrl, encodeUrl } from './aws_url';
import { increasingInterval } from './utils/rxjs/increasingInterval'; import { increasingInterval } from './utils/rxjs/increasingInterval';
import config from 'app/core/config';
const DS_QUERY_ENDPOINT = '/api/ds/query'; const DS_QUERY_ENDPOINT = '/api/ds/query';
@ -126,8 +127,11 @@ export class CloudWatchDatasource extends DataSourceWithBackend<CloudWatchQuery,
const dataQueryResponses: Array<Observable<DataQueryResponse>> = []; const dataQueryResponses: Array<Observable<DataQueryResponse>> = [];
if (logQueries.length > 0) { if (logQueries.length > 0) {
dataQueryResponses.push(this.handleLiveLogQueries(logQueries, options)); if (config.liveEnabled) {
// dataQueryResponses.push(this.handleLogQueries(logQueries, options)); dataQueryResponses.push(this.handleLiveLogQueries(logQueries, options));
} else {
dataQueryResponses.push(this.handleLogQueries(logQueries, options));
}
} }
if (metricsQueries.length > 0) { if (metricsQueries.length > 0) {