mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Rename live option in queries (#19658)
This commit is contained in:
@@ -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,
|
||||
};
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -3,7 +3,7 @@ import { Labels } from '@grafana/data';
|
||||
|
||||
export interface LokiQuery extends DataQuery {
|
||||
expr: string;
|
||||
live?: boolean;
|
||||
liveStreaming?: boolean;
|
||||
query?: string;
|
||||
regexp?: string;
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user