Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
cf7ace6a
Unverified
Commit
cf7ace6a
authored
Oct 07, 2019
by
David
Committed by
GitHub
Oct 07, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename live option in queries (#19658)
parent
aa70abb3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
7 deletions
+9
-7
public/app/features/explore/state/actions.ts
+3
-3
public/app/plugins/datasource/elasticsearch/specs/elastic_response.test.ts
+1
-1
public/app/plugins/datasource/loki/datasource.ts
+1
-1
public/app/plugins/datasource/loki/types.ts
+1
-1
public/app/types/explore.ts
+3
-1
No files found.
public/app/features/explore/state/actions.ts
View file @
cf7ace6a
...
...
@@ -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
,
live
Streaming
:
live
,
showingGraph
,
showingTable
,
};
...
...
public/app/plugins/datasource/elasticsearch/specs/elastic_response.test.ts
View file @
cf7ace6a
...
...
@@ -797,7 +797,7 @@ describe('ElasticResponse', () => {
interval
:
'10s'
,
isLogsQuery
:
true
,
key
:
'Q-1561369883389-0.7611823271062786-0'
,
live
:
false
,
live
Streaming
:
false
,
maxDataPoints
:
1620
,
query
:
''
,
timeField
:
'@timestamp'
,
...
...
public/app/plugins/datasource/loki/datasource.ts
View file @
cf7ace6a
...
...
@@ -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
.
live
Streaming
)
{
return
this
.
runLiveQuery
(
options
,
target
);
}
return
this
.
runQuery
(
options
,
target
);
...
...
public/app/plugins/datasource/loki/types.ts
View file @
cf7ace6a
...
...
@@ -3,7 +3,7 @@ import { Labels } from '@grafana/data';
export
interface
LokiQuery
extends
DataQuery
{
expr
:
string
;
live
?:
boolean
;
live
Streaming
?:
boolean
;
query
?:
string
;
regexp
?:
string
;
}
...
...
public/app/types/explore.ts
View file @
cf7ace6a
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment