openstack/kolla-ansible
Code Issues Proposed changes

Fix expose prometheus externally with single frontend

Browse Source 
Closes-Bug: #2043831
Change-Id: I010fabd255d93d5329de82af2b5d21c8fa7d93c4
This commit is contained in:
Will Szumski 2023-11-17 18:18:03 +00:00 committed by Michal Nasiadka
parent 48db509042
commit 2c9dc5da03
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -573,6 +573,7 @@ placement_api_public_port: "{{ haproxy_single_external_frontend_public_port if h
prometheus_external_fqdn: "{{ kolla_external_fqdn }}" prometheus_external_fqdn: "{{ kolla_external_fqdn }}"
prometheus_internal_fqdn: "{{ kolla_internal_fqdn }}" prometheus_internal_fqdn: "{{ kolla_internal_fqdn }}"
prometheus_port: "9091" prometheus_port: "9091"
prometheus_listen_port: "{{ prometheus_port }}"
prometheus_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else prometheus_port }}" prometheus_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else prometheus_port }}"
prometheus_node_exporter_port: "9100" prometheus_node_exporter_port: "9100"
prometheus_mysqld_exporter_port: "9104" prometheus_mysqld_exporter_port: "9104"

2
ansible/roles/prometheus/defaults/main.yml
View File

@ -18,7 +18,9 @@ prometheus_services:
enabled: "{{ enable_prometheus_server_external | bool }}" enabled: "{{ enable_prometheus_server_external | bool }}"
mode: "http" mode: "http"
external: true external: true
external_fqdn: "{{ prometheus_external_fqdn }}"
port: "{{ prometheus_public_port }}" port: "{{ prometheus_public_port }}"
listen_port: "{{ prometheus_listen_port }}"
active_passive: "{{ prometheus_active_passive | bool }}" active_passive: "{{ prometheus_active_passive | bool }}"
prometheus-node-exporter: prometheus-node-exporter:
container_name: prometheus_node_exporter container_name: prometheus_node_exporter

5
releasenotes/notes/fix-expose-prometheus-externally-with-single-frontend-45ca4e25c8948393.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes an issue when using ``enable_prometheus_server_external`` in
conjunction with ``haproxy_single_external_frontend``.