From 2207cd580708c630c04c9d0c19aac25c57b0cfb3 Mon Sep 17 00:00:00 2001 From: aviau Date: Mon, 15 Jun 2015 10:41:04 -0400 Subject: [PATCH] surveil-init: Moved packs to /usr/lib/monitoring Change-Id: I682c8c902d2c153d673a8e18e8bd2f31120df5d3 --- Dockerfile | 12 ++++++------ surveil/cmd/init.py | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 82aa855..4870e01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,12 +13,12 @@ RUN useradd shinken && /opt/surveil/env/bin/pip install pycurl https://github.co # Download packs ENV MONITORING_TOOLS_VERSION 0.3.2 RUN apt-get install -y subversion && \ - 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 && \ - svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/packs/linux-openstackceilometer /packs/linux-openstackceilometer && \ + 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 && \ 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 9b1cdb8..88c0a00 100644 --- a/surveil/cmd/init.py +++ b/surveil/cmd/init.py @@ -50,7 +50,7 @@ def main(): "surveil-pack-upload", "--mongo-url=mongo", "--mongo-port=27017", - "/packs/linux-keystone/", + "/usr/lib/monitoring/packs/sfl/linux-keystone/", ] ) @@ -59,7 +59,7 @@ def main(): "surveil-pack-upload", "--mongo-url=mongo", "--mongo-port=27017", - "/packs/linux-glance/", + "/usr/lib/monitoring/packs/sfl/linux-glance/", ] ) @@ -68,7 +68,7 @@ def main(): "surveil-pack-upload", "--mongo-url=mongo", "--mongo-port=27017", - "/packs/generic-host/", + "/usr/lib/monitoring/packs/sfl/generic-host/", ] ) @@ -77,7 +77,7 @@ def main(): "surveil-pack-upload", "--mongo-url=mongo", "--mongo-port=27017", - "/packs/linux-nova/", + "/usr/lib/monitoring/packs/sfl/linux-nova/", ] ) @@ -86,7 +86,7 @@ def main(): "surveil-pack-upload", "--mongo-url=mongo", "--mongo-port=27017", - "/packs/linux-cinder/", + "/usr/lib/monitoring/packs/sfl/linux-cinder/", ] ) @@ -95,7 +95,7 @@ def main(): "surveil-pack-upload", "--mongo-url=mongo", "--mongo-port=27017", - "/packs/linux-openstackceilometer/", + "/usr/lib/monitoring/packs/sfl/linux-openstackceilometer/", ] )