openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix AlertManager's external web url"

Browse Source
This commit is contained in:
Zuul 2022-09-09 13:17:03 +00:00 committed by Gerrit Code Review
commit a396284a83
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,3 +321,5 @@ prometheus_memcached_exporter_cmdline_extras: ""
prometheus_mysqld_exporter_cmdline_extras: "" prometheus_mysqld_exporter_cmdline_extras: ""
prometheus_node_exporter_cmdline_extras: "" prometheus_node_exporter_cmdline_extras: ""
prometheus_openstack_exporter_cmdline_extras: "" prometheus_openstack_exporter_cmdline_extras: ""
prometheus_alertmanager_external_url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ prometheus_alertmanager_port }}"

2
ansible/roles/prometheus/templates/prometheus-alertmanager.json.j2
View File

@ -1,5 +1,5 @@
{ {
"command": "/opt/prometheus_alertmanager/alertmanager --config.file=/etc/prometheus/alertmanager.yml --web.listen-address={{ api_interface_address | put_address_in_context('url') }}:{{ prometheus_alertmanager_port }} --web.external-url={{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ prometheus_alertmanager_port }} --cluster.listen-address={% if groups["prometheus-alertmanager"] | length > 1 %}{{ api_interface_address | put_address_in_context('url') }}:{{ prometheus_alertmanager_cluster_port }} {% for host in groups["prometheus-alertmanager"] %} --cluster.peer={{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ hostvars[host]['prometheus_alertmanager_cluster_port'] }}{% endfor %}{% endif %} --storage.path /var/lib/prometheus", "command": "/opt/prometheus_alertmanager/alertmanager --config.file=/etc/prometheus/alertmanager.yml --web.listen-address={{ api_interface_address | put_address_in_context('url') }}:{{ prometheus_alertmanager_port }} --web.external-url={{ prometheus_alertmanager_external_url }} --cluster.listen-address={% if groups["prometheus-alertmanager"] | length > 1 %}{{ api_interface_address | put_address_in_context('url') }}:{{ prometheus_alertmanager_cluster_port }} {% for host in groups["prometheus-alertmanager"] %} --cluster.peer={{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ hostvars[host]['prometheus_alertmanager_cluster_port'] }}{% endfor %}{% endif %} --storage.path /var/lib/prometheus",
"config_files": [ "config_files": [
{ {
"source": "{{ container_config_directory }}/prometheus-alertmanager.yml", "source": "{{ container_config_directory }}/prometheus-alertmanager.yml",

6
releasenotes/notes/fix-hardcoded-alertmanager-weburl-9413b9e82a8610ea.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes an issue with AlertManager external Web URL being unconfigurable.
A new variable ``prometheus_alertmanager_external_url`` has been
introduced that users can use to set web.external-url to public.