From 3dc83027172adb085d982235c262e9405d7e4d16 Mon Sep 17 00:00:00 2001
From: Mark Giles <mark.giles@oracle.com>
Date: Wed, 23 May 2018 12:29:03 -0400
Subject: [PATCH] Add cAdvisor image for Prometheus monitoring.

cAdvisor is a performance monitoring tool for containers which can be used
in conjunction with Prometheus.

Change-Id: Ib329fa30e8ab1c969b3b21bcbccf26bd562b9b83
---
 .../prometheus/prometheus-cadvisor/Dockerfile.j2 | 16 ++++++++++++++++
 .../prometheus-cadvisor-05906b0894651a29.yaml    |  4 ++++
 2 files changed, 20 insertions(+)
 create mode 100644 docker/prometheus/prometheus-cadvisor/Dockerfile.j2
 create mode 100644 releasenotes/notes/prometheus-cadvisor-05906b0894651a29.yaml

diff --git a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2
new file mode 100644
index 0000000000..3ecc9e3f35
--- /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 0000000000..5cedfc3c14
--- /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.