Prometheus fixes
* Rename 'replica' to 'replicas' in docker/swarm/service/monitoring
* Add 'discovery_domain' environment for entrypoint
* Build prometheus/server/target/etcd.yml yourself
* Build prometheus/server/target/kubernetes.ym yourself
* Add prometheus/server/target/dns.yml
* Fix SSL permissions for prometheus
Change-Id: Icae085f6b0762ada58d03cde276963ec1e4bdefa
diff --git a/prometheus/server/target/dns.yml b/prometheus/server/target/dns.yml
new file mode 100644
index 0000000..1dd3afb
--- /dev/null
+++ b/prometheus/server/target/dns.yml
@@ -0,0 +1,14 @@
+parameters:
+ 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 e343bda..41204b5 100644
--- a/prometheus/server/target/etcd.yml
+++ b/prometheus/server/target/etcd.yml
@@ -1,6 +1,10 @@
-classes:
-- service.etcd.server.cluster
parameters:
server:
target:
- etcd: ${etcd:server:members}
+ 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}
diff --git a/prometheus/server/target/kubernetes.yml b/prometheus/server/target/kubernetes.yml
index 293895b..d77ab3f 100644
--- a/prometheus/server/target/kubernetes.yml
+++ b/prometheus/server/target/kubernetes.yml
@@ -1,10 +1,8 @@
-classes:
-- service.kubernetes.master.cluster
parameters:
server:
target:
kubernetes:
- api_ip: ${kubernetes:master:apiserver:address}
+ api_ip: ${_param:kubernetes_control_address}
ssl_dir: /opt/prometheus/config
cert_name: kubelet-client.crt
key_name: kubelet-client.key