Separate the configuration into a specific state
This patch separates the configuration of Kibana. This allow to
configure the client, restart the minion to read the conf and finally
apply the kibana.client state to push objects.
diff --git a/kibana/client.sls b/kibana/client/init.sls
similarity index 77%
rename from kibana/client.sls
rename to kibana/client/init.sls
index 95f0063..a1f72b7 100644
--- a/kibana/client.sls
+++ b/kibana/client/init.sls
@@ -1,12 +1,8 @@
{%- from "kibana/map.jinja" import client with context %}
{%- if client.get('enabled', False) %}
-/etc/salt/minion.d/_kibana.conf:
- file.managed:
- - source: salt://kibana/files/_kibana.conf
- - template: jinja
- - user: root
- - group: root
+include:
+ - kibana.client.service
{%- for object_name, object in client.get('object', {}).iteritems() %}
kibana_object_{{ object_name }}:
diff --git a/kibana/client/service.sls b/kibana/client/service.sls
new file mode 100644
index 0000000..bc9aa57
--- /dev/null
+++ b/kibana/client/service.sls
@@ -0,0 +1,11 @@
+{%- from "kibana/map.jinja" import client with context %}
+{%- if client.get('enabled', False) %}
+
+/etc/salt/minion.d/_kibana.conf:
+ file.managed:
+ - source: salt://kibana/files/_kibana.conf
+ - template: jinja
+ - user: root
+ - group: root
+
+{%- endif %}