x/surveil
Code Issues Proposed changes

Added linux-openstackceilometer pack

Browse Source 
Change-Id: Icf26411118f3727d453086758bbd27312004dfd2
This commit is contained in:
aviau 2015-05-25 11:57:31 -04:00 committed by Alexandre Viau
parent d012426a62
commit f3deddbcdb
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@ -18,6 +18,7 @@ RUN apt-get install -y subversion && \
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-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-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-nova /packs/linux-nova && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/branches/linux_openstackceilometer/packs/linux-openstackceilometer /packs/linux-openstackceilometer && \
apt-get remove -y subversion apt-get remove -y subversion
ADD requirements.txt /opt/surveil/requirements.txt ADD requirements.txt /opt/surveil/requirements.txt

24
surveil/cmd/init.py
View File

@ -90,6 +90,15 @@ def main():
] ]
) )
subprocess.call(
[
"surveil-pack-upload",
"--mongo-url=mongo",
"--mongo-port=27017",
"/packs/linux-openstackceilometer/",
]
)
else: else:
print("Skipping pack upload...") print("Skipping pack upload...")
@ -136,6 +145,21 @@ def main():
} }
) )
# Linux-openstackceilometer template
cli_surveil.config.hosts.create(
host_name='openstackceilometer-host',
use='linux-openstackceilometer',
address='127.0.0.1',
custom_fields={
"_OS_AUTH_URL": "bla",
"_OS_USERNAME": "bli",
"_OS_PASSWORD": "blo",
"_OS_TENANT_NAME": "blu",
"_KS_SERVICES": "bly",
"parents": "localhost"
}
)
# DOWN HOST (cant resolve) # DOWN HOST (cant resolve)
cli_surveil.config.hosts.create( cli_surveil.config.hosts.create(
host_name='srv-apache-01', host_name='srv-apache-01',

2
tools/docker/alignak_container/Dockerfile
View File

@ -66,6 +66,7 @@ RUN apt-get update && apt-get install -y subversion && \
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-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-nova /plugins/check_nova && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/plugins/check-cinder /plugins/check_cinder && \ svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/plugins/check-cinder /plugins/check_cinder && \
svn checkout https://github.com/savoirfairelinux/monitoring-tools/tags/${MONITORING_TOOLS_VERSION}/plugins/check-ceilometer /plugins/check_ceilometer && \
apt-get remove -y subversion apt-get remove -y subversion
## Install plugins dependencies ## Install plugins dependencies
@ -76,6 +77,7 @@ RUN cd /plugins/check_glance && sudo python setup.py install
RUN cd /plugins/check_keystone && sudo python setup.py install RUN cd /plugins/check_keystone && sudo python setup.py install
RUN cd /plugins/check_nova && sudo python setup.py install RUN cd /plugins/check_nova && sudo python setup.py install
RUN cd /plugins/check_cinder && sudo python setup.py install RUN cd /plugins/check_cinder && sudo python setup.py install
RUN cd /plugins/check_ceilometer && sudo python setup.py install
## packs ## packs
RUN sh -c 'gpg --recv-keys --keyserver keyserver.ubuntu.com 2320E8F8 && gpg --export --armor 2320E8F8 | apt-key add -' && \ RUN sh -c 'gpg --recv-keys --keyserver keyserver.ubuntu.com 2320E8F8 && gpg --export --armor 2320E8F8 | apt-key add -' && \