Merge "prometheus: Collect metrics from rabbitmq" into stable/victoria

Author: Zuul

ansible/group_vars/all.yml

@@ -433,6 +433,7 @@ prometheus_node_exporter_port: "9100"
 prometheus_mysqld_exporter_port: "9104"
 prometheus_haproxy_exporter_port: "9101"
 prometheus_memcached_exporter_port: "9150"
+prometheus_rabbitmq_exporter_port: "15692"
 # Default cadvisor port of 8080 already in use
 prometheus_cadvisor_port: "18080"
 
@@ -1092,6 +1093,7 @@ enable_prometheus_ceph_mgr_exporter: "no"
 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 }}"
+enable_prometheus_rabbitmq_exporter: "{{ enable_prometheus | bool and enable_rabbitmq | bool }}"
 
 prometheus_alertmanager_user: "admin"
 prometheus_openstack_exporter_interval: "60s"

ansible/roles/prometheus/templates/prometheus.yml.j2

@@ -47,6 +47,15 @@ scrape_configs:
 {% endfor %}
 {% endif %}
 
+{% if enable_prometheus_rabbitmq_exporter | bool %}
+  - job_name: rabbitmq
+    static_configs:
+      - targets:
+{% for host in groups['rabbitmq'] %}
+        - '{{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ hostvars[host]['prometheus_rabbitmq_exporter_port'] }}'
+{% endfor %}
+{% endif %}
+
 {% if enable_prometheus_memcached_exporter | bool %}
   - job_name: memcached
     static_configs:

releasenotes/notes/prometheus-rabbitmq-f7d6ebf0d611a819.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Adds support for collecting Prometheus metrics from RabbitMQ. This is
+    enabled by default when Prometheus and RabbitMQ are enabled, and may be
+    disabled by setting ``enable_prometheus_rabbitmq_exporter`` to ``false``.