From f64e8d53e9d72c69230db255d01556f1fe0472a8 Mon Sep 17 00:00:00 2001 From: aviau Date: Thu, 18 Jun 2015 12:35:30 -0400 Subject: [PATCH] Moved alignak plugins path Change-Id: I93dbb55d4bd95bfae3e2232fc823ecb5e236c242 --- tools/docker/alignak_container/Dockerfile | 16 ++++++++-------- .../etc/alignak/resource.d/paths.cfg | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/docker/alignak_container/Dockerfile b/tools/docker/alignak_container/Dockerfile index 0f8f9d4..1b465df 100644 --- a/tools/docker/alignak_container/Dockerfile +++ b/tools/docker/alignak_container/Dockerfile @@ -94,13 +94,13 @@ ENV PATH=$PATH:/opt/surveilplugins/env/bin RUN /opt/surveilplugins/env/bin/pip install "pbr>=0.6,!=0.7,<1.0" shinkenplugins python-keystoneclient python-glanceclient ## Install Plugins -RUN mkdir -p /usr/lib/alignak/plugins -RUN cd /plugins/check_keystone && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_keystone /usr/lib/alignak/plugins/ -RUN cd /plugins/check_glance && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_glance /usr/lib/alignak/plugins/ -RUN cd /plugins/check_nova && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_nova /usr/lib/alignak/plugins/ -RUN cd /plugins/check_cinder && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_cinder /usr/lib/alignak/plugins/ -RUN cd /plugins/check_ceilometer && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_ceilometer /usr/lib/alignak/plugins/ -RUN cd /plugins/check_nova_host_status && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_nova_host_status /usr/lib/alignak/plugins/ +RUN mkdir -p /usr/lib/monitoring/plugins/sfl +RUN cd /plugins/check_keystone && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_keystone /usr/lib/monitoring/plugins/sfl/ +RUN cd /plugins/check_glance && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_glance /usr/lib/monitoring/plugins/sfl/ +RUN cd /plugins/check_nova && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_nova /usr/lib/monitoring/plugins/sfl/ +RUN cd /plugins/check_cinder && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_cinder /usr/lib/monitoring/plugins/sfl/ +RUN cd /plugins/check_ceilometer && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_ceilometer /usr/lib/monitoring/plugins/sfl/ +RUN cd /plugins/check_nova_host_status && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_nova_host_status /usr/lib/monitoring/plugins/sfl/ ## packs RUN sh -c 'gpg --recv-keys --keyserver keyserver.ubuntu.com 2320E8F8 && gpg --export --armor 2320E8F8 | apt-key add -' && \ @@ -113,7 +113,7 @@ ADD plugins/check-example /plugins/check_example RUN virtualenv /plugins/check_example/env ENV PATH=$PATH:/plugins/check_example/env/bin RUN /plugins/check_example/env/bin/pip install -r /plugins/check_example/requirements.txt -RUN cd /plugins/check_example && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_example /usr/lib/alignak/plugins/ +RUN cd /plugins/check_example && sudo /opt/surveilplugins/env/bin/python setup.py install && ln -s /opt/surveilplugins/env/bin/check_example /usr/lib/monitoring/plugins/sfl ## configuration ADD setup.sh /setup.sh diff --git a/tools/docker/alignak_container/etc/alignak/resource.d/paths.cfg b/tools/docker/alignak_container/etc/alignak/resource.d/paths.cfg index 1e94ef5..239fb25 100644 --- a/tools/docker/alignak_container/etc/alignak/resource.d/paths.cfg +++ b/tools/docker/alignak_container/etc/alignak/resource.d/paths.cfg @@ -3,5 +3,5 @@ $USER1$=$NAGIOSPLUGINSDIR$ $NAGIOSPLUGINSDIR$=/usr/lib/nagios/plugins #-- Location of the plugins for Shinken -$PLUGINSDIR$=/usr/lib/alignak/plugins +$PLUGINSDIR$=/usr/lib/monitoring/plugins