diff options
| author | Zuul <zuul@review.opendev.org> | 2025-06-23 11:00:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-06-23 11:00:38 +0000 |
| commit | c840d4dc629c6119cbc2e99ac06b29f6762191a4 (patch) | |
| tree | 1e504ce8653fb4d211f912067962791d74759d7f | |
| parent | 1d2decfa42fbb888cae8140c713d8719dac1a03b (diff) | |
| parent | 0aaefd2dfeabb18a722fce4002d825671a012671 (diff) | |
| download | kolla-c840d4dc629c6119cbc2e99ac06b29f6762191a4.tar.gz kolla-c840d4dc629c6119cbc2e99ac06b29f6762191a4.zip | |
Merge "Remove the OVN exporter for Prometheus"
| -rw-r--r-- | docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2 | 22 | ||||
| -rw-r--r-- | kolla/common/sources.py | 11 | ||||
| -rw-r--r-- | releasenotes/notes/remove-prometheus-ovn-exporter-c5f5005b4d1a4b12.yaml | 5 |
3 files changed, 5 insertions, 33 deletions
diff --git a/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2 deleted file mode 100644 index f7c9c6041..000000000 --- a/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2 +++ /dev/null @@ -1,22 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block prometheus_ovn_exporter_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% block prometheus_ovn_exporter_install %} - -ADD prometheus-ovn-exporter-archive /prometheus-ovn-exporter-source - -RUN cp /prometheus-ovn-exporter-source/* /opt/ -{% endblock %} - -{{ macros.kolla_patch_sources() }} - -{% block prometheus_ovn_exporter_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER prometheus diff --git a/kolla/common/sources.py b/kolla/common/sources.py index e05146747..7a82fd1e9 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -383,17 +383,6 @@ SOURCES = { 'releases/download/v${version}/' 'openstack-exporter' '_${version}_linux_${debian_arch}.tar.gz')}, - 'prometheus-ovn-exporter': { - 'version': '1.0.7', - 'type': 'url', - 'sha256': { - 'amd64': '38d9874ddca1581574a7fa0a28ea53447a57dada37bb1385adeb766e6e819de0', # noqa: E501 - 'arm64': 'e03f6a5ab4cf2855a498697026981273ce3c9ff16bd9bb6c97fd7f1344ec2067'}, # noqa: E501 - 'location': ('https://github.com/' - 'greenpau/ovn_exporter/' - 'releases/download/v${version}/' - 'ovn-exporter' - '_${version}_linux_${debian_arch}.tar.gz')}, 'prometheus-server': { 'version': '3.2.1', 'type': 'url', diff --git a/releasenotes/notes/remove-prometheus-ovn-exporter-c5f5005b4d1a4b12.yaml b/releasenotes/notes/remove-prometheus-ovn-exporter-c5f5005b4d1a4b12.yaml new file mode 100644 index 000000000..6bac39901 --- /dev/null +++ b/releasenotes/notes/remove-prometheus-ovn-exporter-c5f5005b4d1a4b12.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The OVN exporter has been removed with immediate effect since 1) it isn't + used in Kolla Ansible and 2) the source repo was archived in Dec 2024. |