diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index d99c0a4d6f..55668a96e8 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -727,6 +727,7 @@ dummy: #alertmanager_port: 9093 #alertmanager_cluster_port: 9094 #alertmanager_conf_overrides: {} +#alertmanager_dashboard_api_no_ssl_verify: "{{ true if dashboard_protocol == 'https' and not dashboard_crt and not dashboard_key else false }}" # igw # # `igw_network` variable is intended for allowing dashboard deployment with iSCSI node not residing in the same subnet than what is defined in `public_network`. diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 787bdb29da..075fc2d150 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -727,6 +727,7 @@ alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alert #alertmanager_port: 9093 #alertmanager_cluster_port: 9094 #alertmanager_conf_overrides: {} +#alertmanager_dashboard_api_no_ssl_verify: "{{ true if dashboard_protocol == 'https' and not dashboard_crt and not dashboard_key else false }}" # igw # # `igw_network` variable is intended for allowing dashboard deployment with iSCSI node not residing in the same subnet than what is defined in `public_network`. diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index d957e7873b..f7fa59b14c 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -719,6 +719,7 @@ alertmanager_conf_dir: /etc/alertmanager alertmanager_port: 9093 alertmanager_cluster_port: 9094 alertmanager_conf_overrides: {} +alertmanager_dashboard_api_no_ssl_verify: "{{ true if dashboard_protocol == 'https' and not dashboard_crt and not dashboard_key else false }}" # igw # # `igw_network` variable is intended for allowing dashboard deployment with iSCSI node not residing in the same subnet than what is defined in `public_network`. diff --git a/roles/ceph-prometheus/templates/alertmanager.yml.j2 b/roles/ceph-prometheus/templates/alertmanager.yml.j2 index 2ca58f417e..63dfbf7014 100644 --- a/roles/ceph-prometheus/templates/alertmanager.yml.j2 +++ b/roles/ceph-prometheus/templates/alertmanager.yml.j2 @@ -12,4 +12,9 @@ receivers: webhook_configs: {% for host in groups['mgrs'] | default(groups['mons']) %} - url: '{{ dashboard_protocol }}://{{ hostvars[host]['ansible_facts']['fqdn'] }}:{{ dashboard_port }}/api/prometheus_receiver' +{% if dashboard_protocol == 'https' and alertmanager_dashboard_api_no_ssl_verify | bool %} + http_config: + tls_config: + insecure_skip_verify: true +{% endif %} {% endfor %}