x/surveil
Code Issues Proposed changes

Merge "Adapted surveil-os-interface to new API"

Browse Source
This commit is contained in:
Jenkins 2015-07-30 16:12:23 +00:00 committed by Gerrit Code Review
commit e0876717ad
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose-production.yml
View File

@ -1,3 +1,9 @@
ambassador:
image: cpuguy83/docker-grand-ambassador
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
command: "-name surveil_surveil_1 -name surveil_alignak_1"
surveil: surveil:
#build: . #build: .
image: surveil/surveil:0.13.1 image: surveil/surveil:0.13.1

4
surveil/cmd/surveil_os_interface.py
View File

@ -177,13 +177,13 @@ def main():
file=sys.stderr) file=sys.stderr)
# Tags # Tags
instance_tags = daemon_config["SURVEIL_DEFAULT_TAGS"] instance_tags = daemon_config["SURVEIL_DEFAULT_TAGS"].split(',')
surveil_metadata_tags = event['payload']['metadata'].get( surveil_metadata_tags = event['payload']['metadata'].get(
'surveil_tags', 'surveil_tags',
None None
) )
if surveil_metadata_tags is not None: if surveil_metadata_tags is not None:
instance_tags += ',' + surveil_metadata_tags instance_tags += surveil_metadata_tags.split(',')
sclient.config.hosts.create( sclient.config.hosts.create(
host_name=event['payload']['hostname'], host_name=event['payload']['hostname'],