| commit | f7a526087195ebbe2b24363afa9e03eacf6cbbcc | [log] [tgz] |
|---|---|---|
| author | Michal Kobus <mkobus@mirantis.com> | Tue May 22 17:39:45 2018 +0200 |
| committer | mkobus <mkobus@mirantis.com> | Thu May 24 15:46:41 2018 +0000 |
| tree | 88cecdca3f8a97d7d6a0b579da12c9a947694b12 | |
| parent | c8d0a90f483ef9c946e2a73bf3140a111c657413 [diff] |
Add HTTPS proxy for Prometheus and Alertmanager Change-Id: I57a04c716290891cfc0fe32a23a09d6c2843b837 Closes-bug: PROD-20150
diff --git a/docker/swarm/stack/monitoring/alertmanager.yml b/docker/swarm/stack/monitoring/alertmanager.yml index 1f15be5..877984a 100644 --- a/docker/swarm/stack/monitoring/alertmanager.yml +++ b/docker/swarm/stack/monitoring/alertmanager.yml
@@ -3,7 +3,7 @@ parameters: _param: alertmanager_external_url: ${_param:cluster_public_host} - alertmanager_external_proto: http + alertmanager_external_proto: https docker: client: stack:
diff --git a/docker/swarm/stack/monitoring/prometheus/init.yml b/docker/swarm/stack/monitoring/prometheus/init.yml index 2d455f7..65dd5b9 100644 --- a/docker/swarm/stack/monitoring/prometheus/init.yml +++ b/docker/swarm/stack/monitoring/prometheus/init.yml
@@ -38,7 +38,7 @@ PROMETHEUS_BIND_PORT: ${prometheus:server:bind:port} PROMETHEUS_BIND_ADDRESS: ${prometheus:server:bind:address} PROMETHEUS_STORAGE_LOCAL_RETENTION: ${prometheus:server:storage:local:retention} - PROMETHEUS_EXTERNAL_URL: "http://${_param:stacklight_monitor_address}:15010" + PROMETHEUS_EXTERNAL_URL: "https://${_param:stacklight_monitor_address}:15010" # Backward compatibility for Prometheus 1.7 PROMETHEUS_STORAGE_LOCAL_ENGINE: ${_param:prometheus_storage_local_engine} PROMETHEUS_STORAGE_LOCAL_TARGET_HEAP_SIZE: ${_param:prometheus_storage_heap_size}
diff --git a/nginx/server/proxy/monitoring/prometheus_alertmanager.yml b/nginx/server/proxy/monitoring/prometheus_alertmanager.yml index 2430104..ed7c675 100644 --- a/nginx/server/proxy/monitoring/prometheus_alertmanager.yml +++ b/nginx/server/proxy/monitoring/prometheus_alertmanager.yml
@@ -14,3 +14,5 @@ host: name: ${_param:cluster_public_host} port: 15011 + protocol: https + ssl: ${_param:nginx_proxy_ssl}
diff --git a/nginx/server/proxy/monitoring/prometheus_server.yml b/nginx/server/proxy/monitoring/prometheus_server.yml index 76ff56a..d9eb261 100644 --- a/nginx/server/proxy/monitoring/prometheus_server.yml +++ b/nginx/server/proxy/monitoring/prometheus_server.yml
@@ -14,3 +14,5 @@ host: name: ${_param:cluster_public_host} port: 15010 + protocol: https + ssl: ${_param:nginx_proxy_ssl}