Merge pull request #145 from stackhpc/upstream/wallaby-2022-07-04

Synchronise wallaby with upstream

Author: priteau

docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2

@@ -7,36 +7,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block prometheus_openstack_exporter_header %}{% endblock %}
 
-{% if base_package_type == 'rpm' %}
-    {% set prometheus_openstack_exporter_packages = [
-        'git',
-        'go',
-        'make',
-    ] %}
-{% elif base_package_type == 'deb' %}
-    {% set prometheus_openstack_exporter_packages = [
-        'build-essential',
-        'git',
-        'golang-go',
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(prometheus_openstack_exporter_packages | customizable("packages")) }}
+{% block prometheus_openstack_exporter_repository_version %}
+ARG prometheus_openstack_exporter_version=1.6.0
+ARG prometheus_openstack_exporter_url=https://github.com/openstack-exporter/openstack-exporter/releases/download/v${prometheus_openstack_exporter_version}/openstack-exporter_${prometheus_openstack_exporter_version}_linux_{{debian_arch}}.tar.gz
+{% endblock %}
 
 {% block prometheus_openstack_exporter_install %}
-ARG prometheus_openstack_exporter_url=https://github.com/stackhpc/openstack-exporter/archive/refs/heads
-ARG prometheus_openstack_exporter_version=project-parent-id
-ENV GOPATH=/build
-RUN mkdir /build \
-    && cd /build \
-    && curl -o openstack-exporter.tar.gz ${prometheus_openstack_exporter_url}/${prometheus_openstack_exporter_version}.tar.gz  \
-    && tar xvf openstack-exporter.tar.gz \
-    && cd openstack-exporter-${prometheus_openstack_exporter_version} \
-    && make common-build \
-    && mv openstack-exporter-${prometheus_openstack_exporter_version} openstack-exporter \
+RUN curl -o /tmp/prometheus_openstack_exporter.tar.gz ${prometheus_openstack_exporter_url} \
     && mkdir /opt/openstack-exporter \
-    && install -m 0755 openstack-exporter /opt/openstack-exporter/ \
-    && rm -rf /build
+    && tar xvf /tmp/prometheus_openstack_exporter.tar.gz -C /opt/openstack-exporter \
+    && rm -f /tmp/prometheus_openstack_exporter.tar.gz
 {% endblock %}
 
 {% block prometheus_openstack_exporter_footer %}{% endblock %}

releasenotes/notes/openstack-exporter-1.6.0-cb2c1a978cf4be64.yaml

@@ -0,0 +1,11 @@
+---
+features:
+  - |
+    Updates the OpenStack exporter for Prometheus to `version 1.6.0
+    <https://github.com/openstack-exporter/openstack-exporter/releases/tag/v1.6.0>`__.
+upgrade:
+  - |
+    The updated OpenStack exporter for Prometheus uses the latest Nova API
+    microversion by default, resulting in changes to existing metrics. To keep
+    existing behaviour, set
+    ``prometheus_openstack_exporter_compute_api_version`` to ``2.1``.