commit b1fae127f85eda5bb42bcd67b4e31dd0eeef5e81
author vgusev <vgusev@mirantis.com> Tue Nov 14 16:45:19 2017 +0400
committer Vitaly Gusev <vgusev@mirantis.com> Wed Nov 22 13:48:41 2017 +0000
tree 970fa474446e9fd64096b2bfa79e1eb7f2539605
parent b9fc2fdc8c45786b9e449e3a4c8254b644746cfb

Add a possibility to deploy Kibana version 5

Change-Id: Ib526b41934e043b73af4c3180787e9cedbd00778

metadata/service/client.yml

diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index 5fef9d9..4abf671 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -3,6 +3,7 @@
 parameters:
   _param:
     kibana_client_default_index: "log-*"
+    kibana_version: 4
   kibana:
     client:
       enabled: true
@@ -42,49 +43,49 @@
           type: search
         LOG-MESSAGES-OVER-TIME-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_LOG-MESSAGES-OVER-TIME-PER-SEVERITY.json
           type: visualization
         LOG-MESSAGES-OVER-TIME-PER-SOURCE:
           enabled: true
-          template: kibana/files/objects/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_LOG-MESSAGES-OVER-TIME-PER-SOURCE.json
           type: visualization
         NUMBER-OF-LOG-MESSAGES-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_NUMBER-OF-LOG-MESSAGES-PER-SEVERITY.json
           type: visualization
         TOP-10-HOSTS:
           enabled: true
-          template: kibana/files/objects/visualization_TOP-10-HOSTS.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_TOP-10-HOSTS.json
           type: visualization
         TOP-10-PROGRAMS:
           enabled: true
-          template: kibana/files/objects/visualization_TOP-10-PROGRAMS.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_TOP-10-PROGRAMS.json
           type: visualization
         TOP-10-SOURCES:
           enabled: true
-          template: kibana/files/objects/visualization_TOP-10-SOURCES.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_TOP-10-SOURCES.json
           type: visualization
         NOTIFICATIONS-OVER-TIME-PER-SOURCE:
           enabled: true
-          template: kibana/files/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_NOTIFICATIONS-OVER-TIME-PER-SOURCE.json
           type: visualization
         NOTIFICATIONS-OVER-TIME-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_NOTIFICATIONS-OVER-TIME-PER-SEVERITY.json
           type: visualization
         EVENT-TYPE-BREAKDOWN:
           enabled: true
-          template: kibana/files/objects/visualization_EVENT-TYPE-BREAKDOWN.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_EVENT-TYPE-BREAKDOWN.json
           type: visualization
         SOURCE-BREAKDOWN:
           enabled: true
-          template: kibana/files/objects/visualization_SOURCE-BREAKDOWN.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_SOURCE-BREAKDOWN.json
           type: visualization
         HOST-BREAKDOWN:
           enabled: true
-          template: kibana/files/objects/visualization_HOST-BREAKDOWN.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_HOST-BREAKDOWN.json
           type: visualization
         NOTIFICATIONS-PER-SEVERITY:
           enabled: true
-          template: kibana/files/objects/visualization_NOTIFICATIONS-PER-SEVERITY.json
+          template: kibana/files/objects/v${_param:kibana_version}/visualization_NOTIFICATIONS-PER-SEVERITY.json
           type: visualization

metadata/service/server/single.yml

diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 3ca67fc..561bec0 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -3,10 +3,12 @@
 classes:
 - service.kibana.support
 parameters:
+  _param:
+    kibana_version: 4
   kibana:
     server:
       enabled: true
-      version: latest
+      version: ${_param:kibana_version}
       source:
         engine: file
       bind: