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/docker/swarm/service/monitoring/prometheus_alertmanager.yml b/docker/swarm/service/monitoring/prometheus_alertmanager.yml
index 99eb226..5d5f237 100644
--- a/docker/swarm/service/monitoring/prometheus_alertmanager.yml
+++ b/docker/swarm/service/monitoring/prometheus_alertmanager.yml
@@ -6,11 +6,12 @@
service:
prometheus_alertmanager:
network: monitoring
- replica: 2
+ replicas: 2
environment:
config_dir: /opt/alertmanager/config
bind_port: ${prometheus:alertmanager:bind:port}
bind_address: ${prometheus:alertmanager:bind:address}
+ discovery_domain: 'prometheus_alertmanager'
restart:
condition: any
image: ${_param:docker_image_alertmanager}
diff --git a/docker/swarm/service/monitoring/prometheus_pushgateway.yml b/docker/swarm/service/monitoring/prometheus_pushgateway.yml
index 7ba37af..ad159b6 100644
--- a/docker/swarm/service/monitoring/prometheus_pushgateway.yml
+++ b/docker/swarm/service/monitoring/prometheus_pushgateway.yml
@@ -4,7 +4,7 @@
service:
prometheus_pushgateway:
network: monitoring
- replica: 2
+ replicas: 2
restart:
condition: any
image: ${_param:docker_image_pushgateway}
diff --git a/docker/swarm/service/monitoring/prometheus_server.yml b/docker/swarm/service/monitoring/prometheus_server.yml
index 94207ca..37bb6d3 100644
--- a/docker/swarm/service/monitoring/prometheus_server.yml
+++ b/docker/swarm/service/monitoring/prometheus_server.yml
@@ -6,7 +6,7 @@
service:
prometheus_server:
network: monitoring
- replica: 1
+ replicas: 1
environment:
config_dir: /opt/prometheus/config
bind_port: ${prometheus:server:bind:port}
@@ -17,6 +17,7 @@
storage_local_memory_chunks: ${prometheus:server:storage:local:memory_chunks}
storage_local_max_chunks_to_persist: ${prometheus:server:storage:local:max_chunks_to_persist}
storage_local_num_fingerprint_mutexes: ${prometheus:server:storage:local:num_fingerprint_mutexes}
+ discovery_domain: 'prometheus_alertmanager'
restart:
condition: any
image: ${_param:docker_image_prometheus}