summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Szumski <doug@stackhpc.com>2018-07-26 12:05:40 +0100
committerDoug Szumski <doug@stackhpc.com>2018-07-27 15:46:38 +0100
commite4e8ca3e1d0656e2a07f6f718a92c03a54f6a9ee (patch)
treede5431cba24b8eba6f49ee55c229c649a1bcb957
parentd7cd35ff9a521b31cb2f6f381cbe6cd78e354549 (diff)
Add Monasca Agent container
The Monasca Agent consists of 3 processes. The collector, which collects system level metrics from a host, a statsd server, which is used to receive application specific statsd metrics and a forwarder service which batches metrics and sends them to the Monasca API at pre-defined time intervals. Partially-Implements: blueprint monasca-containers Change-Id: Ia446ca0a6b932c2429d727b63e363b4e27307304
Notes
Notes (review): Code-Review+2: Mark Goddard <mark@stackhpc.com> Code-Review+2: Surya Prakash (spsurya) <singh.surya64mnnit@gmail.com> Workflow+1: Surya Prakash (spsurya) <singh.surya64mnnit@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sat, 28 Jul 2018 07:23:20 +0000 Reviewed-on: https://review.openstack.org/586587 Project: openstack/kolla Branch: refs/heads/master
-rw-r--r--docker/monasca/monasca-agent/Dockerfile.j231
-rwxr-xr-xkolla/common/config.py4
2 files changed, 35 insertions, 0 deletions
diff --git a/docker/monasca/monasca-agent/Dockerfile.j2 b/docker/monasca/monasca-agent/Dockerfile.j2
new file mode 100644
index 0000000..096e22c
--- /dev/null
+++ b/docker/monasca/monasca-agent/Dockerfile.j2
@@ -0,0 +1,31 @@
1FROM {{ namespace }}/{{ image_prefix }}monasca-base:{{ tag }}
2LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
3
4{% block monasca_agent_header %}{% endblock %}
5
6{% import "macros.j2" as macros with context %}
7
8{% if install_type == 'binary' %}
9
10RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
11 && /bin/false
12
13{% elif install_type == 'source' %}
14
15ADD monasca-agent-archive /monasca-agent-source
16
17{% set monasca_agent_pip_packages = [
18 '/monasca-agent'
19] %}
20
21RUN ln -s monasca-agent-source/* monasca-agent \
22 && {{ macros.install_pip(monasca_agent_pip_packages | customizable("pip_packages")) }}
23
24{% endif %}
25
26{% block monasca_agent_footer %}{% endblock %}
27
28{% block footer %}{% endblock %}
29
30USER monasca
31
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 5ac5df8..7b7ae9d 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -506,6 +506,10 @@ SOURCES = {
506 'type': 'url', 506 'type': 'url',
507 'location': ('$tarballs_base/tacker/' 507 'location': ('$tarballs_base/tacker/'
508 'tacker-master.tar.gz')}, 508 'tacker-master.tar.gz')},
509 'monasca-agent': {
510 'type': 'url',
511 'location': ('$tarballs_base/monasca-agent/'
512 'monasca-agent-master.tar.gz')},
509 'monasca-api': { 513 'monasca-api': {
510 'type': 'url', 514 'type': 'url',
511 'location': ('$tarballs_base/monasca-api/' 515 'location': ('$tarballs_base/monasca-api/'