Commit 3bdd4a5c by Daniel Lee

changelog: adds note for #14795

parent 8e771f9a
...@@ -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)
......
...@@ -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_datapoints: 11000
// Step: range / max_datapints // Step: range / max_datapoints
const step = 236; const step = 236;
expect(req.url).toContain(`step=${step}`); expect(req.url).toContain(`step=${step}`);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment