diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 009b5881e2..06add8995d 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -1066,9 +1066,11 @@ enable_prometheus_ceph_mgr_exporter: "{{ enable_ceph | bool and enable_prometheu enable_prometheus_openstack_exporter: "{{ enable_prometheus | bool }}" enable_prometheus_elasticsearch_exporter: "{{ enable_prometheus | bool and enable_elasticsearch | bool }}" enable_prometheus_blackbox_exporter: "{{ enable_prometheus | bool }}" + prometheus_alertmanager_user: "admin" prometheus_openstack_exporter_interval: "60s" prometheus_elasticsearch_exporter_interval: "60s" +prometheus_cmdline_extras: ############ # Vitrage diff --git a/ansible/roles/prometheus/templates/prometheus-server.json.j2 b/ansible/roles/prometheus/templates/prometheus-server.json.j2 index 990185c7d5..3849cf9611 100644 --- a/ansible/roles/prometheus/templates/prometheus-server.json.j2 +++ b/ansible/roles/prometheus/templates/prometheus-server.json.j2 @@ -1,5 +1,5 @@ { - "command": "/opt/prometheus/prometheus -config.file /etc/prometheus/prometheus.yml -web.listen-address {{ api_interface_address }}:{{ prometheus_port }} -web.external-url={{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ prometheus_port }} -log.format logger:stdout -storage.local.path /var/lib/prometheus", + "command": "/opt/prometheus/prometheus -config.file /etc/prometheus/prometheus.yml -web.listen-address {{ api_interface_address }}:{{ prometheus_port }} -web.external-url={{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ prometheus_port }} -log.format logger:stdout -storage.local.path /var/lib/prometheus{% if prometheus_cmdline_extras %} {{ prometheus_cmdline_extras }}{% endif %}", "config_files": [ { "source": "{{ container_config_directory }}/prometheus.yml", diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index f35b6f76f4..07c68061b6 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -598,6 +598,9 @@ #enable_prometheus_elasticsearch_exporter: "{{ enable_prometheus | bool and enable_elasticsearch | bool }}" #enable_prometheus_blackbox_exporter: "{{ enable_prometheus | bool }}" +# List of extra parameters passed to prometheus. You can add as many to the list. +#prometheus_cmdline_extras: + ######### # Freezer ######### diff --git a/releasenotes/notes/prometheus-cmdline-extras-2e680c8697c1a308.yaml b/releasenotes/notes/prometheus-cmdline-extras-2e680c8697c1a308.yaml new file mode 100644 index 0000000000..51819d8121 --- /dev/null +++ b/releasenotes/notes/prometheus-cmdline-extras-2e680c8697c1a308.yaml @@ -0,0 +1,3 @@ +--- +features: + - Adds support for passing extra options to Prometheus.