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
b39268f1
Commit
b39268f1
authored
Sep 03, 2019
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Plain Diff
Explore: ResultProcessor refactor isTimeSeries check
parents
6e6e2c96
289a33bf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
public/app/features/dashboard/state/PanelQueryState.ts
+0
-2
public/app/features/explore/utils/ResultProcessor.ts
+12
-9
No files found.
public/app/features/dashboard/state/PanelQueryState.ts
View file @
b39268f1
...
...
@@ -274,8 +274,6 @@ export class PanelQueryState {
return
{
state
:
done
?
LoadingState
.
Done
:
LoadingState
.
Streaming
,
// This should not be needed but unfortunately Prometheus datasource sends non DataFrame here bypassing the
// typing.
series
:
this
.
sendFrames
?
getProcessedDataFrames
(
series
)
:
[],
legacy
:
this
.
sendLegacy
?
translateToLegacyData
(
series
)
:
undefined
,
request
:
{
...
...
public/app/features/explore/utils/ResultProcessor.ts
View file @
b39268f1
...
...
@@ -18,7 +18,7 @@ export class ResultProcessor {
return
[];
}
const
onlyTimeSeries
=
this
.
dataFrames
.
filter
(
series
=>
series
.
fields
.
length
===
2
);
const
onlyTimeSeries
=
this
.
dataFrames
.
filter
(
isTimeSeries
);
return
getGraphSeriesModel
(
onlyTimeSeries
,
...
...
@@ -36,14 +36,7 @@ export class ResultProcessor {
// For now ignore time series
// We can change this later, just need to figure out how to
// Ignore time series only for prometheus
const
onlyTables
=
this
.
dataFrames
.
filter
(
frame
=>
{
if
(
frame
.
fields
.
length
===
2
)
{
if
(
frame
.
fields
[
1
].
type
===
FieldType
.
time
)
{
return
false
;
}
}
return
true
;
});
const
onlyTables
=
this
.
dataFrames
.
filter
(
frame
=>
!
isTimeSeries
(
frame
));
const
tables
=
onlyTables
.
map
(
frame
=>
{
const
{
fields
}
=
frame
;
...
...
@@ -113,3 +106,13 @@ export class ResultProcessor {
return
{
...
sortedNewResults
,
rows
,
series
};
}
}
export
function
isTimeSeries
(
frame
:
DataFrame
):
boolean
{
if
(
frame
.
fields
.
length
===
2
)
{
if
(
frame
.
fields
[
1
].
type
===
FieldType
.
time
)
{
return
true
;
}
}
return
false
;
}
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