commit 93aa5e0709f8dcef7dec1b89b9667babb5cd404a
author Ondrej Smola <osmola@mirantis.com> Tue May 29 08:37:57 2018 +0000
committer Gerrit Code Review <gerrit2@15508502dd39> Tue May 29 08:37:57 2018 +0000
tree 17105f4a2cc4ff4f74235ac4506b8f028f8f86b5
parent 616ee5ca8a54d9b37d7542e1d51b790e750bba3b
parent f7a526087195ebbe2b24363afa9e03eacf6cbbcc

Merge "Add HTTPS proxy for Prometheus and Alertmanager"

docker/swarm/stack/monitoring/alertmanager.yml

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:

docker/swarm/stack/monitoring/prometheus/init.yml

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}

nginx/server/proxy/monitoring/prometheus_alertmanager.yml

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}

nginx/server/proxy/monitoring/prometheus_server.yml

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}