From 36712915185b1a95135f137415c46768c69d84ba Mon Sep 17 00:00:00 2001 From: aviau Date: Fri, 8 May 2015 12:31:23 -0400 Subject: [PATCH] Added check-nova to shinken plugins Change-Id: I198f45d331e1a9742845e6c391f6949d0476863f --- Dockerfile | 1 + surveil/cmd/init.py | 10 ++++++++++ tools/docker/shinken_container/Dockerfile | 2 ++ 3 files changed, 13 insertions(+) diff --git a/Dockerfile b/Dockerfile index 55d4837..6aab35f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ RUN apt-get install -y subversion && \ svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/packs/generic-host /packs/generic-host && \ svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/packs/linux-glance /packs/linux-glance && \ svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/packs/linux-keystone /packs/linux-keystone && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/packs/linux-nova /packs/linux-nova && \ apt-get remove -y subversion ADD requirements.txt surveil/requirements.txt diff --git a/surveil/cmd/init.py b/surveil/cmd/init.py index 81c0ddf..7078d5d 100644 --- a/surveil/cmd/init.py +++ b/surveil/cmd/init.py @@ -71,6 +71,16 @@ def main(): "/packs/generic-host/", ] ) + + subprocess.call( + [ + "surveil-pack-upload", + "--mongo-url=mongo", + "--mongo-port=27017", + "/packs/linux-nova/", + ] + ) + else: print("Skipping pack upload...") diff --git a/tools/docker/shinken_container/Dockerfile b/tools/docker/shinken_container/Dockerfile index 8d8a487..1400e92 100644 --- a/tools/docker/shinken_container/Dockerfile +++ b/tools/docker/shinken_container/Dockerfile @@ -30,6 +30,7 @@ RUN chmod u+s /bin/ping6 RUN apt-get update && apt-get install -y subversion && \ svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/plugins/check-glance /plugins/check_glance && \ svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/plugins/check-keystone /plugins/check_keystone && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/plugins/check-nova /plugins/check_nova && \ apt-get remove -y subversion ## Install plugins dependencies @@ -38,6 +39,7 @@ RUN pip install shinkenplugins python-keystoneclient python-glanceclient ## Install Plugins RUN cd /plugins/check_glance && sudo pip install --upgrade . RUN cd /plugins/check_keystone && sudo pip install --upgrade . +RUN cd /plugins/check_nova && sudo pip install --upgrade . ## packs RUN sh -c 'gpg --recv-keys --keyserver keyserver.ubuntu.com 2320E8F8 && gpg --export --armor 2320E8F8 | apt-key add -' && \