From af9f93f07fd5c97325e7f59aa26215672b88c85a Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Fri, 27 Sep 2019 15:45:58 +0200 Subject: [PATCH] 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 (cherry picked from commit b96c6da83239a585d3e51301cd81112779c99928) --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 2 +- roles/ceph-defaults/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index d5cc34536..c856e6650 100644 --- 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 3295bf39d..b2e046b2b 100644 --- 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 621317686..3b452ff51 100644 --- 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 -- 2.39.5