From: Jean Flach <jean-marcel.flach@icinga.com>
Date: Wed, 11 Apr 2018 12:32:06 +0000 (+0200)
Subject: Update docs for ES 6
X-Git-Tag: v2.9.0~90^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fpull%2F6219%2Fhead;p=icinga2

Update docs for ES 6
---

diff --git a/doc/14-features.md b/doc/14-features.md
index 2ee09a06a..5e65cff00 100644
--- a/doc/14-features.md
+++ b/doc/14-features.md
@@ -403,7 +403,7 @@ The check results include parsed performance data metrics if enabled.
 
 > **Note**
 >
-> Elasticsearch 5.x is required. This feature has been successfully tested with Elasticsearch 5.6.4.
+> Elasticsearch 5.x or 6.x are required. This feature has been successfully tested with Elasticsearch 5.6.7 and 6.2.3.
 
 Enable the feature and restart Icinga 2.
 
@@ -433,12 +433,12 @@ Metric values are stored like this:
 
 The following characters are escaped in perfdata labels:
 
-  Character	| Escaped character
-  --------------|--------------------------
-  whitespace	| _
-  \		| _
-  /		| _
-  ::		| .
+  Character   | Escaped character
+  ------------|--------------------------
+  whitespace  | _
+  \           | _
+  /           | _
+  ::          | .
 
 Note that perfdata labels may contain dots (`.`) allowing to
 add more subsequent levels inside the tree.