From 98c2e24c73d47996c597fe6d5f7fd73bd15a18f8 Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <sofia@grafana.com>
Date: Thu, 19 Sep 2019 18:09:44 +0300
Subject: [PATCH] Changelog update for 6.3.6

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99124fabcc3..55941c2aa88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,6 +83,15 @@ Grafana is now using Alpine 3.10 as docker base image.
 
 Please consider migrating from PhantomJS to the [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer).
 
+# 6.3.6 (2019-09-23)
+
+### Features / Enhancements
+* **Database**: Rewrite system statistics query to perform better. [#19178](https://github.com/grafana/grafana/pull/19178), [@papagian](https://github.com/papagian)
+* **Metrics**: Adds setting for turning off total stats metrics. [#19142](https://github.com/grafana/grafana/pull/19142), [@marefr](https://github.com/marefr)
+
+### Bug Fixes
+* **Explore**: Fixes error when switching from prometheus to loki data sources. [#18599](https://github.com/grafana/grafana/pull/18599), [@kaydelaney](https://github.com/kaydelaney)
+
 # 6.3.5 (2019-09-02)
 
 ### Upgrades