diff options
| author | Zuul <zuul@review.openstack.org> | 2018-05-25 15:25:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-05-25 15:25:16 +0000 |
| commit | cc67155fa4783c39b35d33e0e3db6267b09d3977 (patch) | |
| tree | 60503af86b42e26ae31d6d162cb6557299c79d18 | |
| parent | b2059dc8216e0aa2a9e85c74c80ba005ff9620be (diff) | |
| parent | 3dc83027172adb085d982235c262e9405d7e4d16 (diff) | |
| download | kolla-cc67155fa4783c39b35d33e0e3db6267b09d3977.tar.gz kolla-cc67155fa4783c39b35d33e0e3db6267b09d3977.zip | |
Merge "Add cAdvisor image for Prometheus monitoring."
| -rw-r--r-- | docker/prometheus/prometheus-cadvisor/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | releasenotes/notes/prometheus-cadvisor-05906b0894651a29.yaml | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 new file mode 100644 index 000000000..3ecc9e3f3 --- /dev/null +++ b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 @@ -0,0 +1,16 @@ +FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block prometheus_cadvisor_header %}{% endblock %} + +{% block prometheus_cadvisor_repository_version %} +ENV prometheus_cadvisor_version=0.27.4 +{% endblock %} + +{% block prometheus_cadvisor_install %} +RUN curl -ssL -o /opt/cadvisor https://github.com/google/cadvisor/releases/download/v${prometheus_cadvisor_version}/cadvisor \ + && chmod 755 /opt/cadvisor +{% endblock %} + +{% block prometheus_cadvisor_footer %}{% endblock %} +{% block footer %}{% endblock %} diff --git a/releasenotes/notes/prometheus-cadvisor-05906b0894651a29.yaml b/releasenotes/notes/prometheus-cadvisor-05906b0894651a29.yaml new file mode 100644 index 000000000..5cedfc3c1 --- /dev/null +++ b/releasenotes/notes/prometheus-cadvisor-05906b0894651a29.yaml @@ -0,0 +1,4 @@ +--- +features: + - Added a container image for cAdvisor, to be used with Prometheus + monitoring to gather resource utilization statistics of containers. |