Add mising 'prometheus' yaml level
Rename prometheus ssl key
Change-Id: I5fb4093e1679a6e541061749ced800c29847a13b
diff --git a/prometheus/server/target/dns.yml b/prometheus/server/target/dns.yml
index 1dd3afb..b51f732 100644
--- a/prometheus/server/target/dns.yml
+++ b/prometheus/server/target/dns.yml
@@ -1,14 +1,15 @@
parameters:
- server:
- target:
- dns:
- - name: 'pushgateway'
- domain:
- - 'tasks.prometheus_pushgateway'
- type: A
- port: 9091
- - name: 'prometheus'
- domain:
- - 'tasks.prometheus_server'
- type: A
- port: 9090
+ prometheus:
+ server:
+ target:
+ dns:
+ - name: 'pushgateway'
+ domain:
+ - 'tasks.prometheus_pushgateway'
+ type: A
+ port: 9091
+ - name: 'prometheus'
+ domain:
+ - 'tasks.prometheus_server'
+ type: A
+ port: 9090
diff --git a/prometheus/server/target/etcd.yml b/prometheus/server/target/etcd.yml
index 41204b5..ae75c64 100644
--- a/prometheus/server/target/etcd.yml
+++ b/prometheus/server/target/etcd.yml
@@ -1,10 +1,16 @@
parameters:
- server:
- target:
- etcd:
- - host: ${_param:cluster_node01_address}
- port: ${_param:cluster_node01_port}
- - host: ${_param:cluster_node02_address}
- port: ${_param:cluster_node02_port}
- - host: ${_param:cluster_node03_address}
- port: ${_param:cluster_node03_port}
+ prometheus:
+ server:
+ target:
+ etcd:
+ scheme: https
+ ssl_dir: /opt/prometheus/config
+ cert_name: prometheus-server.crt
+ key_name: prometheus-server.key
+ member:
+ - host: ${_param:cluster_node01_address}
+ port: ${_param:cluster_node01_port}
+ - host: ${_param:cluster_node02_address}
+ port: ${_param:cluster_node02_port}
+ - host: ${_param:cluster_node03_address}
+ port: ${_param:cluster_node03_port}
diff --git a/prometheus/server/target/kubernetes.yml b/prometheus/server/target/kubernetes.yml
index d77ab3f..8abed5d 100644
--- a/prometheus/server/target/kubernetes.yml
+++ b/prometheus/server/target/kubernetes.yml
@@ -1,8 +1,9 @@
parameters:
- server:
- target:
- kubernetes:
- api_ip: ${_param:kubernetes_control_address}
- ssl_dir: /opt/prometheus/config
- cert_name: kubelet-client.crt
- key_name: kubelet-client.key
+ prometheus:
+ server:
+ target:
+ kubernetes:
+ api_ip: ${_param:kubernetes_control_address}
+ ssl_dir: /opt/prometheus/config
+ cert_name: prometheus-server.crt
+ key_name: prometheus-server.key