x/surveil
Code Issues Proposed changes

Specify monitoring tools version

Browse Source 
Change-Id: Iabba036c9713506e4514737f741cc60459bbfc55
This commit is contained in:
aviau 2015-05-15 08:55:15 -04:00
parent fe0c7b8571
commit 72b4fd6451
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -11,12 +11,13 @@ RUN useradd shinken && pip install https://github.com/naparuba/shinken/archive/2
RUN pip install python-surveilclient==0.5.1
# Download packs
ENV MONITORING_TOOLS_VERSION 0.1.0
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 && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/generic-host /packs/generic-host && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-glance /packs/linux-glance && \
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 && \
apt-get remove -y subversion
ADD requirements.txt surveil/requirements.txt

9
tools/docker/shinken_container/Dockerfile
View File

@ -56,11 +56,12 @@ RUN chmod u+s /bin/ping
RUN chmod u+s /bin/ping6
# Download plugins
ENV MONITORING_TOOLS_VERSION 0.1.0
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 && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/plugins/check-glance /plugins/check_glance && \
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 && \
apt-get remove -y subversion
## Install plugins dependencies