From a134b801931ec1d6afab8720b461a648368b6fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= <sitbackandwait@gmail.com>
Date: Tue, 21 Nov 2017 14:52:31 +0100
Subject: [PATCH] additional docs and changelog fix

---
 CHANGELOG.asciidoc                     | 1 -
 libbeat/docs/dashboardsconfig.asciidoc | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index b35be03372a..4b292e98785 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -14,7 +14,6 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di
 
 *Affecting all Beats*
 
-- Determine log level for kafka output. {pull}5397[5397]
 - Support dashboard loading without Elasticseach {pull}5653[5653]
 
 *Auditbeat*
diff --git a/libbeat/docs/dashboardsconfig.asciidoc b/libbeat/docs/dashboardsconfig.asciidoc
index 4c59b060191..03a24c41c5d 100644
--- a/libbeat/docs/dashboardsconfig.asciidoc
+++ b/libbeat/docs/dashboardsconfig.asciidoc
@@ -91,3 +91,9 @@ is `".kibana"`
 
 The Elasticsearch index name. This setting overwrites the index name defined
 in the dashboards and index pattern. Example: `"testbeat-*"`
+
+[float]
+==== `setup.dashboards.always_kibana`
+
+Force loading of dashboards using the Kibana API without querying Elasticsearch for the version
+The default is `false`.