diff --git a/Dockerfile b/Dockerfile index 6aab35f..ec23776 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ RUN pip install python-surveilclient==0.5.1 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-cinder /packs/linux-cinder && \ 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 diff --git a/surveil/cmd/init.py b/surveil/cmd/init.py index 7078d5d..45e21ff 100644 --- a/surveil/cmd/init.py +++ b/surveil/cmd/init.py @@ -81,6 +81,15 @@ def main(): ] ) + subprocess.call( + [ + "surveil-pack-upload", + "--mongo-url=mongo", + "--mongo-port=27017", + "/packs/linux-cinder/", + ] + ) + else: print("Skipping pack upload...") diff --git a/tools/docker/shinken_container/Dockerfile b/tools/docker/shinken_container/Dockerfile index ef390e4..3abe894 100644 --- a/tools/docker/shinken_container/Dockerfile +++ b/tools/docker/shinken_container/Dockerfile @@ -39,15 +39,17 @@ 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 && \ + svn checkout https://github.com/savoirfairelinux/monitoring-tools/trunk/plugins/check-cinder /plugins/check_cinder && \ apt-get remove -y subversion ## Install plugins dependencies 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 . +RUN cd /plugins/check_glance && sudo pip install . +RUN cd /plugins/check_keystone && sudo pip install . +RUN cd /plugins/check_nova && sudo pip install . +RUN cd /plugins/check_cinder && sudo pip install . ## packs RUN sh -c 'gpg --recv-keys --keyserver keyserver.ubuntu.com 2320E8F8 && gpg --export --armor 2320E8F8 | apt-key add -' && \