commit a7a32440ea6e0b6584003e39de98bad82529a15a
author Bartosz Kupidura <bkupidura@mirantis.com> Wed May 17 15:59:08 2017 +0200
committer Bartosz Kupidura <bkupidura@mirantis.com> Fri May 19 16:52:07 2017 +0200
tree 81a3b6fc8558f7a60f47dc9d1295bd0abc9725e0
parent fe0e19abbc5986ad04d8030a4b9a4f3ab15863a8

Change monitoring config dir

Add monitoring data dir

Change-Id: I3df723161503cee88b154308a063aa943db17a6a
Depends-On: Ie89009480c06cafb15bb06ded263e49ef194dfc9

prometheus/alertmanager/init.yml

diff --git a/prometheus/alertmanager/init.yml b/prometheus/alertmanager/init.yml
new file mode 100644
index 0000000..e7ba562
--- /dev/null
+++ b/prometheus/alertmanager/init.yml
@@ -0,0 +1,4 @@
+parameters:
+  _param:
+    prometheus_alermanager_config_directory: /srv/alertmanager
+    prometheus_alermanager_data_directory: /data

prometheus/server/init.yml

diff --git a/prometheus/server/init.yml b/prometheus/server/init.yml
new file mode 100644
index 0000000..0ecea17
--- /dev/null
+++ b/prometheus/server/init.yml
@@ -0,0 +1,4 @@
+parameters:
+  _param:
+    prometheus_server_config_directory: /srv/prometheus
+    prometheus_server_data_directory: /data

prometheus/server/target/dns.yml

diff --git a/prometheus/server/target/dns.yml b/prometheus/server/target/dns.yml
index 14d5da3..7bbf92e 100644
--- a/prometheus/server/target/dns.yml
+++ b/prometheus/server/target/dns.yml
@@ -1,7 +1,3 @@
-classes:
-- service.prometheus.server.container
-- service.prometheus.alertmanager.container
-- service.prometheus.pushgateway.container
 parameters:
   prometheus:
     server:

prometheus/server/target/etcd.yml

diff --git a/prometheus/server/target/etcd.yml b/prometheus/server/target/etcd.yml
index 4cd04bf..0ac3310 100644
--- a/prometheus/server/target/etcd.yml
+++ b/prometheus/server/target/etcd.yml
@@ -8,6 +8,6 @@
             scheme: https
             tls_config:
               skip_verify: true
-              ssl_dir: /opt/prometheus/config
+              ssl_dir: ${_param:prometheus_server_config_directory}
               cert_name: prometheus-server.crt
               key_name: prometheus-server.key

prometheus/server/target/kubernetes.yml

diff --git a/prometheus/server/target/kubernetes.yml b/prometheus/server/target/kubernetes.yml
index d7ba3d6..60ca1e0 100644
--- a/prometheus/server/target/kubernetes.yml
+++ b/prometheus/server/target/kubernetes.yml
@@ -5,6 +5,6 @@
         kubernetes:
           enabled: true
           api_ip: ${_param:kubernetes_control_address}
-          ssl_dir: /opt/prometheus/config
+          ssl_dir: ${_param:prometheus_server_config_directory}
           cert_name: prometheus-server.crt
           key_name: prometheus-server.key