ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 b96c6da832)
pull/4503/head
Boris Ranto 2019-09-27 15:45:58 +02:00 committed by Guillaume Abrioux
parent 7c0a20e456
commit af9f93f07f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all.yml.sample
View File

@ -757,7 +757,7 @@ dummy:
#prometheus_data_dir: /var/lib/prometheus #prometheus_data_dir: /var/lib/prometheus
#prometheus_conf_dir: /etc/prometheus #prometheus_conf_dir: /etc/prometheus
#prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image #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_image: prom/alertmanager:latest
#alertmanager_container_cpu_period: 100000 #alertmanager_container_cpu_period: 100000
#alertmanager_container_cpu_cores: 2 #alertmanager_container_cpu_cores: 2

2
group_vars/rhcs.yml.sample
View File

@ -757,7 +757,7 @@ prometheus_container_image: registry.redhat.io/openshift4/ose-prometheus:4.1
#prometheus_data_dir: /var/lib/prometheus #prometheus_data_dir: /var/lib/prometheus
#prometheus_conf_dir: /etc/prometheus #prometheus_conf_dir: /etc/prometheus
#prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image #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_image: registry.redhat.io/openshift4/ose-prometheus-alertmanager:4.1
#alertmanager_container_cpu_period: 100000 #alertmanager_container_cpu_period: 100000
#alertmanager_container_cpu_cores: 2 #alertmanager_container_cpu_cores: 2

2
roles/ceph-defaults/defaults/main.yml
View File

@ -749,7 +749,7 @@ prometheus_container_memory: 4
prometheus_data_dir: /var/lib/prometheus prometheus_data_dir: /var/lib/prometheus
prometheus_conf_dir: /etc/prometheus prometheus_conf_dir: /etc/prometheus
prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image 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_image: prom/alertmanager:latest
alertmanager_container_cpu_period: 100000 alertmanager_container_cpu_period: 100000
alertmanager_container_cpu_cores: 2 alertmanager_container_cpu_cores: 2