Merge "Allow exposing OpenStack exporter via HAProxy"

ansible/group_vars/all.yml

@@ -1131,6 +1131,7 @@ enable_prometheus_alertmanager: "{{ enable_prometheus | bool }}"
 enable_prometheus_alertmanager_external: "{{ enable_prometheus_alertmanager | bool }}"
 enable_prometheus_ceph_mgr_exporter: "no"
 enable_prometheus_openstack_exporter: "{{ enable_prometheus | bool }}"
+enable_prometheus_openstack_exporter_external: "no"
 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 }}"

ansible/roles/prometheus/defaults/main.yml

@@ -89,6 +89,11 @@ prometheus_services:
         mode: "http"
         external: false
         port: "{{ prometheus_openstack_exporter_port }}"
+      prometheus_openstack_exporter_external:
+        enabled: "{{ enable_prometheus_openstack_exporter_external | bool }}"
+        mode: "http"
+        external: true
+        port: "{{ prometheus_openstack_exporter_port }}"
   prometheus-elasticsearch-exporter:
     container_name: prometheus_elasticsearch_exporter
     group: prometheus-elasticsearch-exporter

releasenotes/notes/adds-new-prometheus-openstack-exporter-option-03920e7308c0b6e5.yaml

@@ -0,0 +1,11 @@
+---
+features:
+  - |
+    Adds a new, disabled by default, option for Prometheus
+    OpenStack exporter, named
+    "enable_prometheus_openstack_exporter_external".
+    This option allows exposing OpenStack exporter through
+    HAProxy, and may be used to expose OpenStack metrics
+    to an existing Prometheus server outside the OpenStack
+    cloud, instead of using the default one provided by
+    OpenStack.