ceph-defaults: Change the default prometheus port

The old default prometheus port 9090 clashes with cockpit in rhel 8. The
9090 port is reserved for web service administration of machines. We
should change the default to something that does not clash with other
ports used in rhel 8, at least by default. The port 9092 seems like a
good choice in my testing.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit b96c6da83239a585d3e51301cd81112779c99928)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index d5cc3453613a1c621dc87807a56cc045072b43a7..c856e66501e050adee09f4db3ed0db70a2638be8 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -757,7 +757,7 @@ dummy:
 #prometheus_data_dir: /var/lib/prometheus
 #prometheus_conf_dir: /etc/prometheus
 #prometheus_user_id: '65534'  # This is the UID used by the prom/prometheus container image
-#prometheus_port: 9090
+#prometheus_port: 9092
 #alertmanager_container_image: prom/alertmanager:latest
 #alertmanager_container_cpu_period: 100000
 #alertmanager_container_cpu_cores: 2

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 3295bf39dba7f129991a681c664c82b0b355a5c1..b2e046b2b3e7b5c4082289d89332f3f9bfaaaf15 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -757,7 +757,7 @@ prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:4.1
 #prometheus_data_dir: /var/lib/prometheus
 #prometheus_conf_dir: /etc/prometheus
 #prometheus_user_id: '65534'  # This is the UID used by the prom/prometheus container image
-#prometheus_port: 9090
+#prometheus_port: 9092
 alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:4.1
 #alertmanager_container_cpu_period: 100000
 #alertmanager_container_cpu_cores: 2

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 6213176861b87df1b249375ce176c08a669b965d..3b452ff513284a32df351607c2083979f1b9d346 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -749,7 +749,7 @@ prometheus_container_memory: 4
 prometheus_data_dir: /var/lib/prometheus
 prometheus_conf_dir: /etc/prometheus
 prometheus_user_id: '65534'  # This is the UID used by the prom/prometheus container image
-prometheus_port: 9090
+prometheus_port: 9092
 alertmanager_container_image: prom/alertmanager:latest
 alertmanager_container_cpu_period: 100000
 alertmanager_container_cpu_cores: 2