Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions docker/prometheus/prometheus-jiralert/Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %}

{% import "macros.j2" as macros with context %}

{% block prometheus_jiralert_header %}{% endblock %}

{% if base_package_type == 'rpm' %}
{% set prometheus_jiralert_packages = [
'git',
'go',
'make',
] %}
{% elif base_package_type == 'deb' %}
{% set prometheus_jiralert_packages = [
'golang-go',
] %}
{% endif %}

{{ macros.install_packages(prometheus_jiralert_packages | customizable("packages")) }}

{% block prometheus_jiralert_version %}
ARG prometheus_jiralert_version=master
ARG prometheus_jiralert_url=https://github.com/stackhpc/jiralert/archive/refs/heads/${prometheus_jiralert_version}.tar.gz
{% endblock %}

{% block prometheus_jiralert_install %}
ENV GOPATH=/build
RUN mkdir /build \
&& cd /build \
&& curl -o jiralert.tar.gz ${prometheus_jiralert_url} \
&& tar xvf jiralert.tar.gz \
&& cd jiralert-${prometheus_jiralert_version} \
&& make build \
&& mkdir /opt/jiralert \
&& install -m 0755 jiralert /opt/jiralert/ \
&& install -m 0644 LICENSE /opt/jiralert/ \
&& install -m 0644 README.md /opt/jiralert/ \
&& rm -rf /build
{% endblock %}

{% block prometheus_jiralert_footer %}{% endblock %}
{% block footer %}{% endblock %}

USER prometheus
21 changes: 21 additions & 0 deletions docker/prometheus/prometheus-msteams/Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM {{ namespace }}/{{ infra_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_repository_version %}
ENV prometheus_msteams_version=1.5.0
{% endblock %}

{% block prometheus_msteams_install %}
RUN curl -o /opt/prometheus-msteams https://github.com/prometheus-msteams/prometheus-msteams/releases/download/v${prometheus_msteams_version}/prometheus-msteams-linux-{{debian_arch}} \
&& chmod 0755 /opt/prometheus-msteams \
&& mkdir -p /etc/msteams
{% endblock %}

{% block prometheus_msteams_footer %}{% endblock %}
{% block footer %}{% endblock %}

USER prometheus
37 changes: 30 additions & 7 deletions docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,40 @@ FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %}

{% import "macros.j2" as macros with context %}

{% block prometheus_openstack_exporter_header %}{% endblock %}

{% block prometheus_openstack_exporter_repository_version %}
ENV prometheus_openstack_exporter_version=1.3.0
{% 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_install %}
RUN curl -o /tmp/prometheus_openstack_exporter.tar.gz 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 \
&& tar xvf /tmp/prometheus_openstack_exporter.tar.gz -C /opt/ \
&& rm -f /tmp/prometheus_openstack_exporter.tar.gz \
&& ln -s /opt/openstack-exporter* /opt/openstack-exporter
ARG prometheus_openstack_exporter_url=https://github.com/stackhpc/openstack-exporter/archive/refs/heads
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ARG prometheus_openstack_exporter_url=https://github.com/stackhpc/openstack-exporter/archive/refs/heads
ARG prometheus_openstack_exporter_url=https://github.com/openstack-exporter/openstack-exporter/archive/refs/heads

Maybe default to this instead?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It probably makes sense to do everything either in config or code. It might be possible to get all of these changes into a block override, but probably not worth it. i.e. stay with this approach until the patch is merged.

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 \
&& mkdir /opt/openstack-exporter \
&& install -m 0755 openstack-exporter /opt/openstack-exporter/ \
&& rm -rf /build
{% endblock %}

{% block prometheus_openstack_exporter_footer %}{% endblock %}
Expand Down