Shinken -> Alignak

Change-Id: I6df9e8a823145865cd03ea06d5571a725d1e5891
This commit is contained in:
aviau 2015-05-19 10:07:15 -04:00
parent b0aad5e44f
commit bec55da7d3
103 changed files with 13 additions and 13 deletions
Dockerfiledocker-compose-production.ymldocker-compose.yml
surveil/api
tools/docker/alignak_container
Dockerfile
etc/shinken
arbiters
brokers
certs
commands
contactgroups
contacts
daemons
dependencies
discovery
escalations
hostgroups
hosts
modules
notificationways
packs
pollers
reactionners
realms
receivers
resource.d
schedulers
servicegroups
services
shinken.cfg
templates
timeperiods

@ -4,8 +4,8 @@ MAINTAINER Alexandre Viau <alexandre.viau@savoirfairelinux.com>
RUN apt-get update && apt-get install -y vim python-pip python3-pip python-dev libffi-dev libssl-dev git python-pycurl RUN apt-get update && apt-get install -y vim python-pip python3-pip python-dev libffi-dev libssl-dev git python-pycurl
# Surveil needs shinken (as a lib) # Surveil needs alignak (as a lib)
RUN useradd shinken && pip install https://github.com/naparuba/shinken/archive/2.2-RC1.zip RUN useradd shinken && pip install https://github.com/Alignak-monitoring/alignak/archive/396d10105827f8c75686811991829548e6778e11.zip
# python-surveilclient (used by surveil-init) # python-surveilclient (used by surveil-init)
RUN pip install python-surveilclient==0.5.1 RUN pip install python-surveilclient==0.5.1

@ -1,10 +1,10 @@
surveil: surveil:
#build: . #build: .
image: savoirfairelinux/surveil:0.4.2 image: savoirfairelinux/surveil:0.4.3
links: links:
- mongo - mongo
- influxdb - influxdb
- shinken - alignak
ports: ports:
- "8080:8080" - "8080:8080"
environment: environment:
@ -16,9 +16,9 @@ surveil:
#SURVEIL_KEYSTONE_ADMIN_PASSWORD: "password" #SURVEIL_KEYSTONE_ADMIN_PASSWORD: "password"
#SURVEIL_KEYSTONE_ADMIN_TENANT_NAME: "admin" #SURVEIL_KEYSTONE_ADMIN_TENANT_NAME: "admin"
shinken: alignak:
#build: tools/docker/shinken_container/ #build: tools/docker/alignak_container/
image: savoirfairelinux/surveil-shinken:0.4.2 image: savoirfairelinux/surveil-alignak:0.4.3
links: links:
- mongo - mongo
- influxdb - influxdb

@ -3,7 +3,7 @@ surveil:
links: links:
- mongo - mongo
- influxdb - influxdb
- shinken - alignak
ports: ports:
- "8080:8080" - "8080:8080"
environment: environment:
@ -13,8 +13,8 @@ surveil:
command: bash -c "cd /opt/surveil && ./setup.sh && python setup.py develop && ((sleep 40 && surveil-init --demo) &) && sleep 20 && surveil-api --reload" command: bash -c "cd /opt/surveil && ./setup.sh && python setup.py develop && ((sleep 40 && surveil-init --demo) &) && sleep 20 && surveil-api --reload"
# privileged: true # Fedora users might want to uncomment this if they face permission issues # privileged: true # Fedora users might want to uncomment this if they face permission issues
shinken: alignak:
build: tools/docker/shinken_container/ build: tools/docker/alignak_container/
links: links:
- mongo - mongo
- influxdb - influxdb

@ -26,7 +26,7 @@ server = {
# as long as is it in the same format. # as long as is it in the same format.
surveil_api_config = { surveil_api_config = {
"mongodb_uri": "mongodb://mongo:27017", "mongodb_uri": "mongodb://mongo:27017",
"ws_arbiter_url": "http://shinken:7760", "ws_arbiter_url": "http://alignak:7760",
"influxdb_uri": "influxdb://root:root@influxdb:8086/db" "influxdb_uri": "influxdb://root:root@influxdb:8086/db"
} }

@ -5,7 +5,7 @@ MAINTAINER Alexandre Viau <alexandre.viau@savoirfairelinux.com>
RUN apt-get update && apt-get install -y vim supervisor python-dev libffi-dev libssl-dev nagios-nrpe-server wget RUN apt-get update && apt-get install -y vim supervisor python-dev libffi-dev libssl-dev nagios-nrpe-server wget
# libffi-devand libssl-dev are for python-cryptography # libffi-devand libssl-dev are for python-cryptography
### Shinken ### Alignak
RUN apt-get update && apt-get install -y python-pip git RUN apt-get update && apt-get install -y python-pip git
RUN useradd shinken && pip install https://github.com/gst/shinken/archive/19df05f2da13bdc6957ef1adf0660aa9f61c89f7.zip RUN useradd shinken && pip install https://github.com/gst/shinken/archive/19df05f2da13bdc6957ef1adf0660aa9f61c89f7.zip
RUN apt-get install -y python-pycurl RUN apt-get install -y python-pycurl

Some files were not shown because too many files have changed in this diff Show More