diff --git a/public/app/features/explore/state/actions.ts b/public/app/features/explore/state/actions.ts index ca56b43a215..02d953b7dde 100644 --- a/public/app/features/explore/state/actions.ts +++ b/public/app/features/explore/state/actions.ts @@ -33,7 +33,7 @@ import { isDateTime, dateTimeForTimeZone, } from '@grafana/data'; -import { ExploreId, ExploreUIState, ExploreMode } from 'app/types/explore'; +import { ExploreId, ExploreUIState, ExploreMode, QueryOptions } from 'app/types/explore'; import { updateDatasourceInstanceAction, changeQueryAction, @@ -463,12 +463,12 @@ export function runQueries(exploreId: ExploreId): ThunkResult { stopQueryState(querySubscription); - const queryOptions = { + const queryOptions: QueryOptions = { minInterval, // This is used for logs streaming for buffer size, with undefined it falls back to datasource config if it // supports that. maxDataPoints: mode === ExploreMode.Logs ? undefined : containerWidth, - live, + liveStreaming: live, showingGraph, showingTable, }; diff --git a/public/app/plugins/datasource/elasticsearch/specs/elastic_response.test.ts b/public/app/plugins/datasource/elasticsearch/specs/elastic_response.test.ts index 9f19b3a2b18..5c78f26cbdf 100644 --- a/public/app/plugins/datasource/elasticsearch/specs/elastic_response.test.ts +++ b/public/app/plugins/datasource/elasticsearch/specs/elastic_response.test.ts @@ -797,7 +797,7 @@ describe('ElasticResponse', () => { interval: '10s', isLogsQuery: true, key: 'Q-1561369883389-0.7611823271062786-0', - live: false, + liveStreaming: false, maxDataPoints: 1620, query: '', timeField: '@timestamp', diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index 46289639044..65cdcb57f90 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -216,7 +216,7 @@ export class LokiDatasource extends DataSourceApi { const subQueries = options.targets .filter(target => target.expr && !target.hide) .map(target => { - if (target.live) { + if (target.liveStreaming) { return this.runLiveQuery(options, target); } return this.runQuery(options, target); diff --git a/public/app/plugins/datasource/loki/types.ts b/public/app/plugins/datasource/loki/types.ts index a629cea9f58..65a6fdf4294 100644 --- a/public/app/plugins/datasource/loki/types.ts +++ b/public/app/plugins/datasource/loki/types.ts @@ -3,7 +3,7 @@ import { Labels } from '@grafana/data'; export interface LokiQuery extends DataQuery { expr: string; - live?: boolean; + liveStreaming?: boolean; query?: string; regexp?: string; } diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts index 3b06385efe8..cd97de0d664 100644 --- a/public/app/types/explore.ts +++ b/public/app/types/explore.ts @@ -345,7 +345,9 @@ export interface QueryIntervals { export interface QueryOptions { minInterval: string; maxDataPoints?: number; - live?: boolean; + liveStreaming?: boolean; + showingGraph?: boolean; + showingTable?: boolean; } export interface QueryTransaction {