summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYanis Guenane <yguenane@redhat.com>2018-05-24 09:17:50 +0200
committerYanis Guenane <yguenane@redhat.com>2018-05-24 09:38:06 +0200
commit55ebd744c56d3fc94b20e904b385bbd0a79919e1 (patch)
tree9bd1de5bbda06e0eaed959cfc0ef08db1fd965ae
parentdd5eb776b8d4c189c472e386bcf4fef10e617646 (diff)
alertmanager: Fix vhost configuration
Change-Id: I766fd0510cbbdc8d4a16019587652a5b4d4c0234
-rw-r--r--roles/dci-grafana/templates/00_graphana-server.conf1
-rw-r--r--roles/dci-prometheus-alertmanager/templates/00_prometheus-alertmanager.conf3
-rw-r--r--roles/dci-prometheus-server/templates/01_prometheus-blackbox.conf2
3 files changed, 4 insertions, 2 deletions
diff --git a/roles/dci-grafana/templates/00_graphana-server.conf b/roles/dci-grafana/templates/00_graphana-server.conf
index 6f982c4..0692e07 100644
--- a/roles/dci-grafana/templates/00_graphana-server.conf
+++ b/roles/dci-grafana/templates/00_graphana-server.conf
@@ -1,5 +1,6 @@
<VirtualHost *:80>
ServerName dashboards.distributed-ci.io
+ ServerAlias monitoring.distributed-ci.io
ServerAdmin distributed-ci@redhat.com
ProxyPass / http://127.0.0.1:3000/
diff --git a/roles/dci-prometheus-alertmanager/templates/00_prometheus-alertmanager.conf b/roles/dci-prometheus-alertmanager/templates/00_prometheus-alertmanager.conf
index ee6d6ca..049de13 100644
--- a/roles/dci-prometheus-alertmanager/templates/00_prometheus-alertmanager.conf
+++ b/roles/dci-prometheus-alertmanager/templates/00_prometheus-alertmanager.conf
@@ -1,5 +1,6 @@
<VirtualHost *:80>
- ServerName alertmanager.beta.distributed-ci.io
+ ServerName alerts.distributed-ci.io
+ ServerAlias alertmanager.distributed-ci.io
ServerAdmin distributed-ci@redhat.com
ProxyPass / http://127.0.0.1:9093/
diff --git a/roles/dci-prometheus-server/templates/01_prometheus-blackbox.conf b/roles/dci-prometheus-server/templates/01_prometheus-blackbox.conf
index 78fa17e..5f2a5d2 100644
--- a/roles/dci-prometheus-server/templates/01_prometheus-blackbox.conf
+++ b/roles/dci-prometheus-server/templates/01_prometheus-blackbox.conf
@@ -1,5 +1,5 @@
<VirtualHost *:80>
- ServerName blackbox.monitoring.beta.distributed-ci.io
+ ServerName blackbox.distributed-ci.io
ServerAdmin distributed-ci@redhat.com
ProxyPass / http://127.0.0.1:9115/