commit fab9265dc3985b23ce935749f5604bfc0a2b2d54
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Dec 21 12:00:12 2017 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Thu Dec 21 12:00:12 2017 +0000
tree 1108e4ba93379a576fa6dbd34bf4bbc5e1c91084
parent 618962ef6bd4bc9d991dd01e70b58987d17ddb76
parent 9bb4578775b40b895aa5c529f2ad54973114833d

Merge "Switch Kibana to 5 version"

kibana/map.jinja

diff --git a/kibana/map.jinja b/kibana/map.jinja
index bf829c1..5749c15 100644
--- a/kibana/map.jinja
+++ b/kibana/map.jinja
@@ -5,7 +5,7 @@
   service: kibana
   default_app_id: discover
 default:
-  version: 4
+  version: 5
 {%- endload %}
 
 {% set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('kibana:server'), base='default') %}

metadata/service/client.yml

diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index 4abf671..17a1376 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -3,7 +3,7 @@
 parameters:
   _param:
     kibana_client_default_index: "log-*"
-    kibana_version: 4
+    kibana_version: 5
   kibana:
     client:
       enabled: true

metadata/service/server/single.yml

diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 561bec0..5ec45fd 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -4,7 +4,7 @@
 - service.kibana.support
 parameters:
   _param:
-    kibana_version: 4
+    kibana_version: 5
   kibana:
     server:
       enabled: true