From 4220004dbe642ea67a78f276ed47ccefc9623244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Mon, 7 Aug 2017 08:15:59 +0200 Subject: [PATCH 01/21] Rewrite monasca-agent to use monasca/python Use monasca/python for monasca-agent --- monasca-agent-base/Dockerfile | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/monasca-agent-base/Dockerfile b/monasca-agent-base/Dockerfile index 952a9de70..e43126ab4 100644 --- a/monasca-agent-base/Dockerfile +++ b/monasca-agent-base/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM monasca/python:2 ARG AGENT_REPO=https://git.openstack.org/openstack/monasca-agent ARG AGENT_BRANCH="master" @@ -20,23 +20,9 @@ ENV CONFIG_TEMPLATE=true \ LOG_LEVEL=WARN \ HOSTNAME_FROM_KUBERNETES=false -RUN apk add --no-cache \ - python py2-pip py2-jinja2 libxml2 py2-psutil && \ - apk add --no-cache --virtual build-dep \ - git python-dev make g++ linux-headers libxml2-dev libxslt-dev && \ - mkdir /monasca-agent && cd /monasca-agent && \ - git init && \ - git remote add origin $AGENT_REPO && \ - git fetch origin $AGENT_BRANCH && \ - git reset --hard FETCH_HEAD && \ - pip install docker-py prometheus_client && \ - cd /monasca-agent && \ - pip install -r requirements.txt -c "$UPPER_CONSTRAINTS" && \ - python setup.py install && \ - cd / && \ - rm -rf /monasca-agent && \ - rm -rf /root/.cache/pip && \ - apk del build-dep +RUN apk add --no-cache libxml2 py2-psutil && \ + apk add --no-cache --virtual libxml2-dev libxslt-dev && \ + /build.sh -r ${AGENT_REPO} -b ${AGENT_BRANCH} -c ${UPPER_CONSTRAINTS} -d "prometheus_client" COPY agent.yaml.j2 /etc/monasca/agent/agent.yaml.j2 COPY template.py kubernetes_get_host.py / From be004d1a7dcbaf8a5b880b2e2c682165dc02ed21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Mon, 7 Aug 2017 08:31:33 +0200 Subject: [PATCH 02/21] Use monasca/python for monasca-api --- monasca-api-python/Dockerfile | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/monasca-api-python/Dockerfile b/monasca-api-python/Dockerfile index ada7cbe36..6b51c24c6 100644 --- a/monasca-api-python/Dockerfile +++ b/monasca-api-python/Dockerfile @@ -1,7 +1,8 @@ -FROM alpine:3.5 +FROM monasca/python:2 ARG API_REPO=https://github.com/openstack/monasca-api.git ARG API_BRANCH=master +ARG API_CONSTRAINTS_BRANCH=${API_CONSTRAINTS_BRANCH:-$API_BRANCH} # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` @@ -34,20 +35,10 @@ ENV CONFIG_TEMPLATE=true \ ACCESS_LOG_FORMAT="%(asctime)s [%(process)d] gunicorn.access [%(levelname)s] %(message)s" \ ACCESS_LOG_FIELDS='%(h)s %(l)s %(u)s %(t)s %(r)s %(s)s %(b)s "%(f)s" "%(a)s" %(L)s' -RUN apk add --no-cache python py2-pip py2-jinja2 curl mysql-client && \ - apk add --no-cache --virtual build-dep \ - python-dev git make g++ linux-headers && \ - mkdir /monasca-api && cd /monasca-api && \ - git init && \ - git remote add origin $API_REPO && \ - git fetch origin $API_BRANCH && \ - git reset --hard FETCH_HEAD && \ - pip install --no-cache-dir gunicorn influxdb \ - python-memcached -r requirements.txt && \ - python setup.py install && \ - cd / && \ - rm -rf /monasca-api && \ - apk del build-dep + +RUN apk add --no-cache mysql-client && \ + /build.sh -r ${API_REPO} -b ${API_BRANCH} \ + -q ${API_CONSTRAINTS_BRANCH} -d "gunicorn influxdb python-memcached" COPY api-* /etc/monasca/ COPY template.py start.sh health-check.sh kafka_wait_for_topics.py / From 11d7298359a62fd53655a19e5a8cacd2b8a45827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Mon, 7 Aug 2017 09:26:33 +0200 Subject: [PATCH 03/21] Make monascaclient use monasca/python --- monasca-client/Dockerfile | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/monasca-client/Dockerfile b/monasca-client/Dockerfile index e72f67321..904513b66 100644 --- a/monasca-client/Dockerfile +++ b/monasca-client/Dockerfile @@ -1,28 +1,16 @@ -FROM alpine:3.5 +ARG PYTHON_VERSION="2" +FROM monasca/python:${PYTHON_VERSION} ARG CLIENT_REPO=https://git.openstack.org/openstack/python-monascaclient ARG CLIENT_BRANCH="master" -ARG UPPER_CONSTRAINTS=https://raw.githubusercontent.com/openstack/requirements/master/upper-constraints.txt +ARG CONSTRAINTS_BRANCH="master" # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` ARG REBUILD=1 -RUN set -x && \ - apk add --no-cache python py2-pip git && \ - apk add --no-cache --virtual build-dep \ - git python-dev make g++ linux-headers libxml2-dev libxslt-dev && \ - mkdir /python-monascaclient && cd /python-monascaclient && \ - git init && \ - git remote add origin $CLIENT_REPO && \ - git fetch origin $CLIENT_BRANCH && \ - git reset --hard FETCH_HEAD && \ - pip install -r requirements.txt -c "$UPPER_CONSTRAINTS" && \ - python setup.py install && \ - cd / && \ - rm -rf /python-monascaclient && \ - rm -rf /root/.cache/pip && \ - apk del build-dep - +RUN apk add --no-cache --virtual build-dep libxml2-dev libxslt-dev && \ + /build.sh -r ${CLIENT_REPO} -b ${CLIENT_BRANCH} -q ${CONSTRAINTS_BRANCH} && \ + monasca --version CMD ["sh"] From 6c79b72537ba229719ae445402bbcc06bac3c029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Mon, 7 Aug 2017 09:47:43 +0200 Subject: [PATCH 04/21] Add custom apk_install function for agent --- monasca-agent-base/Dockerfile | 5 ++--- monasca-agent-base/apk_install.sh | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 monasca-agent-base/apk_install.sh diff --git a/monasca-agent-base/Dockerfile b/monasca-agent-base/Dockerfile index e43126ab4..dd20ef791 100644 --- a/monasca-agent-base/Dockerfile +++ b/monasca-agent-base/Dockerfile @@ -20,9 +20,8 @@ ENV CONFIG_TEMPLATE=true \ LOG_LEVEL=WARN \ HOSTNAME_FROM_KUBERNETES=false -RUN apk add --no-cache libxml2 py2-psutil && \ - apk add --no-cache --virtual libxml2-dev libxslt-dev && \ - /build.sh -r ${AGENT_REPO} -b ${AGENT_BRANCH} -c ${UPPER_CONSTRAINTS} -d "prometheus_client" +COPY apk_install.sh /apk.sh +RUN /build.sh -r ${AGENT_REPO} -b ${AGENT_BRANCH} -c ${UPPER_CONSTRAINTS} -d "prometheus_client docker-py" COPY agent.yaml.j2 /etc/monasca/agent/agent.yaml.j2 COPY template.py kubernetes_get_host.py / diff --git a/monasca-agent-base/apk_install.sh b/monasca-agent-base/apk_install.sh new file mode 100644 index 000000000..e76ee8cc4 --- /dev/null +++ b/monasca-agent-base/apk_install.sh @@ -0,0 +1,4 @@ +install_apk_deps() { + apk add --no-cache py2-jinja2 libxml2 py2-psutil + apk add --no-cache --virtual build-dep git make g++ linux-headers libxml2-dev libxslt-dev +} From 61a70984825d7f958d1add2a91019ffcf92f127a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Tue, 8 Aug 2017 08:14:20 +0200 Subject: [PATCH 05/21] Migrate remaining images to monasca/python --- monasca-agent-base/Dockerfile | 4 +++- monasca-api-python/Dockerfile | 8 ++++---- monasca-api-python/apk_install.sh | 4 ++++ monasca-client/build.yml | 14 +++++++++++++- monasca-notification/Dockerfile | 23 +++++++---------------- monasca-notification/apk_install.sh | 4 ++++ monasca-persister-python/Dockerfile | 21 +++++++-------------- monasca-persister-python/build.yml | 12 +++++++++++- 8 files changed, 53 insertions(+), 37 deletions(-) create mode 100644 monasca-api-python/apk_install.sh create mode 100644 monasca-notification/apk_install.sh diff --git a/monasca-agent-base/Dockerfile b/monasca-agent-base/Dockerfile index dd20ef791..f9f39f35e 100644 --- a/monasca-agent-base/Dockerfile +++ b/monasca-agent-base/Dockerfile @@ -21,7 +21,9 @@ ENV CONFIG_TEMPLATE=true \ HOSTNAME_FROM_KUBERNETES=false COPY apk_install.sh /apk.sh -RUN /build.sh -r ${AGENT_REPO} -b ${AGENT_BRANCH} -c ${UPPER_CONSTRAINTS} -d "prometheus_client docker-py" +RUN /build.sh -r ${AGENT_REPO} -b ${AGENT_BRANCH} -c ${UPPER_CONSTRAINTS} \ + -d "prometheus_client docker-py" && \ + rm -rf /build.sh COPY agent.yaml.j2 /etc/monasca/agent/agent.yaml.j2 COPY template.py kubernetes_get_host.py / diff --git a/monasca-api-python/Dockerfile b/monasca-api-python/Dockerfile index 6b51c24c6..4c4f3033b 100644 --- a/monasca-api-python/Dockerfile +++ b/monasca-api-python/Dockerfile @@ -35,10 +35,10 @@ ENV CONFIG_TEMPLATE=true \ ACCESS_LOG_FORMAT="%(asctime)s [%(process)d] gunicorn.access [%(levelname)s] %(message)s" \ ACCESS_LOG_FIELDS='%(h)s %(l)s %(u)s %(t)s %(r)s %(s)s %(b)s "%(f)s" "%(a)s" %(L)s' - -RUN apk add --no-cache mysql-client && \ - /build.sh -r ${API_REPO} -b ${API_BRANCH} \ - -q ${API_CONSTRAINTS_BRANCH} -d "gunicorn influxdb python-memcached" +COPY apk_install.sh /apk.sh +RUN /build.sh -r ${API_REPO} -b ${API_BRANCH} \ + -q ${API_CONSTRAINTS_BRANCH} -d "gunicorn influxdb python-memcached" && \ + rm -rf /build.sh COPY api-* /etc/monasca/ COPY template.py start.sh health-check.sh kafka_wait_for_topics.py / diff --git a/monasca-api-python/apk_install.sh b/monasca-api-python/apk_install.sh new file mode 100644 index 000000000..582fb7996 --- /dev/null +++ b/monasca-api-python/apk_install.sh @@ -0,0 +1,4 @@ +install_apk_deps() { + apk add --no-cache curl mysql-client + apk add --no-cache --virtual build-dep git make g++ linux-headers +} diff --git a/monasca-client/build.yml b/monasca-client/build.yml index 8aa35d4e0..cd7934468 100644 --- a/monasca-client/build.yml +++ b/monasca-client/build.yml @@ -2,11 +2,23 @@ repository: monasca/client variants: - tag: latest aliases: - - :1.6.0 + - :1.7.0 + - :1.7 + args: + CLIENT_BRANCH: 1.7.0 + + - tag: 1.6.0 + aliases: + - :1.6 args: CLIENT_BRANCH: 1.6.0 + - tag: master aliases: - :master-{date}-{time} args: CLIENT_BRANCH: master + + - tag: pike + args: + CLIENT_BRANCH: stable/pike diff --git a/monasca-notification/Dockerfile b/monasca-notification/Dockerfile index 93dbc00a5..38d1765e5 100644 --- a/monasca-notification/Dockerfile +++ b/monasca-notification/Dockerfile @@ -1,7 +1,10 @@ -FROM alpine:3.5 +ARG PYTHON_VERSION=2 + +FROM monasca/python:${PYTHON_VERSION} ARG NOTIFICATION_REPO=https://git.openstack.org/openstack/monasca-notification ARG NOTIFICATION_BRANCH=master +ARG CONSTRAINTS_BRANCH=${CONSTRAINTS_BRANCH:-$NOTIFICATION_BRANCH} # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` @@ -16,21 +19,9 @@ ENV CONFIG_TEMPLATE=true \ MYSQL_DB_PASSWORD=password \ MYSQL_DB_DATABASE=mon -RUN apk add --no-cache \ - python py2-pip py2-jinja2 py2-netaddr py2-yaml py2-gevent py2-greenlet mysql-client ca-certificates && \ - apk add --no-cache --virtual build-dep \ - git python-dev make g++ && \ - mkdir /monasca-notification && cd /monasca-notification && \ - git init && \ - git remote add origin $NOTIFICATION_REPO && \ - git fetch origin $NOTIFICATION_BRANCH && \ - git reset --hard FETCH_HEAD && \ - pip install -r requirements.txt && \ - python setup.py install && \ - cd / && \ - rm -rf /monasca-notification && \ - rm -rf /root/.cache/pip && \ - apk del build-dep +COPY apk_install.sh /apk.sh +RUN /build.sh -r ${NOTIFICATION_REPO} -b ${NOTIFICATION_BRANCH} \ + -q ${CONSTRAINTS_BRANCH} -d "PyMySQL" COPY notification.yaml.j2 /config/notification.yaml.j2 COPY template.py kafka_wait_for_topics.py start.sh / diff --git a/monasca-notification/apk_install.sh b/monasca-notification/apk_install.sh new file mode 100644 index 000000000..4948bc6df --- /dev/null +++ b/monasca-notification/apk_install.sh @@ -0,0 +1,4 @@ +install_apk_deps() { + apk add --no-cache py2-jinja2 py2-netaddr py2-gevent py2-greenlet mysql-client ca-certificates + apk add --no-cache --virtual build-dep git make g++ linux-headers +} diff --git a/monasca-persister-python/Dockerfile b/monasca-persister-python/Dockerfile index 3fa86add1..131706f3a 100644 --- a/monasca-persister-python/Dockerfile +++ b/monasca-persister-python/Dockerfile @@ -1,7 +1,10 @@ -FROM alpine:3.5 +ARG PYTHON_VERSION=2 + +FROM monasca/python:${PYTHON_VERSION} ARG PERSISTER_REPO=https://github.com/openstack/monasca-persister.git ARG PERSISTER_BRANCH="master" +ARG CONSTRAINTS_BRANCH=${PERSISTER_BRANCH} # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` @@ -23,19 +26,9 @@ ENV CONFIG_TEMPLATE=true \ INFLUX_PASSWORD=password \ INFLUX_DB=mon -RUN apk add --no-cache python py2-pip py2-jinja2 && \ - apk add --no-cache --virtual build-dep \ - python-dev git make g++ linux-headers && \ - git clone \ - --single-branch --depth=1 -b $PERSISTER_BRANCH \ - $PERSISTER_REPO /monasca-persister && \ - pip install influxdb && \ - cd /monasca-persister && \ - pip install -r requirements.txt && \ - python setup.py install && \ - cd / && \ - rm -rf /monasca-persister && \ - apk del build-dep +RUN /build.sh -r ${PERSISTER_REPO} -b ${PERSISTER_BRANCH} \ + -q ${CONSTRAINTS_BRANCH} -d "influxdb" && \ + rm -rf /build.sh COPY persister.conf.j2 /etc/monasca-persister/ COPY template.py start.sh kafka_wait_for_topics.py / diff --git a/monasca-persister-python/build.yml b/monasca-persister-python/build.yml index 014afdd76..030f78d06 100644 --- a/monasca-persister-python/build.yml +++ b/monasca-persister-python/build.yml @@ -1,9 +1,19 @@ repository: monasca/persister variants: - - tag: 1.5.0-python + - tag: 1.6.0-python aliases: - :latest - :latest-python + - :1.6.0 + - :1.5 + - :1.5-python + - :1 + - :1-python + args: + PERSISTER_BRANCH: 1.6.0 + + - tag: 1.5.0-python + aliases: - :1.5.0 - :1.5 - :1.5-python From 96e18e8732df2f7e81f1b4a8a11ef9de1ccecb4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Tue, 8 Aug 2017 08:14:43 +0200 Subject: [PATCH 06/21] Use monasca/client as base for monasca/alarms. In monasca/alarms, python-monascaclient is being used. It only makes sense to resuse that image and benefit from any updates that are made to monasca/client and/or monasca/python --- monasca-alarms/Dockerfile | 12 +++++------- monasca-alarms/build.yml | 3 ++- monasca-alarms/monasca_alarm_definition.py | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/monasca-alarms/Dockerfile b/monasca-alarms/Dockerfile index 8669b655c..a18bcfad5 100644 --- a/monasca-alarms/Dockerfile +++ b/monasca-alarms/Dockerfile @@ -1,4 +1,6 @@ -FROM alpine:3.5 +ARG MON_CLIENT_VERSION="1.6.0" + +FROM monasca/client:${MON_CLIENT_VERSION} # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` @@ -12,12 +14,8 @@ ENV MONASCA_WAIT_FOR_API=true \ OS_USERNAME=mini-mon \ OS_USER_DOMAIN_NAME=Default -RUN apk add --no-cache \ - python py2-pip py2-netaddr py2-yaml py2-jinja2 && \ - apk add --no-cache --virtual build-dep \ - git python-dev make g++ linux-headers && \ - pip install python-monascaclient && \ - rm -rf /root/.cache/pip && \ +RUN apk add --no-cache py2-netaddr py2-yaml && \ + apk add --no-cache --virtual build-dep && \ apk del build-dep COPY definitions.yml.j2 /config/definitions.yml.j2 diff --git a/monasca-alarms/build.yml b/monasca-alarms/build.yml index 2bba13564..daa7caaf9 100644 --- a/monasca-alarms/build.yml +++ b/monasca-alarms/build.yml @@ -1,5 +1,6 @@ repository: monasca/alarms variants: - - tag: 1.1.1 + - tag: 1.1.2 aliases: - :latest + - tag: 1.1.1 diff --git a/monasca-alarms/monasca_alarm_definition.py b/monasca-alarms/monasca_alarm_definition.py index 23f239ed0..100e0ce1b 100644 --- a/monasca-alarms/monasca_alarm_definition.py +++ b/monasca-alarms/monasca_alarm_definition.py @@ -321,7 +321,7 @@ def _process_alarm_definition(self, definition, notification_ids): else: raise Exception(str(resp.status_code) + resp.text) else: # Only other option is state=present - + alarm_actions = self._map_notifications(definition.get('alarm_actions', []), notification_ids) ok_actions = self._map_notifications(definition.get('ok_actions', []), notification_ids) undetermined_actions = self._map_notifications(definition.get('undetermined_actions', []), notification_ids) @@ -568,7 +568,7 @@ def main(args=None): } if not monascaclient_found: - print("python-monascaclient >= 1.0.9 is required", file=sys.stderr) + print("python-monascaclient>=1.6.0<1.7.0 is required", file=sys.stderr) sys.exit(1) if not args.definitions_file: From eaabfd2df8da9ebbd4ac294d62b3f19000f48e2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Wed, 9 Aug 2017 06:54:34 +0200 Subject: [PATCH 07/21] Use latest monasca/python build --- monasca-agent-base/Dockerfile | 8 +++++--- monasca-api-python/Dockerfile | 8 +++++--- monasca-client/Dockerfile | 5 +++-- monasca-notification/Dockerfile | 5 +++-- monasca-persister-python/Dockerfile | 8 ++++---- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/monasca-agent-base/Dockerfile b/monasca-agent-base/Dockerfile index f9f39f35e..72c1346a0 100644 --- a/monasca-agent-base/Dockerfile +++ b/monasca-agent-base/Dockerfile @@ -1,8 +1,10 @@ -FROM monasca/python:2 +ARG PYTHON_VERSION="2" +ARG TIMESTAMP_SLUG=20170808-155214 +FROM monasca/python:${PYTHON_VERSION}-${TIMESTAMP_SLUG} ARG AGENT_REPO=https://git.openstack.org/openstack/monasca-agent ARG AGENT_BRANCH="master" -ARG UPPER_CONSTRAINTS=https://raw.githubusercontent.com/openstack/requirements/master/upper-constraints.txt +ARG CONSTRAINTS_BRANCH=${CONSTRAINTS_BRANCH:-$AGENT_BRANCH} ARG AGENT_USER="mon-agent" # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running @@ -21,7 +23,7 @@ ENV CONFIG_TEMPLATE=true \ HOSTNAME_FROM_KUBERNETES=false COPY apk_install.sh /apk.sh -RUN /build.sh -r ${AGENT_REPO} -b ${AGENT_BRANCH} -c ${UPPER_CONSTRAINTS} \ +RUN /build.sh -r ${AGENT_REPO} -b ${AGENT_BRANCH} -q ${CONSTRAINTS_BRANCH} \ -d "prometheus_client docker-py" && \ rm -rf /build.sh diff --git a/monasca-api-python/Dockerfile b/monasca-api-python/Dockerfile index 4c4f3033b..f0a6c9787 100644 --- a/monasca-api-python/Dockerfile +++ b/monasca-api-python/Dockerfile @@ -1,8 +1,10 @@ -FROM monasca/python:2 +ARG PYTHON_VERSION="2" +ARG TIMESTAMP_SLUG=20170808-155214 +FROM monasca/python:${PYTHON_VERSION}-${TIMESTAMP_SLUG} ARG API_REPO=https://github.com/openstack/monasca-api.git ARG API_BRANCH=master -ARG API_CONSTRAINTS_BRANCH=${API_CONSTRAINTS_BRANCH:-$API_BRANCH} +ARG CONSTRAINTS_BRANCH=${CONSTRAINTS_BRANCH:-$API_BRANCH} # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` @@ -37,7 +39,7 @@ ENV CONFIG_TEMPLATE=true \ COPY apk_install.sh /apk.sh RUN /build.sh -r ${API_REPO} -b ${API_BRANCH} \ - -q ${API_CONSTRAINTS_BRANCH} -d "gunicorn influxdb python-memcached" && \ + -q ${CONSTRAINTS_BRANCH} -d "gunicorn influxdb python-memcached" && \ rm -rf /build.sh COPY api-* /etc/monasca/ diff --git a/monasca-client/Dockerfile b/monasca-client/Dockerfile index 904513b66..b3a540a34 100644 --- a/monasca-client/Dockerfile +++ b/monasca-client/Dockerfile @@ -1,9 +1,10 @@ ARG PYTHON_VERSION="2" -FROM monasca/python:${PYTHON_VERSION} +ARG TIMESTAMP_SLUG=20170808-155214 +FROM monasca/python:${PYTHON_VERSION}-${TIMESTAMP_SLUG} ARG CLIENT_REPO=https://git.openstack.org/openstack/python-monascaclient ARG CLIENT_BRANCH="master" -ARG CONSTRAINTS_BRANCH="master" +ARG CONSTRAINTS_BRANCH=${CONSTRAINTS_BRANCH:-$CLIENT_BRANCH} # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` diff --git a/monasca-notification/Dockerfile b/monasca-notification/Dockerfile index 38d1765e5..fb442d9f0 100644 --- a/monasca-notification/Dockerfile +++ b/monasca-notification/Dockerfile @@ -1,6 +1,7 @@ ARG PYTHON_VERSION=2 - -FROM monasca/python:${PYTHON_VERSION} +ARG PYTHON_VERSION="2" +ARG TIMESTAMP_SLUG=20170808-155214 +FROM monasca/python:${PYTHON_VERSION}-${TIMESTAMP_SLUG} ARG NOTIFICATION_REPO=https://git.openstack.org/openstack/monasca-notification ARG NOTIFICATION_BRANCH=master diff --git a/monasca-persister-python/Dockerfile b/monasca-persister-python/Dockerfile index 131706f3a..b746e28ff 100644 --- a/monasca-persister-python/Dockerfile +++ b/monasca-persister-python/Dockerfile @@ -1,10 +1,10 @@ -ARG PYTHON_VERSION=2 - -FROM monasca/python:${PYTHON_VERSION} +ARG PYTHON_VERSION="2" +ARG TIMESTAMP_SLUG=20170808-155214 +FROM monasca/python:${PYTHON_VERSION}-${TIMESTAMP_SLUG} ARG PERSISTER_REPO=https://github.com/openstack/monasca-persister.git ARG PERSISTER_BRANCH="master" -ARG CONSTRAINTS_BRANCH=${PERSISTER_BRANCH} +ARG CONSTRAINTS_BRANCH=${CONSTRAINTS_BRANCH:-$PERSISTER_BRANCH} # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` From f89c3b61d463858914b5b2ab03cc8cdc7a1e46c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Wed, 9 Aug 2017 10:48:22 +0200 Subject: [PATCH 08/21] Address base monasca/agent-base in child build.yml Use version of monasca/agent-base inside build.yml for both monasca-agent-forwarder and monasca-agent-collector. --- monasca-agent-base/Dockerfile | 7 ++++--- monasca-agent-base/build.yml | 2 ++ monasca-agent-collector/Dockerfile | 3 ++- monasca-agent-collector/build.yml | 2 ++ monasca-agent-forwarder/Dockerfile | 3 ++- monasca-agent-forwarder/build.yml | 2 ++ 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/monasca-agent-base/Dockerfile b/monasca-agent-base/Dockerfile index 72c1346a0..00a96f95b 100644 --- a/monasca-agent-base/Dockerfile +++ b/monasca-agent-base/Dockerfile @@ -1,6 +1,7 @@ -ARG PYTHON_VERSION="2" -ARG TIMESTAMP_SLUG=20170808-155214 -FROM monasca/python:${PYTHON_VERSION}-${TIMESTAMP_SLUG} +ARG TIMESTAMP_SLUG +# note(kornicameiter) running monasca-agent with Python3 is not possible +# at the moment, enforce Python2 variant of monasca/python +FROM monasca/python:2-${TIMESTAMP_SLUG} ARG AGENT_REPO=https://git.openstack.org/openstack/monasca-agent ARG AGENT_BRANCH="master" diff --git a/monasca-agent-base/build.yml b/monasca-agent-base/build.yml index 03618cd69..77b2aa37b 100644 --- a/monasca-agent-base/build.yml +++ b/monasca-agent-base/build.yml @@ -3,3 +3,5 @@ variants: - tag: master aliases: - :master-{date}-{time} + args: + TIMESTAMP_SLUG: 20170808-155214 diff --git a/monasca-agent-collector/Dockerfile b/monasca-agent-collector/Dockerfile index a69cfae8b..078ba1a1d 100644 --- a/monasca-agent-collector/Dockerfile +++ b/monasca-agent-collector/Dockerfile @@ -1,4 +1,5 @@ -FROM monasca/agent-base:master-20170901-210328 +ARG MON_AGENT_BASE_VERSION +FROM monasca/agent-base:${MON_AGENT_BASE_VERSION} ARG AGENT_USER="mon-agent" diff --git a/monasca-agent-collector/build.yml b/monasca-agent-collector/build.yml index 1e9fe9572..9b301f85b 100644 --- a/monasca-agent-collector/build.yml +++ b/monasca-agent-collector/build.yml @@ -3,3 +3,5 @@ variants: - tag: master aliases: - :master-{date}-{time} + args: + MON_AGENT_BASE_VERSION: master-20170706-222054 diff --git a/monasca-agent-forwarder/Dockerfile b/monasca-agent-forwarder/Dockerfile index fb7a0bbd7..aaf38ce7c 100644 --- a/monasca-agent-forwarder/Dockerfile +++ b/monasca-agent-forwarder/Dockerfile @@ -1,4 +1,5 @@ -FROM monasca/agent-base:master-20170901-210328 +ARG MON_AGENT_BASE_VERSION +FROM monasca/agent-base:${MON_AGENT_BASE_VERSION} ARG AGENT_USER="mon-agent" diff --git a/monasca-agent-forwarder/build.yml b/monasca-agent-forwarder/build.yml index 9fe756592..665a1b3b7 100644 --- a/monasca-agent-forwarder/build.yml +++ b/monasca-agent-forwarder/build.yml @@ -3,3 +3,5 @@ variants: - tag: master aliases: - :master-{date}-{time} + args: + MON_AGENT_BASE_VERSION: master-20170706-222054 From bf3ca349297cfd926781667f20ed69bf01b227d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Thu, 10 Aug 2017 07:13:41 +0200 Subject: [PATCH 09/21] Bump monasca/python base image --- monasca-agent-base/build.yml | 2 +- monasca-api-python/Dockerfile | 7 ++++--- monasca-api-python/build.yml | 1 + monasca-client/Dockerfile | 4 ++-- monasca-client/build.yml | 13 +++++++++++-- monasca-notification/Dockerfile | 8 ++++---- monasca-notification/build.yml | 2 ++ monasca-persister-python/Dockerfile | 4 ++-- monasca-persister-python/build.yml | 13 +++++++++---- 9 files changed, 36 insertions(+), 18 deletions(-) diff --git a/monasca-agent-base/build.yml b/monasca-agent-base/build.yml index 77b2aa37b..c5c0f7204 100644 --- a/monasca-agent-base/build.yml +++ b/monasca-agent-base/build.yml @@ -4,4 +4,4 @@ variants: aliases: - :master-{date}-{time} args: - TIMESTAMP_SLUG: 20170808-155214 + TIMESTAMP_SLUG: 20170809-155207 diff --git a/monasca-api-python/Dockerfile b/monasca-api-python/Dockerfile index f0a6c9787..87a4f0a77 100644 --- a/monasca-api-python/Dockerfile +++ b/monasca-api-python/Dockerfile @@ -1,6 +1,7 @@ -ARG PYTHON_VERSION="2" -ARG TIMESTAMP_SLUG=20170808-155214 -FROM monasca/python:${PYTHON_VERSION}-${TIMESTAMP_SLUG} +ARG TIMESTAMP_SLUG +# monasca-api cannot run under Python3 +# enforcing Python2 +FROM monasca/python:2-${TIMESTAMP_SLUG} ARG API_REPO=https://github.com/openstack/monasca-api.git ARG API_BRANCH=master diff --git a/monasca-api-python/build.yml b/monasca-api-python/build.yml index 2b4e2b66d..3cddd9fc8 100644 --- a/monasca-api-python/build.yml +++ b/monasca-api-python/build.yml @@ -5,3 +5,4 @@ variants: - :master-{date}-{time} args: API_BRANCH: refs/changes/63/417163/10 + TIMESTAMP_SLUG: 20170809-155207 diff --git a/monasca-client/Dockerfile b/monasca-client/Dockerfile index b3a540a34..9f892e25c 100644 --- a/monasca-client/Dockerfile +++ b/monasca-client/Dockerfile @@ -1,5 +1,5 @@ -ARG PYTHON_VERSION="2" -ARG TIMESTAMP_SLUG=20170808-155214 +ARG PYTHON_VERSION +ARG TIMESTAMP_SLUG FROM monasca/python:${PYTHON_VERSION}-${TIMESTAMP_SLUG} ARG CLIENT_REPO=https://git.openstack.org/openstack/python-monascaclient diff --git a/monasca-client/build.yml b/monasca-client/build.yml index cd7934468..94dcbda42 100644 --- a/monasca-client/build.yml +++ b/monasca-client/build.yml @@ -1,24 +1,33 @@ repository: monasca/client variants: - - tag: latest + - tag: 1.7.0 aliases: - - :1.7.0 + - :latest - :1.7 + - :1 args: CLIENT_BRANCH: 1.7.0 + PYTHON_VERSION: 2 + TIMESTAMP_SLUG: 20170809-155207 - tag: 1.6.0 aliases: - :1.6 args: CLIENT_BRANCH: 1.6.0 + PYTHON_VERSION: 2 + TIMESTAMP_SLUG: 20170809-155207 - tag: master aliases: - :master-{date}-{time} args: CLIENT_BRANCH: master + PYTHON_VERSION: 2 + TIMESTAMP_SLUG: 20170809-155207 - tag: pike args: CLIENT_BRANCH: stable/pike + PYTHON_VERSION: 2 + TIMESTAMP_SLUG: 20170809-155207 diff --git a/monasca-notification/Dockerfile b/monasca-notification/Dockerfile index fb442d9f0..e985b4aca 100644 --- a/monasca-notification/Dockerfile +++ b/monasca-notification/Dockerfile @@ -1,7 +1,7 @@ -ARG PYTHON_VERSION=2 -ARG PYTHON_VERSION="2" -ARG TIMESTAMP_SLUG=20170808-155214 -FROM monasca/python:${PYTHON_VERSION}-${TIMESTAMP_SLUG} +ARG TIMESTAMP_SLUG +FROM monasca/python:2-${TIMESTAMP_SLUG} +# note(kornicameister) there's no full Python3 support for +# monasca-notification at the moment, enforcing Python 2 ARG NOTIFICATION_REPO=https://git.openstack.org/openstack/monasca-notification ARG NOTIFICATION_BRANCH=master diff --git a/monasca-notification/build.yml b/monasca-notification/build.yml index 5c8513f53..d0ebf9dda 100644 --- a/monasca-notification/build.yml +++ b/monasca-notification/build.yml @@ -1,8 +1,10 @@ repository: monasca/notification variants: + - tag: master aliases: - :latest - :master-{date}-{time} args: NOTIFICATION_BRANCH: refs/changes/17/461917/3 + TIMESTAMP_SLUG: 20170809-155207 diff --git a/monasca-persister-python/Dockerfile b/monasca-persister-python/Dockerfile index b746e28ff..4e44d0fed 100644 --- a/monasca-persister-python/Dockerfile +++ b/monasca-persister-python/Dockerfile @@ -1,5 +1,5 @@ -ARG PYTHON_VERSION="2" -ARG TIMESTAMP_SLUG=20170808-155214 +ARG PYTHON_VERSION +ARG TIMESTAMP_SLUG FROM monasca/python:${PYTHON_VERSION}-${TIMESTAMP_SLUG} ARG PERSISTER_REPO=https://github.com/openstack/monasca-persister.git diff --git a/monasca-persister-python/build.yml b/monasca-persister-python/build.yml index 030f78d06..fdaf4a749 100644 --- a/monasca-persister-python/build.yml +++ b/monasca-persister-python/build.yml @@ -5,28 +5,31 @@ variants: - :latest - :latest-python - :1.6.0 - - :1.5 - - :1.5-python + - :1.6 - :1 - :1-python args: PERSISTER_BRANCH: 1.6.0 + PYTHON_VERSION: 2 + TIMESTAMP_SLUG: 20170809-155207 - tag: 1.5.0-python aliases: - :1.5.0 - :1.5 - :1.5-python - - :1 - - :1-python args: PERSISTER_BRANCH: 1.5.0 + PYTHON_VERSION: 2 + TIMESTAMP_SLUG: 20170809-155207 - tag: ocata-python aliases: - :ocata args: PERSISTER_BRANCH: stable/ocata + PYTHON_VERSION: 2 + TIMESTAMP_SLUG: 20170809-155207 - tag: master aliases: @@ -34,3 +37,5 @@ variants: - :master-python args: PERSISTER_BRANCH: master + PYTHON_VERSION: 2 + TIMESTAMP_SLUG: 20170809-155207 From ad267188951963bef34b85e5e173d1fb7dd9e073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Thu, 10 Aug 2017 07:29:06 +0200 Subject: [PATCH 10/21] Ensure Python version is string --- monasca-client/build.yml | 8 ++++---- monasca-persister-python/build.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/monasca-client/build.yml b/monasca-client/build.yml index 94dcbda42..59c2e93c8 100644 --- a/monasca-client/build.yml +++ b/monasca-client/build.yml @@ -7,7 +7,7 @@ variants: - :1 args: CLIENT_BRANCH: 1.7.0 - PYTHON_VERSION: 2 + PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 - tag: 1.6.0 @@ -15,7 +15,7 @@ variants: - :1.6 args: CLIENT_BRANCH: 1.6.0 - PYTHON_VERSION: 2 + PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 - tag: master @@ -23,11 +23,11 @@ variants: - :master-{date}-{time} args: CLIENT_BRANCH: master - PYTHON_VERSION: 2 + PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 - tag: pike args: CLIENT_BRANCH: stable/pike - PYTHON_VERSION: 2 + PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 diff --git a/monasca-persister-python/build.yml b/monasca-persister-python/build.yml index fdaf4a749..2b1901dc2 100644 --- a/monasca-persister-python/build.yml +++ b/monasca-persister-python/build.yml @@ -10,7 +10,7 @@ variants: - :1-python args: PERSISTER_BRANCH: 1.6.0 - PYTHON_VERSION: 2 + PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 - tag: 1.5.0-python @@ -20,7 +20,7 @@ variants: - :1.5-python args: PERSISTER_BRANCH: 1.5.0 - PYTHON_VERSION: 2 + PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 - tag: ocata-python @@ -28,7 +28,7 @@ variants: - :ocata args: PERSISTER_BRANCH: stable/ocata - PYTHON_VERSION: 2 + PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 - tag: master @@ -37,5 +37,5 @@ variants: - :master-python args: PERSISTER_BRANCH: master - PYTHON_VERSION: 2 + PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 From f31aafcd30b834e7a2cc6264a4fbff5eb9bd83bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Thu, 10 Aug 2017 07:38:45 +0200 Subject: [PATCH 11/21] Use master constraints for monasca-api --- monasca-api-python/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/monasca-api-python/build.yml b/monasca-api-python/build.yml index 3cddd9fc8..04015e762 100644 --- a/monasca-api-python/build.yml +++ b/monasca-api-python/build.yml @@ -5,4 +5,5 @@ variants: - :master-{date}-{time} args: API_BRANCH: refs/changes/63/417163/10 + CONSTRAINTS_BRANCH: master TIMESTAMP_SLUG: 20170809-155207 From 7508bc7efa3243c16974bf08d1e470ff0b38a797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Thu, 10 Aug 2017 08:12:18 +0200 Subject: [PATCH 12/21] Removed pike from client --- monasca-client/build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/monasca-client/build.yml b/monasca-client/build.yml index 59c2e93c8..a3633fd0b 100644 --- a/monasca-client/build.yml +++ b/monasca-client/build.yml @@ -25,9 +25,3 @@ variants: CLIENT_BRANCH: master PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 - - - tag: pike - args: - CLIENT_BRANCH: stable/pike - PYTHON_VERSION: '2' - TIMESTAMP_SLUG: 20170809-155207 From db3aee0c47e8b333df426d45047a1ad7feefb48f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Thu, 10 Aug 2017 08:24:56 +0200 Subject: [PATCH 13/21] Ensure master branch for constraints in client --- monasca-client/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/monasca-client/build.yml b/monasca-client/build.yml index a3633fd0b..aeb048880 100644 --- a/monasca-client/build.yml +++ b/monasca-client/build.yml @@ -9,6 +9,7 @@ variants: CLIENT_BRANCH: 1.7.0 PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 + CONSTRAINTS_BRANCH: master - tag: 1.6.0 aliases: @@ -17,6 +18,7 @@ variants: CLIENT_BRANCH: 1.6.0 PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 + CONSTRAINTS_BRANCH: master - tag: master aliases: @@ -25,3 +27,4 @@ variants: CLIENT_BRANCH: master PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 + CONSTRAINTS_BRANCH: master From 4d4390b2468afde64ecb8fb000076bc685817f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Thu, 10 Aug 2017 08:57:55 +0200 Subject: [PATCH 14/21] Ensuring proper constraints version --- monasca-agent-base/Dockerfile | 6 +++--- monasca-api-python/Dockerfile | 2 +- monasca-client/Dockerfile | 4 ++-- monasca-notification/Dockerfile | 2 +- monasca-persister-python/Dockerfile | 4 ++-- monasca-persister-python/build.yml | 2 ++ 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/monasca-agent-base/Dockerfile b/monasca-agent-base/Dockerfile index 00a96f95b..0c4550b3c 100644 --- a/monasca-agent-base/Dockerfile +++ b/monasca-agent-base/Dockerfile @@ -4,9 +4,9 @@ ARG TIMESTAMP_SLUG FROM monasca/python:2-${TIMESTAMP_SLUG} ARG AGENT_REPO=https://git.openstack.org/openstack/monasca-agent -ARG AGENT_BRANCH="master" -ARG CONSTRAINTS_BRANCH=${CONSTRAINTS_BRANCH:-$AGENT_BRANCH} -ARG AGENT_USER="mon-agent" +ARG AGENT_BRANCH=master +ARG CONSTRAINTS_BRANCH=master +ARG AGENT_USER=mon-agent # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` diff --git a/monasca-api-python/Dockerfile b/monasca-api-python/Dockerfile index 87a4f0a77..34e09edad 100644 --- a/monasca-api-python/Dockerfile +++ b/monasca-api-python/Dockerfile @@ -5,7 +5,7 @@ FROM monasca/python:2-${TIMESTAMP_SLUG} ARG API_REPO=https://github.com/openstack/monasca-api.git ARG API_BRANCH=master -ARG CONSTRAINTS_BRANCH=${CONSTRAINTS_BRANCH:-$API_BRANCH} +ARG CONSTRAINTS_BRANCH=master # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` diff --git a/monasca-client/Dockerfile b/monasca-client/Dockerfile index 9f892e25c..24c17a3b8 100644 --- a/monasca-client/Dockerfile +++ b/monasca-client/Dockerfile @@ -3,8 +3,8 @@ ARG TIMESTAMP_SLUG FROM monasca/python:${PYTHON_VERSION}-${TIMESTAMP_SLUG} ARG CLIENT_REPO=https://git.openstack.org/openstack/python-monascaclient -ARG CLIENT_BRANCH="master" -ARG CONSTRAINTS_BRANCH=${CONSTRAINTS_BRANCH:-$CLIENT_BRANCH} +ARG CLIENT_BRANCH=master +ARG CONSTRAINTS_BRANCH=master # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` diff --git a/monasca-notification/Dockerfile b/monasca-notification/Dockerfile index e985b4aca..e4eab0d42 100644 --- a/monasca-notification/Dockerfile +++ b/monasca-notification/Dockerfile @@ -5,7 +5,7 @@ FROM monasca/python:2-${TIMESTAMP_SLUG} ARG NOTIFICATION_REPO=https://git.openstack.org/openstack/monasca-notification ARG NOTIFICATION_BRANCH=master -ARG CONSTRAINTS_BRANCH=${CONSTRAINTS_BRANCH:-$NOTIFICATION_BRANCH} +ARG CONSTRAINTS_BRANCH=master # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` diff --git a/monasca-persister-python/Dockerfile b/monasca-persister-python/Dockerfile index 4e44d0fed..ab44566ea 100644 --- a/monasca-persister-python/Dockerfile +++ b/monasca-persister-python/Dockerfile @@ -3,8 +3,8 @@ ARG TIMESTAMP_SLUG FROM monasca/python:${PYTHON_VERSION}-${TIMESTAMP_SLUG} ARG PERSISTER_REPO=https://github.com/openstack/monasca-persister.git -ARG PERSISTER_BRANCH="master" -ARG CONSTRAINTS_BRANCH=${CONSTRAINTS_BRANCH:-$PERSISTER_BRANCH} +ARG PERSISTER_BRANCH=master +ARG CONSTRAINTS_BRANCH=master # To force a rebuild, pass --build-arg REBUILD="$(DATE)" when running # `docker build` diff --git a/monasca-persister-python/build.yml b/monasca-persister-python/build.yml index 2b1901dc2..2ba2bec48 100644 --- a/monasca-persister-python/build.yml +++ b/monasca-persister-python/build.yml @@ -30,6 +30,7 @@ variants: PERSISTER_BRANCH: stable/ocata PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 + CONSTRAINTS_BRANCH: stable/ocata - tag: master aliases: @@ -39,3 +40,4 @@ variants: PERSISTER_BRANCH: master PYTHON_VERSION: '2' TIMESTAMP_SLUG: 20170809-155207 + CONSTRAINTS_BRANCH: master From 356410a7a65ae62c8c053893943d6b5aaa1255fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Thu, 10 Aug 2017 09:53:21 +0200 Subject: [PATCH 15/21] Fix launch path for monasca-persister --- monasca-persister-python/start.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/monasca-persister-python/start.sh b/monasca-persister-python/start.sh index de382a57f..34d8341db 100755 --- a/monasca-persister-python/start.sh +++ b/monasca-persister-python/start.sh @@ -35,5 +35,4 @@ else cp /etc/monasca-persister/persister.conf.j2 /etc/monasca-persister/persister.conf fi -python /usr/lib/python2.7/site-packages/monasca_persister/persister.py \ - --config-file /etc/monasca-persister/persister.conf +monasca-persister --config-file /etc/monasca-persister/persister.conf From 0eb7cf54942c72086b68da876bf9a5680f70d2b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Thu, 10 Aug 2017 10:54:19 +0200 Subject: [PATCH 16/21] Add missing Jinja2 installation --- monasca-agent-base/Dockerfile | 2 +- monasca-agent-base/apk_install.sh | 2 +- monasca-alarms/Dockerfile | 2 +- monasca-api-python/Dockerfile | 2 +- monasca-notification/Dockerfile | 2 +- monasca-notification/apk_install.sh | 2 +- monasca-persister-python/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/monasca-agent-base/Dockerfile b/monasca-agent-base/Dockerfile index 0c4550b3c..0f911625c 100644 --- a/monasca-agent-base/Dockerfile +++ b/monasca-agent-base/Dockerfile @@ -25,7 +25,7 @@ ENV CONFIG_TEMPLATE=true \ COPY apk_install.sh /apk.sh RUN /build.sh -r ${AGENT_REPO} -b ${AGENT_BRANCH} -q ${CONSTRAINTS_BRANCH} \ - -d "prometheus_client docker-py" && \ + -d "Jinja2 prometheus_client docker-py" && \ rm -rf /build.sh COPY agent.yaml.j2 /etc/monasca/agent/agent.yaml.j2 diff --git a/monasca-agent-base/apk_install.sh b/monasca-agent-base/apk_install.sh index e76ee8cc4..b42622fea 100644 --- a/monasca-agent-base/apk_install.sh +++ b/monasca-agent-base/apk_install.sh @@ -1,4 +1,4 @@ install_apk_deps() { - apk add --no-cache py2-jinja2 libxml2 py2-psutil + apk add --no-cache libxml2 py2-psutil apk add --no-cache --virtual build-dep git make g++ linux-headers libxml2-dev libxslt-dev } diff --git a/monasca-alarms/Dockerfile b/monasca-alarms/Dockerfile index a18bcfad5..0fe40ad9f 100644 --- a/monasca-alarms/Dockerfile +++ b/monasca-alarms/Dockerfile @@ -14,7 +14,7 @@ ENV MONASCA_WAIT_FOR_API=true \ OS_USERNAME=mini-mon \ OS_USER_DOMAIN_NAME=Default -RUN apk add --no-cache py2-netaddr py2-yaml && \ +RUN apk add --no-cache py2-netaddr py2-yaml py2-jinja2 && \ apk add --no-cache --virtual build-dep && \ apk del build-dep diff --git a/monasca-api-python/Dockerfile b/monasca-api-python/Dockerfile index 34e09edad..4aa7f44ac 100644 --- a/monasca-api-python/Dockerfile +++ b/monasca-api-python/Dockerfile @@ -40,7 +40,7 @@ ENV CONFIG_TEMPLATE=true \ COPY apk_install.sh /apk.sh RUN /build.sh -r ${API_REPO} -b ${API_BRANCH} \ - -q ${CONSTRAINTS_BRANCH} -d "gunicorn influxdb python-memcached" && \ + -q ${CONSTRAINTS_BRANCH} -d "gunicorn influxdb python-memcached Jinja2" && \ rm -rf /build.sh COPY api-* /etc/monasca/ diff --git a/monasca-notification/Dockerfile b/monasca-notification/Dockerfile index e4eab0d42..82a7487c9 100644 --- a/monasca-notification/Dockerfile +++ b/monasca-notification/Dockerfile @@ -22,7 +22,7 @@ ENV CONFIG_TEMPLATE=true \ COPY apk_install.sh /apk.sh RUN /build.sh -r ${NOTIFICATION_REPO} -b ${NOTIFICATION_BRANCH} \ - -q ${CONSTRAINTS_BRANCH} -d "PyMySQL" + -q ${CONSTRAINTS_BRANCH} -d "PyMySQL Jinja2 netaddr gevent greenlet" COPY notification.yaml.j2 /config/notification.yaml.j2 COPY template.py kafka_wait_for_topics.py start.sh / diff --git a/monasca-notification/apk_install.sh b/monasca-notification/apk_install.sh index 4948bc6df..6b1fd9a67 100644 --- a/monasca-notification/apk_install.sh +++ b/monasca-notification/apk_install.sh @@ -1,4 +1,4 @@ install_apk_deps() { - apk add --no-cache py2-jinja2 py2-netaddr py2-gevent py2-greenlet mysql-client ca-certificates + apk add --no-cache mysql-client ca-certificates apk add --no-cache --virtual build-dep git make g++ linux-headers } diff --git a/monasca-persister-python/Dockerfile b/monasca-persister-python/Dockerfile index ab44566ea..0c1a44883 100644 --- a/monasca-persister-python/Dockerfile +++ b/monasca-persister-python/Dockerfile @@ -27,7 +27,7 @@ ENV CONFIG_TEMPLATE=true \ INFLUX_DB=mon RUN /build.sh -r ${PERSISTER_REPO} -b ${PERSISTER_BRANCH} \ - -q ${CONSTRAINTS_BRANCH} -d "influxdb" && \ + -q ${CONSTRAINTS_BRANCH} -d "influxdb Jinja2" && \ rm -rf /build.sh COPY persister.conf.j2 /etc/monasca-persister/ From 0938f20e2c1c613fe10a9472876e2abe82356873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Thu, 10 Aug 2017 13:17:51 +0200 Subject: [PATCH 17/21] Change monasca-alarms to latest --- docker-compose.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index fc9d5f42f..b7815c0e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,6 +38,11 @@ services: CADVISOR: "true" CADVISOR_URL: "http://cadvisor:8080/" + influxdb-init: + image: monasca/influxdb-init:latest + depends_on: + - influxdb + alarms: image: monasca/alarms:${MON_ALARMS_VERSION} From 930b9d43e091207f136bc4681fc1fae2c91709b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Wed, 16 Aug 2017 10:18:58 +0200 Subject: [PATCH 18/21] Change versions of base image Updated versions of base image for: * monasca-agent-collector * monasca-agent-forwarder --- docker-compose.yml | 46 ++++++++++++++----------------- monasca-agent-collector/build.yml | 2 +- monasca-agent-forwarder/build.yml | 2 +- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b7815c0e5..74b6606e3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,11 +5,7 @@ services: image: memcached:${MEMCACHED_VERSION} influxdb: - image: influxdb:${INFLUXDB_VERSION} - influxdb-init: - image: monasca/influxdb-init:${INFLUXDB_INIT_VERSION} - depends_on: - - influxdb + image: influxdb:latest # cadvisor will allow host metrics to be collected, but requires significant # access to the host system @@ -17,7 +13,7 @@ services: # environment variable should be set to "false" in the `agent-collector` # block - however no metrics will be collected cadvisor: - image: google/cadvisor:${CADVISOR_VERSION} + image: google/cadvisor:v0.26.1 volumes: - "/:/rootfs:ro" - "/var/run:/var/run:rw" @@ -25,13 +21,12 @@ services: - "/var/lib/docker:/var/lib/docker:ro" agent-forwarder: - image: monasca/agent-forwarder:${MON_AGENT_FORWARDER_VERSION} + image: monasca/agent-forwarder:master environment: NON_LOCAL_TRAFFIC: "true" agent-collector: - image: monasca/agent-collector:${MON_AGENT_COLLECTOR_VERSION} - restart: on-failure + image: monasca/agent-collector:master environment: AGENT_HOSTNAME: "docker-host" FORWARDER_URL: "http://agent-forwarder:17123" @@ -39,7 +34,7 @@ services: CADVISOR_URL: "http://cadvisor:8080/" influxdb-init: - image: monasca/influxdb-init:latest + image: monasca/influxdb-init:1.0.0 depends_on: - influxdb @@ -47,16 +42,15 @@ services: image: monasca/alarms:${MON_ALARMS_VERSION} zookeeper: - image: zookeeper:${ZOOKEEPER_VERSION} + image: zookeeper:3.4 + kafka: - image: monasca/kafka:${MON_KAFKA_VERSION} + image: monasca/kafka:0.9.0.1-2.11-1.1.0 depends_on: - zookeeper kafka-init: - image: monasca/kafka-init:${MON_KAFKA_INIT_VERSION} + image: monasca/kafka-init:0.0.1 environment: - ZOOKEEPER_CONNECTION_STRING: "zookeeper:2181" - KAFKA_DELETE_TOPIC_ENABLE: "true" KAFKA_TOPIC_CONFIG: segment.ms=900000 # 15m KAFKA_CREATE_TOPICS: "\ metrics:64:1,\ @@ -66,20 +60,20 @@ services: events:12:1,\ 60-seconds-notifications:3:1" depends_on: - - zookeeper + - kafka mysql: - image: mysql:${MYSQL_VERSION} + image: mysql:5.5 environment: MYSQL_ROOT_PASSWORD: secretmysql mysql-init: - image: monasca/mysql-init:${MYSQL_INIT_VERSION} + image: monasca/mysql-init:1.5.1 environment: MYSQL_INIT_DISABLE_REMOTE_ROOT: "false" MYSQL_INIT_RANDOM_PASSWORD: "false" keystone: - image: monasca/keystone:${MON_KEYSTONE_VERSION} + image: monasca/keystone:1.1.1 environment: KEYSTONE_HOST: keystone KEYSTONE_PASSWORD: secretadmin @@ -95,10 +89,10 @@ services: - "35357:35357" monasca-sidecar: - image: timothyb89/monasca-sidecar:${MON_SIDECAR_VERSION} + image: timothyb89/monasca-sidecar:1.0.0 monasca: - image: monasca/api:${MON_API_VERSION} + image: monasca/api:master environment: SIDECAR_URL: http://monasca-sidecar:4888/v1/ingest depends_on: @@ -113,7 +107,7 @@ services: - "8070:8070" monasca-persister: - image: monasca/persister:${MON_PERSISTER_VERSION} + image: monasca/persister:master depends_on: - monasca - influxdb @@ -121,7 +115,7 @@ services: - kafka thresh: - image: monasca/thresh:${MON_THRESH_VERSION} + image: monasca/thresh:latest environment: NO_STORM_CLUSTER: "true" WORKER_MAX_HEAP_MB: "256" @@ -130,7 +124,7 @@ services: - kafka monasca-notification: - image: monasca/notification:${MON_NOTIFICATION_VERSION} + image: monasca/notification:master environment: NF_PLUGINS: "webhook" depends_on: @@ -140,7 +134,7 @@ services: - mysql grafana: - image: monasca/grafana:${MON_GRAFANA_VERSION} + image: monasca/grafana:4.0.0-1.1.1 environment: GF_AUTH_BASIC_ENABLED: "false" GF_USERS_ALLOW_SIGN_UP: "true" @@ -156,6 +150,6 @@ services: - monasca grafana-init: - image: monasca/grafana-init:${MON_GRAFANA_INIT_VERSION} + image: monasca/grafana-init:1.1.0 depends_on: - grafana diff --git a/monasca-agent-collector/build.yml b/monasca-agent-collector/build.yml index 9b301f85b..8dc473a96 100644 --- a/monasca-agent-collector/build.yml +++ b/monasca-agent-collector/build.yml @@ -4,4 +4,4 @@ variants: aliases: - :master-{date}-{time} args: - MON_AGENT_BASE_VERSION: master-20170706-222054 + MON_AGENT_BASE_VERSION: master-20170811-213513 diff --git a/monasca-agent-forwarder/build.yml b/monasca-agent-forwarder/build.yml index 665a1b3b7..11dacb3b7 100644 --- a/monasca-agent-forwarder/build.yml +++ b/monasca-agent-forwarder/build.yml @@ -4,4 +4,4 @@ variants: aliases: - :master-{date}-{time} args: - MON_AGENT_BASE_VERSION: master-20170706-222054 + MON_AGENT_BASE_VERSION: master-20170811-213513 From d489ed34de579877b98dfa9b5695405ebf296ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Fri, 18 Aug 2017 12:52:38 +0200 Subject: [PATCH 19/21] Removed unused build-dep --- monasca-alarms/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/monasca-alarms/Dockerfile b/monasca-alarms/Dockerfile index 0fe40ad9f..582e6ccee 100644 --- a/monasca-alarms/Dockerfile +++ b/monasca-alarms/Dockerfile @@ -14,9 +14,7 @@ ENV MONASCA_WAIT_FOR_API=true \ OS_USERNAME=mini-mon \ OS_USER_DOMAIN_NAME=Default -RUN apk add --no-cache py2-netaddr py2-yaml py2-jinja2 && \ - apk add --no-cache --virtual build-dep && \ - apk del build-dep +RUN apk add --no-cache py2-netaddr py2-yaml py2-jinja2 COPY definitions.yml.j2 /config/definitions.yml.j2 COPY monasca_alarm_definition.py template.py start.sh / From ea90ae04528059c6d138bba94f8f89274f71618b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Tue, 22 Aug 2017 07:06:33 +0200 Subject: [PATCH 20/21] Update the paths to agent's binaries --- monasca-agent-collector/start.sh | 2 +- monasca-agent-forwarder/start.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/monasca-agent-collector/start.sh b/monasca-agent-collector/start.sh index 638ad53c8..3fb4643b6 100755 --- a/monasca-agent-collector/start.sh +++ b/monasca-agent-collector/start.sh @@ -68,4 +68,4 @@ done template $AGENT_CONF/agent.yaml.j2 $AGENT_CONF/agent.yaml -/usr/bin/monasca-collector foreground +/usr/local/bin/monasca-collector foreground diff --git a/monasca-agent-forwarder/start.sh b/monasca-agent-forwarder/start.sh index eb058d223..a6985350c 100755 --- a/monasca-agent-forwarder/start.sh +++ b/monasca-agent-forwarder/start.sh @@ -24,4 +24,4 @@ fi template $AGENT_CONF/agent.yaml.j2 $AGENT_CONF/agent.yaml -/usr/bin/monasca-forwarder +/usr/local/bin/monasca-forwarder From dad34d9a82fc12433cb24df06c5201d82e4937f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Tue, 22 Aug 2017 08:36:24 +0200 Subject: [PATCH 21/21] Revert agent's binaries path --- monasca-agent-collector/build.yml | 2 +- monasca-agent-collector/start.sh | 2 +- monasca-agent-forwarder/build.yml | 2 +- monasca-agent-forwarder/start.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/monasca-agent-collector/build.yml b/monasca-agent-collector/build.yml index 8dc473a96..2d8c020f4 100644 --- a/monasca-agent-collector/build.yml +++ b/monasca-agent-collector/build.yml @@ -4,4 +4,4 @@ variants: aliases: - :master-{date}-{time} args: - MON_AGENT_BASE_VERSION: master-20170811-213513 + MON_AGENT_BASE_VERSION: master-20170901-210328 diff --git a/monasca-agent-collector/start.sh b/monasca-agent-collector/start.sh index 3fb4643b6..638ad53c8 100755 --- a/monasca-agent-collector/start.sh +++ b/monasca-agent-collector/start.sh @@ -68,4 +68,4 @@ done template $AGENT_CONF/agent.yaml.j2 $AGENT_CONF/agent.yaml -/usr/local/bin/monasca-collector foreground +/usr/bin/monasca-collector foreground diff --git a/monasca-agent-forwarder/build.yml b/monasca-agent-forwarder/build.yml index 11dacb3b7..ac1a2dbde 100644 --- a/monasca-agent-forwarder/build.yml +++ b/monasca-agent-forwarder/build.yml @@ -4,4 +4,4 @@ variants: aliases: - :master-{date}-{time} args: - MON_AGENT_BASE_VERSION: master-20170811-213513 + MON_AGENT_BASE_VERSION: master-20170901-210328 diff --git a/monasca-agent-forwarder/start.sh b/monasca-agent-forwarder/start.sh index a6985350c..eb058d223 100755 --- a/monasca-agent-forwarder/start.sh +++ b/monasca-agent-forwarder/start.sh @@ -24,4 +24,4 @@ fi template $AGENT_CONF/agent.yaml.j2 $AGENT_CONF/agent.yaml -/usr/local/bin/monasca-forwarder +/usr/bin/monasca-forwarder