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
107bef2d
Commit
107bef2d
authored
Oct 04, 2018
by
David Kaltschmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rate function hint for series with nulls
parent
b0172427
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
public/app/plugins/datasource/prometheus/query_hints.ts
+4
-3
public/app/plugins/datasource/prometheus/specs/query_hints.test.ts
+8
-0
No files found.
public/app/plugins/datasource/prometheus/query_hints.ts
View file @
107bef2d
...
@@ -30,13 +30,14 @@ export function getQueryHints(series: any[], datasource?: any): any[] {
...
@@ -30,13 +30,14 @@ export function getQueryHints(series: any[], datasource?: any): any[] {
const
datapoints
:
number
[][]
=
s
.
datapoints
;
const
datapoints
:
number
[][]
=
s
.
datapoints
;
if
(
query
.
indexOf
(
'rate('
)
===
-
1
&&
datapoints
.
length
>
1
)
{
if
(
query
.
indexOf
(
'rate('
)
===
-
1
&&
datapoints
.
length
>
1
)
{
let
increasing
=
false
;
let
increasing
=
false
;
const
monotonic
=
datapoints
.
filter
(
dp
=>
dp
[
0
]
!==
null
).
every
((
dp
,
index
)
=>
{
const
nonNullData
=
datapoints
.
filter
(
dp
=>
dp
[
0
]
!==
null
);
const
monotonic
=
nonNullData
.
every
((
dp
,
index
)
=>
{
if
(
index
===
0
)
{
if
(
index
===
0
)
{
return
true
;
return
true
;
}
}
increasing
=
increasing
||
dp
[
0
]
>
datapoints
[
index
-
1
][
0
];
increasing
=
increasing
||
dp
[
0
]
>
nonNullData
[
index
-
1
][
0
];
// monotonic?
// monotonic?
return
dp
[
0
]
>=
datapoints
[
index
-
1
][
0
];
return
dp
[
0
]
>=
nonNullData
[
index
-
1
][
0
];
});
});
if
(
increasing
&&
monotonic
)
{
if
(
increasing
&&
monotonic
)
{
const
simpleMetric
=
query
.
trim
().
match
(
/^
\w
+$/
);
const
simpleMetric
=
query
.
trim
().
match
(
/^
\w
+$/
);
...
...
public/app/plugins/datasource/prometheus/specs/query_hints.test.ts
View file @
107bef2d
...
@@ -15,6 +15,14 @@ describe('getQueryHints()', () => {
...
@@ -15,6 +15,14 @@ describe('getQueryHints()', () => {
expect
(
hints
).
toEqual
([
null
]);
expect
(
hints
).
toEqual
([
null
]);
});
});
it
(
'returns no hint for a flat series'
,
()
=>
{
const
series
=
[
{
datapoints
:
[[
null
,
1000
],
[
23
,
1001
],
[
null
,
1002
],
[
23
,
1003
]],
query
:
'metric'
,
responseIndex
:
0
},
];
const
hints
=
getQueryHints
(
series
);
expect
(
hints
).
toEqual
([
null
]);
});
it
(
'returns a rate hint for a monotonously increasing series'
,
()
=>
{
it
(
'returns a rate hint for a monotonously increasing series'
,
()
=>
{
const
series
=
[{
datapoints
:
[[
23
,
1000
],
[
24
,
1001
]],
query
:
'metric'
,
responseIndex
:
0
}];
const
series
=
[{
datapoints
:
[[
23
,
1000
],
[
24
,
1001
]],
query
:
'metric'
,
responseIndex
:
0
}];
const
hints
=
getQueryHints
(
series
);
const
hints
=
getQueryHints
(
series
);
...
...
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