x/surveil
Code Issues Proposed changes

Moved packs to /usr/share + renamed them

Browse Source 
Change-Id: I974e42b1c46920a22f35ac61625e3e090942919c
This commit is contained in:
aviau 2015-06-16 11:21:44 -04:00
parent 66ff64c093
commit 7e962e530d
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@ -8,17 +8,17 @@ RUN apt-get update && apt-get install -y vim python-pip python3-pip python-dev l
RUN virtualenv /opt/surveil/env
# Surveil needs alignak (as a lib)
RUN useradd shinken && /opt/surveil/env/bin/pip install pycurl https://github.com/Alignak-monitoring/alignak/archive/396d10105827f8c75686811991829548e6778e11.zip
RUN useradd alignak && /opt/surveil/env/bin/pip install pycurl https://github.com/Alignak-monitoring/alignak/archive/d7f457d5ed94f08d9a6a38809106d3e0d35a1712.tar.gz
# Download packs
ENV MONITORING_TOOLS_VERSION 0.3.2
ENV MONITORING_TOOLS_VERSION 0.4.0
RUN apt-get install -y subversion && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/generic-host /usr/lib/monitoring/packs/sfl/generic-host && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-glance /usr/lib/monitoring/packs/sfl/linux-glance && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-cinder /usr/lib/monitoring/packs/sfl/linux-cinder && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-keystone /usr/lib/monitoring/packs/sfl/linux-keystone && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-nova /usr/lib/monitoring/packs/sfl/linux-nova && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-openstackceilometer /usr/lib/monitoring/packs/linux-openstackceilometer && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/generic-host /usr/share/monitoring/packs/sfl/generic-host && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/openstack-glance /usr/share/monitoring/packs/sfl/openstack-glance && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/openstack-cinder /usr/share/monitoring/packs/sfl/openstack-cinder && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/openstack-keystone /usr/share/monitoring/packs/sfl/openstack-keystone && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/openstack-nova /usr/share/monitoring/packs/sfl/openstack-nova && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/openstack-host /usr/share/monitoring/packs/openstack-host && \
apt-get remove -y subversion
ADD requirements.txt /opt/surveil/requirements.txt

12
surveil/cmd/init.py
View File

@ -50,7 +50,7 @@ def main():
"surveil-pack-upload",
"--mongo-url=mongo",
"--mongo-port=27017",
"/usr/lib/monitoring/packs/sfl/linux-keystone/",
"/usr/share/monitoring/packs/sfl/openstack-keystone/",
]
)
@ -59,7 +59,7 @@ def main():
"surveil-pack-upload",
"--mongo-url=mongo",
"--mongo-port=27017",
"/usr/lib/monitoring/packs/sfl/linux-glance/",
"/usr/share/monitoring/packs/sfl/openstack-glance/",
]
)
@ -68,7 +68,7 @@ def main():
"surveil-pack-upload",
"--mongo-url=mongo",
"--mongo-port=27017",
"/usr/lib/monitoring/packs/sfl/generic-host/",
"/usr/share/monitoring/packs/sfl/generic-host/",
]
)
@ -77,7 +77,7 @@ def main():
"surveil-pack-upload",
"--mongo-url=mongo",
"--mongo-port=27017",
"/usr/lib/monitoring/packs/sfl/linux-nova/",
"/usr/share/monitoring/packs/sfl/openstack-nova/",
]
)
@ -86,7 +86,7 @@ def main():
"surveil-pack-upload",
"--mongo-url=mongo",
"--mongo-port=27017",
"/usr/lib/monitoring/packs/sfl/linux-cinder/",
"/usr/share/monitoring/packs/sfl/openstack-cinder/",
]
)
@ -95,7 +95,7 @@ def main():
"surveil-pack-upload",
"--mongo-url=mongo",
"--mongo-port=27017",
"/usr/lib/monitoring/packs/sfl/linux-openstackceilometer/",
"/usr/share/monitoring/packs/sfl/openstack-host/",
]
)