From 465d1fa9d50b78816e4da5537e123d837a95d680 Mon Sep 17 00:00:00 2001 From: aviau Date: Thu, 16 Apr 2015 15:53:03 -0400 Subject: [PATCH] Now use shinken2.4 Change-Id: Ifaf6ea8cccf93b917ea9b798b41ee1a1d208051d --- tools/docker/shinken_container/Dockerfile | 7 ++----- .../etc/shinken/arbiters/arbiter-master.cfg | 2 +- .../shinken_container/etc/shinken/daemons/brokerd.ini | 2 +- .../shinken_container/etc/shinken/daemons/pollerd.ini | 2 +- .../shinken_container/etc/shinken/daemons/reactionnerd.ini | 2 +- .../shinken_container/etc/shinken/daemons/receiverd.ini | 2 +- .../shinken_container/etc/shinken/daemons/schedulerd.ini | 2 +- tools/docker/shinken_container/etc/shinken/shinken.cfg | 2 +- 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/tools/docker/shinken_container/Dockerfile b/tools/docker/shinken_container/Dockerfile index 65d7a11..af74db0 100644 --- a/tools/docker/shinken_container/Dockerfile +++ b/tools/docker/shinken_container/Dockerfile @@ -9,14 +9,11 @@ RUN apt-get install -y vim supervisor python-dev libffi-dev libssl-dev ### Shinken RUN apt-get install -y python-pip -RUN sh -c 'gpg --recv-keys --keyserver pgp.mit.edu 2320E8F8 && gpg --export --armor 2320E8F8 | apt-key add -' && \ - echo 'deb http://deb.kaji-project.org/ubuntu14.04/ amakuni main' >> /etc/apt/sources.list.d/kaji.list && \ - apt-get update -RUN apt-get install -y shinken-common +RUN useradd shinken && pip install https://github.com/naparuba/shinken/archive/5fc7ab61644152ae752b55cee28cc5c9a346591b.zip +RUN apt-get install -y python-pycurl RUN shinken --init ## modules -RUN mkdir /var/lib/shinken/share /var/lib/shinken/doc /var/lib/shinken/inventory RUN shinken install webui RUN shinken install auth-cfg-password RUN pip install influxdb && shinken install mod-influxdb diff --git a/tools/docker/shinken_container/etc/shinken/arbiters/arbiter-master.cfg b/tools/docker/shinken_container/etc/shinken/arbiters/arbiter-master.cfg index aa724d1..804485f 100644 --- a/tools/docker/shinken_container/etc/shinken/arbiters/arbiter-master.cfg +++ b/tools/docker/shinken_container/etc/shinken/arbiters/arbiter-master.cfg @@ -35,7 +35,7 @@ define arbiter { # - FileTag = Tag an host if it's on a flat file # - CSVTag = Tag an host from the content of a CSV file - modules named-pipe,mongodb,ws-arbiter + modules mongodb,ws-arbiter #modules named-pipe, mongodb, nsca, VMWare_auto_linking, ws-arbiter, Collectd, mport-landscape, SnmpBooster, AWS # Enable https or not diff --git a/tools/docker/shinken_container/etc/shinken/daemons/brokerd.ini b/tools/docker/shinken_container/etc/shinken/daemons/brokerd.ini index 52e9cdc..4cc8d2e 100644 --- a/tools/docker/shinken_container/etc/shinken/daemons/brokerd.ini +++ b/tools/docker/shinken_container/etc/shinken/daemons/brokerd.ini @@ -43,6 +43,6 @@ log_level=WARNING max_queue_size=100000 -modules_dir=/usr/share/pyshared/shinken/modules/ +modules_dir=/var/lib/shinken/modules user=shinken group=shinken diff --git a/tools/docker/shinken_container/etc/shinken/daemons/pollerd.ini b/tools/docker/shinken_container/etc/shinken/daemons/pollerd.ini index 58e1d12..d4e202d 100644 --- a/tools/docker/shinken_container/etc/shinken/daemons/pollerd.ini +++ b/tools/docker/shinken_container/etc/shinken/daemons/pollerd.ini @@ -36,6 +36,6 @@ local_log=%(logdir)s/pollerd.log log_level=WARNING -modules_dir=/usr/share/pyshared/shinken/modules/ +modules_dir=/var/lib/shinken/modules user=shinken group=shinken diff --git a/tools/docker/shinken_container/etc/shinken/daemons/reactionnerd.ini b/tools/docker/shinken_container/etc/shinken/daemons/reactionnerd.ini index 59e2375..12c7ae9 100644 --- a/tools/docker/shinken_container/etc/shinken/daemons/reactionnerd.ini +++ b/tools/docker/shinken_container/etc/shinken/daemons/reactionnerd.ini @@ -31,6 +31,6 @@ local_log=%(logdir)s/reactionnerd.log # accepted log level values= DEBUG,INFO,WARNING,ERROR,CRITICAL log_level=WARNING -modules_dir=/usr/share/pyshared/shinken/modules/ +modules_dir=/var/lib/shinken/modules user=shinken group=shinken diff --git a/tools/docker/shinken_container/etc/shinken/daemons/receiverd.ini b/tools/docker/shinken_container/etc/shinken/daemons/receiverd.ini index feb3ea8..b58c89f 100644 --- a/tools/docker/shinken_container/etc/shinken/daemons/receiverd.ini +++ b/tools/docker/shinken_container/etc/shinken/daemons/receiverd.ini @@ -31,6 +31,6 @@ local_log=%(logdir)s/receiverd.log # accepted log level values= DEBUG,INFO,WARNING,ERROR,CRITICAL log_level=WARNING -modules_dir=/usr/share/pyshared/shinken/modules/ +modules_dir=/var/lib/shinken/modules user=shinken group=shinken diff --git a/tools/docker/shinken_container/etc/shinken/daemons/schedulerd.ini b/tools/docker/shinken_container/etc/shinken/daemons/schedulerd.ini index 19b41ec..9425ce2 100644 --- a/tools/docker/shinken_container/etc/shinken/daemons/schedulerd.ini +++ b/tools/docker/shinken_container/etc/shinken/daemons/schedulerd.ini @@ -36,6 +36,6 @@ local_log=%(logdir)s/schedulerd.log # accepted log level values= DEBUG,INFO,WARNING,ERROR,CRITICAL log_level=WARNING -modules_dir=/usr/share/pyshared/shinken/modules/ +modules_dir=/var/lib/shinken/modules user=shinken group=shinken diff --git a/tools/docker/shinken_container/etc/shinken/shinken.cfg b/tools/docker/shinken_container/etc/shinken/shinken.cfg index fe122b9..3717ee7 100644 --- a/tools/docker/shinken_container/etc/shinken/shinken.cfg +++ b/tools/docker/shinken_container/etc/shinken/shinken.cfg @@ -116,7 +116,7 @@ shinken_user=shinken shinken_group=shinken # The path to the modules directory -modules_dir=/usr/share/pyshared/shinken/modules/ +modules_dir=/var/lib/shinken/modules # Set to 0 if you want to make this daemon (arbiter) NOT run daemon_enabled=1