Merge pull request #272 from CodeNow/SAN-3356-datadog-all-the-things

ansiblize host-based datadog install

Author: und1sk0

ansible/delta-hosts/variables

@@ -60,8 +60,9 @@ vault_aws_region=us-east-1
 [delta:vars]
 ansible_ssh_private_key_file=~/.ssh/delta.pem
 api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
-datadog_host_address=10.8.5.63
 datadog_tags=env:delta
+datadog_mongodb_user=datadog
+datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ
 domain=runnable.io
 mongo_port=27017
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead

ansible/gamma-hosts/variables

@@ -59,7 +59,6 @@ vault_aws_region=us-east-1
 
 [gamma:vars]
 ansible_ssh_private_key_file=~/.ssh/gamma.pem
-datadog_host_address=10.4.6.251
 datadog_tags=env:gamma
 datadog_mongodb_user=datadog
 datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ
@@ -75,7 +74,6 @@ registry_host=10.4.4.82
 swarm_token=d363b783f03a845a2c82b081bfe8443e
 user_content_domain=runnable.ninja
 api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
-no_dd_monitoring=false
 
 [ec2:vars]
 env=gamma

ansible/group_vars/alpha-mongo.yml

@@ -10,3 +10,4 @@ container_run_opts: "-d --name mongodb -p 27017:27017 -v {{ db_path }}:/data/db:
 
 # do not monitor docker-daemon for mongo, as there is none
 no_dd_monitoring: true
+has_dd_integration: true

ansible/group_vars/alpha-rabbitmq.yml

@@ -10,5 +10,5 @@ container_tag: "3.5.3-management"
 container_run_opts: "-d --name prod-rabbit -v {{ db_path }}:/var/lib/rabbitmq:rw -v {{ config_path }}/rabbitmq.config:/etc/rabbitmq/rabbitmq.config:ro -p 54320:15672 -p 54321:5672"
 
 hosted_ports: [ 5672, 15672 ]
-# monitor the docker-daemon
-no_dd_monitoring: false
+# DD integration for RabbitMQ
+has_dd_integration: true

ansible/roles/datadog/tasks/main.yml

@@ -27,7 +27,7 @@
 
 - name: add docker to dd-agent group
   sudo: yes
-  when: no_dd_monitoring != true
+  when: no_dd_monitoring is defined
   user:
     name=dd-agent
     groups=docker
@@ -57,7 +57,7 @@
 
 - name: install docker integration
   sudo: yes
-  when: no_dd_monitoring != true
+  when: no_dd_monitoring is defined
   template:
     src=docker_daemon.yaml.j2
     dest=/etc/dd-agent/conf.d/docker_daemon.yaml
@@ -66,7 +66,7 @@
 # assumes a config for {{ name }} exists
 - name: install datadog integrations
   sudo: yes
-  when: docker_config != "docks"
+  when: has_dd_integration is defined
   template:
     src="{{ name }}.yaml.j2"
     dest="/etc/dd-agent/conf.d/{{ name }}.yaml"

ansible/roles/datadog/templates/datadog.conf.j2

@@ -6,3 +6,5 @@ dd_url: https://app.datadoghq.com
 api_key: {{ datadog_api_key }}
 
 use_mount: no
+
+bind_host: 0.0.0.0