diff options
| author | Zuul <zuul@review.opendev.org> | 2024-09-02 20:56:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-09-02 20:56:03 +0000 |
| commit | 57dd38f365fd7dcd48aab66c219f562a8a1cafc6 (patch) | |
| tree | 297c854031a21d70534371f90e234e92fdea3504 | |
| parent | 779a9a33f4c1f26b81b8e3e9c00b73318435b1fd (diff) | |
| parent | a2c07b3c2bdfe16e4f2ebe52616b08189f6b5af7 (diff) | |
| download | kolla-57dd38f365fd7dcd48aab66c219f562a8a1cafc6.tar.gz kolla-57dd38f365fd7dcd48aab66c219f562a8a1cafc6.zip | |
Merge "Drop prometheus-msteams container images"
| -rw-r--r-- | docker/prometheus/prometheus-msteams/Dockerfile.j2 | 19 | ||||
| -rw-r--r-- | kolla/common/sources.py | 10 | ||||
| -rw-r--r-- | kolla/image/unbuildable.py | 1 | ||||
| -rw-r--r-- | releasenotes/notes/drop-prometheus-msteams-1ead141af684ada1.yaml | 8 |
4 files changed, 8 insertions, 30 deletions
diff --git a/docker/prometheus/prometheus-msteams/Dockerfile.j2 b/docker/prometheus/prometheus-msteams/Dockerfile.j2 deleted file mode 100644 index e05eb20b6..000000000 --- a/docker/prometheus/prometheus-msteams/Dockerfile.j2 +++ /dev/null @@ -1,19 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block prometheus_msteams_header %}{% endblock %} - -{% block prometheus_msteams_install %} -ADD prometheus-msteams-archive /prometheus-msteams-source - -RUN cp /prometheus-msteams-source /opt/prometheus-msteams \ - && chmod 0755 /opt/prometheus-msteams \ - && mkdir -p /etc/msteams -{% endblock %} - -{% block prometheus_msteams_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER prometheus diff --git a/kolla/common/sources.py b/kolla/common/sources.py index 5ba79d5a3..354b424d5 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -335,16 +335,6 @@ SOURCES = { 'releases/download/v${version}/' 'memcached_exporter' '-${version}.linux-${debian_arch}.tar.gz')}, - 'prometheus-msteams': { - 'version': '1.5.2', - 'type': 'url', - 'sha256': { - 'amd64': '0f4df9ee31e655d1ec876ea2c53ab5ae5b07143ef21b9190e61b4d52839e135c'}, # noqa: E501 - 'location': ('https://github.com/' - 'prometheus-msteams/prometheus-msteams/' - 'releases/download/v${version}/' - 'prometheus-msteams' - '-linux-${debian_arch}')}, 'prometheus-mtail': { 'version': '3.0.0-rc54', 'type': 'url', diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py index 8a6eb5250..826316c26 100644 --- a/kolla/image/unbuildable.py +++ b/kolla/image/unbuildable.py @@ -17,7 +17,6 @@ UNBUILDABLE_IMAGES = { 'aarch64': { "bifrost-base", # someone need to get upstream working first - "prometheus-msteams", # no aarch64 binary "prometheus-mtail", # no aarch64 binary }, diff --git a/releasenotes/notes/drop-prometheus-msteams-1ead141af684ada1.yaml b/releasenotes/notes/drop-prometheus-msteams-1ead141af684ada1.yaml new file mode 100644 index 000000000..1608a7230 --- /dev/null +++ b/releasenotes/notes/drop-prometheus-msteams-1ead141af684ada1.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + The ``prometheus-msteams`` container images have been removed as the + project is no longer maintained. Users should migrate to the `native + Prometheus Alertmanager integration with Microsoft Teams + <https://prometheus.io/docs/alerting/latest/configuration/#msteams_config>`__ + for continued support and features. |