Pārlūkot izejas kodu

changelog: adds note for #14795

Daniel Lee 7 gadi atpakaļ
vecāks
revīzija
3bdd4a5c33

+ 1 - 0
CHANGELOG.md

@@ -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)
 
 

+ 2 - 2
public/app/plugins/datasource/prometheus/specs/datasource.test.ts

@@ -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
-        // Step: range / max_datapints
+        // Max_datapoints: 11000
+        // Step: range / max_datapoints
         const step = 236;
         const step = 236;
         expect(req.url).toContain(`step=${step}`);
         expect(req.url).toContain(`step=${step}`);
       });
       });