From 3e95c3826a33a809de833c6b60591d49c9209ac1 Mon Sep 17 00:00:00 2001 From: Thomas Cave Date: Wed, 7 Jul 2021 12:39:32 +0100 Subject: [PATCH] CloudWatch Logs: If Grafana Live isn't enabled, don't use the Live Channel (#36358) * If Live isn't enabled, don't use the Live Channel * ..Import Config if you want to use it! --- public/app/plugins/datasource/cloudwatch/datasource.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/public/app/plugins/datasource/cloudwatch/datasource.ts b/public/app/plugins/datasource/cloudwatch/datasource.ts index f21c79a4ca2..68a226df349 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.ts +++ b/public/app/plugins/datasource/cloudwatch/datasource.ts @@ -64,6 +64,7 @@ import { CloudWatchLanguageProvider } from './language_provider'; import { VariableWithMultiSupport } from 'app/features/variables/types'; import { AwsUrl, encodeUrl } from './aws_url'; import { increasingInterval } from './utils/rxjs/increasingInterval'; +import config from 'app/core/config'; const DS_QUERY_ENDPOINT = '/api/ds/query'; @@ -126,8 +127,11 @@ export class CloudWatchDatasource extends DataSourceWithBackend> = []; if (logQueries.length > 0) { - dataQueryResponses.push(this.handleLiveLogQueries(logQueries, options)); - // dataQueryResponses.push(this.handleLogQueries(logQueries, options)); + if (config.liveEnabled) { + dataQueryResponses.push(this.handleLiveLogQueries(logQueries, options)); + } else { + dataQueryResponses.push(this.handleLogQueries(logQueries, options)); + } } if (metricsQueries.length > 0) {