From f3deddbcdb03e586f6f67137d2723776aa5848bf Mon Sep 17 00:00:00 2001 From: aviau Date: Mon, 25 May 2015 11:57:31 -0400 Subject: [PATCH] Added linux-openstackceilometer pack Change-Id: Icf26411118f3727d453086758bbd27312004dfd2 --- Dockerfile | 1 + surveil/cmd/init.py | 24 +++++++++++++++++++++++ tools/docker/alignak_container/Dockerfile | 2 ++ 3 files changed, 27 insertions(+) diff --git a/Dockerfile b/Dockerfile index 58d82b8..f2426d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ RUN apt-get install -y subversion && \ svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-cinder /packs/linux-cinder && \ svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-keystone /packs/linux-keystone && \ svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-nova /packs/linux-nova && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/branches/linux_openstackceilometer/packs/linux-openstackceilometer /packs/linux-openstackceilometer && \ apt-get remove -y subversion ADD requirements.txt /opt/surveil/requirements.txt diff --git a/surveil/cmd/init.py b/surveil/cmd/init.py index 45e21ff..9b1cdb8 100644 --- a/surveil/cmd/init.py +++ b/surveil/cmd/init.py @@ -90,6 +90,15 @@ def main(): ] ) + subprocess.call( + [ + "surveil-pack-upload", + "--mongo-url=mongo", + "--mongo-port=27017", + "/packs/linux-openstackceilometer/", + ] + ) + else: print("Skipping pack upload...") @@ -136,6 +145,21 @@ def main(): } ) + # Linux-openstackceilometer template + cli_surveil.config.hosts.create( + host_name='openstackceilometer-host', + use='linux-openstackceilometer', + address='127.0.0.1', + custom_fields={ + "_OS_AUTH_URL": "bla", + "_OS_USERNAME": "bli", + "_OS_PASSWORD": "blo", + "_OS_TENANT_NAME": "blu", + "_KS_SERVICES": "bly", + "parents": "localhost" + } + ) + # DOWN HOST (cant resolve) cli_surveil.config.hosts.create( host_name='srv-apache-01', diff --git a/tools/docker/alignak_container/Dockerfile b/tools/docker/alignak_container/Dockerfile index 964d098..08bbf16 100644 --- a/tools/docker/alignak_container/Dockerfile +++ b/tools/docker/alignak_container/Dockerfile @@ -66,6 +66,7 @@ RUN apt-get update && apt-get install -y subversion && \ svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/plugins/check-keystone /plugins/check_keystone && \ svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/plugins/check-nova /plugins/check_nova && \ svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/plugins/check-cinder /plugins/check_cinder && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/plugins/check-ceilometer /plugins/check_ceilometer && \ apt-get remove -y subversion ## Install plugins dependencies @@ -76,6 +77,7 @@ RUN cd /plugins/check_glance && sudo python setup.py install RUN cd /plugins/check_keystone && sudo python setup.py install RUN cd /plugins/check_nova && sudo python setup.py install RUN cd /plugins/check_cinder && sudo python setup.py install +RUN cd /plugins/check_ceilometer && sudo python setup.py install ## packs RUN sh -c 'gpg --recv-keys --keyserver keyserver.ubuntu.com 2320E8F8 && gpg --export --armor 2320E8F8 | apt-key add -' && \