Rename live option in queries (#19658)

This commit is contained in:
David
2019-10-07 14:09:46 +02:00
committed by GitHub
parent aa70abb35d
commit cf7ace6aad
5 changed files with 9 additions and 7 deletions

View File

@@ -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<void> {
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,
};

View File

@@ -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',

View File

@@ -216,7 +216,7 @@ export class LokiDatasource extends DataSourceApi<LokiQuery, LokiOptions> {
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);

View File

@@ -3,7 +3,7 @@ import { Labels } from '@grafana/data';
export interface LokiQuery extends DataQuery {
expr: string;
live?: boolean;
liveStreaming?: boolean;
query?: string;
regexp?: string;
}

View File

@@ -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 {