Discover version of installed kibana pkg instead of hardcoded value
Change-Id: Id5bc7bb92a5e29787d64aa3ef087ebfdc7cf42ce
diff --git a/kibana/client/init.sls b/kibana/client/init.sls
index d0c38e7..7d1ba03 100644
--- a/kibana/client/init.sls
+++ b/kibana/client/init.sls
@@ -1,6 +1,15 @@
{%- from "kibana/map.jinja" import client with context %}
{%- if client.get('enabled', False) %}
+{%- set kibana_version = salt['pkg.version']('kibana') %}
+{%- if kibana_version is defined %}
+kibana_object_config:
+ kibana_object.present:
+ - kibana_content:
+ defaultIndex: {{ client.get('default_index', {}) }}
+ - name: {{ kibana_version }}
+ - kibana_type: 'config'
+
{%- for object_name, object in client.get('object', {}).iteritems() %}
kibana_object_{{ object_name }}:
{%- if object.get('enabled', False) %}
@@ -15,3 +24,4 @@
{%- endfor %}
{%- endif %}
+{%- endif %}
diff --git a/kibana/files/objects/config.json b/kibana/files/objects/config.json
deleted file mode 100644
index 1456354..0000000
--- a/kibana/files/objects/config.json
+++ /dev/null
@@ -1 +0,0 @@
-{"defaultIndex" : "log-*"}
diff --git a/metadata/service/client.yml b/metadata/service/client.yml
index e965def..5fef9d9 100644
--- a/metadata/service/client.yml
+++ b/metadata/service/client.yml
@@ -2,16 +2,12 @@
- kibana
parameters:
_param:
- kibana_version: 4.6.4
+ kibana_client_default_index: "log-*"
kibana:
client:
enabled: true
+ default_index: ${_param:kibana_client_default_index}
object:
- config:
- id: ${_param:kibana_version}
- enabled: true
- template: kibana/files/objects/config.json
- type: 'config'
logs:
enabled: true
template: kibana/files/objects/dashboard_logs.json
diff --git a/tests/pillar/kibana_client.sls b/tests/pillar/kibana_client.sls
index 4c742fb..08d7a5f 100644
--- a/tests/pillar/kibana_client.sls
+++ b/tests/pillar/kibana_client.sls
@@ -1,12 +1,8 @@
kibana:
client:
enabled: true
+ default_index: 'log-*'
object:
- all:
- id: 4.6.4
- enabled: true
- template: kibana/files/objects/config.json
- type: config
logs:
enabled: true
template: kibana/files/objects/dashboard_logs.json