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
3bdd4a5c
Commit
3bdd4a5c
authored
Jan 15, 2019
by
Daniel Lee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changelog: adds note for #14795
parent
8e771f9a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG.md
+1
-0
public/app/plugins/datasource/prometheus/specs/datasource.test.ts
+2
-2
No files found.
CHANGELOG.md
View file @
3bdd4a5c
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
### Bug fixes
### Bug fixes
*
**Search**
: Fix for issue with scrolling the "tags filter" dropdown, fixes
[
#14486
](
https://github.com/grafana/grafana/issues/14486
)
*
**Search**
: Fix for issue with scrolling the "tags filter" dropdown, fixes
[
#14486
](
https://github.com/grafana/grafana/issues/14486
)
*
**Prometheus**
: Query for annotation always uses 60s step regardless of dashboard range, fixes
[
#14795
](
https://github.com/grafana/grafana/issues/14795
)
# 5.4.3 (2019-01-14)
# 5.4.3 (2019-01-14)
...
...
public/app/plugins/datasource/prometheus/specs/datasource.test.ts
View file @
3bdd4a5c
...
@@ -644,8 +644,8 @@ describe('PrometheusDatasource', () => {
...
@@ -644,8 +644,8 @@ describe('PrometheusDatasource', () => {
ctx.ds.annotationQuery(query);
ctx.ds.annotationQuery(query);
const req = backendSrv.datasourceRequest.mock.calls[0][0];
const req = backendSrv.datasourceRequest.mock.calls[0][0];
// Range in seconds: (to - from) / 1000
// Range in seconds: (to - from) / 1000
// Max_datapints: 11000
// Max_datap
o
ints: 11000
// Step: range / max_datapints
// Step: range / max_datap
o
ints
const step = 236;
const step = 236;
expect(req.url).toContain(`step=${step}`);
expect(req.url).toContain(`step=${step}`);
});
});
...
...
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