From 3bdd4a5c33eb1c62db4d105f3cebe8a84eb6f11d Mon Sep 17 00:00:00 2001
From: Daniel Lee <dan.limerick@gmail.com>
Date: Tue, 15 Jan 2019 17:14:58 +0100
Subject: [PATCH] changelog: adds note for #14795

---
 CHANGELOG.md                                                  | 1 +
 .../plugins/datasource/prometheus/specs/datasource.test.ts    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd0339d1991..9225d6545e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 
 ### Bug fixes
 * **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)
 
diff --git a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts
index 46b37d37b8e..77ccbf2eadf 100644
--- a/public/app/plugins/datasource/prometheus/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/prometheus/specs/datasource.test.ts
@@ -644,8 +644,8 @@ describe('PrometheusDatasource', () => {
         ctx.ds.annotationQuery(query);
         const req = backendSrv.datasourceRequest.mock.calls[0][0];
         // Range in seconds: (to - from) / 1000
-        // Max_datapints: 11000
-        // Step: range / max_datapints
+        // Max_datapoints: 11000
+        // Step: range / max_datapoints
         const step = 236;
         expect(req.url).toContain(`step=${step}`);
       });