From 77011c5a99091e439306654e164974e863d1bffa Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Fri, 15 Jan 2016 15:09:49 -0800 Subject: [PATCH 1/6] Will need to run "ansible-playbook -i -e force_restart=true datadog.yml" to deploy. --- ansible/delta-hosts/variables | 1 - ansible/gamma-hosts/variables | 1 - ansible/group_vars/all.yml | 1 + ansible/roles/datadog/tasks/main.yml | 2 +- ansible/roles/datadog/templates/datadog.conf.j2 | 2 ++ 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables index cf7e411f..e30b7ce1 100644 --- a/ansible/delta-hosts/variables +++ b/ansible/delta-hosts/variables @@ -60,7 +60,6 @@ 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 domain=runnable.io mongo_port=27017 diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables index 7d808791..2403f1e5 100644 --- a/ansible/gamma-hosts/variables +++ b/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 diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index bb58e601..05f2a1af 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -52,6 +52,7 @@ consul_api_port: 8500 # datadog datadog_api_key: 6488896fe0c811965ef233b96809d70d +# not sure this ever gets referenced by anything datadog_host_address: "{{ ansible_default_ipv4.address }}" datadog_port: 8125 diff --git a/ansible/roles/datadog/tasks/main.yml b/ansible/roles/datadog/tasks/main.yml index 88668b6b..0e512d44 100644 --- a/ansible/roles/datadog/tasks/main.yml +++ b/ansible/roles/datadog/tasks/main.yml @@ -66,7 +66,7 @@ # assumes a config for {{ name }} exists - name: install datadog integrations sudo: yes - when: docker_config != "docks" + when: name is defined template: src="{{ name }}.yaml.j2" dest="/etc/dd-agent/conf.d/{{ name }}.yaml" diff --git a/ansible/roles/datadog/templates/datadog.conf.j2 b/ansible/roles/datadog/templates/datadog.conf.j2 index 75e6c65e..a3d0b063 100644 --- a/ansible/roles/datadog/templates/datadog.conf.j2 +++ b/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 From 8a42f1c6e3c4857f379ef47fa9f40244c3680524 Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Fri, 15 Jan 2016 19:20:06 -0800 Subject: [PATCH 2/6] only define no_dd_monitoring where it is needed. --- ansible/gamma-hosts/variables | 1 - ansible/roles/datadog/tasks/main.yml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables index 2403f1e5..f2059188 100644 --- a/ansible/gamma-hosts/variables +++ b/ansible/gamma-hosts/variables @@ -74,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 diff --git a/ansible/roles/datadog/tasks/main.yml b/ansible/roles/datadog/tasks/main.yml index 0e512d44..64803d0f 100644 --- a/ansible/roles/datadog/tasks/main.yml +++ b/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 From 37335bb09cefb4d3f9e3a96eb0a0aa8f35b6cc3b Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Mon, 18 Jan 2016 12:50:08 -0800 Subject: [PATCH 3/6] has_dd_integration is a variable switch to turn on/off integrations per service --- ansible/group_vars/alpha-mongo-navi.yml | 3 +++ ansible/group_vars/alpha-mongo.yml | 1 + ansible/group_vars/alpha-rabbitmq.yml | 4 ++-- ansible/roles/datadog/tasks/main.yml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ansible/group_vars/alpha-mongo-navi.yml b/ansible/group_vars/alpha-mongo-navi.yml index d82eed00..503c2fd8 100644 --- a/ansible/group_vars/alpha-mongo-navi.yml +++ b/ansible/group_vars/alpha-mongo-navi.yml @@ -14,3 +14,6 @@ container_run_opts: > -d -p 27017:27017 -v {{ db_path }}:/data/db:rw + +# DD integration for mongodb +has_dd_integration: true diff --git a/ansible/group_vars/alpha-mongo.yml b/ansible/group_vars/alpha-mongo.yml index 8afd6cdc..29f7437a 100644 --- a/ansible/group_vars/alpha-mongo.yml +++ b/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 diff --git a/ansible/group_vars/alpha-rabbitmq.yml b/ansible/group_vars/alpha-rabbitmq.yml index 6cf3ecf7..7712c509 100644 --- a/ansible/group_vars/alpha-rabbitmq.yml +++ b/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 diff --git a/ansible/roles/datadog/tasks/main.yml b/ansible/roles/datadog/tasks/main.yml index 64803d0f..49c6814a 100644 --- a/ansible/roles/datadog/tasks/main.yml +++ b/ansible/roles/datadog/tasks/main.yml @@ -66,7 +66,7 @@ # assumes a config for {{ name }} exists - name: install datadog integrations sudo: yes - when: name is defined + when: has_dd_integration is defined template: src="{{ name }}.yaml.j2" dest="/etc/dd-agent/conf.d/{{ name }}.yaml" From 3a1017eedd3261988b6b38046b8f98fd13ea377f Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Mon, 18 Jan 2016 12:53:11 -0800 Subject: [PATCH 4/6] datadog user for mongodb --- ansible/delta-hosts/variables | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables index e30b7ce1..bd0c1894 100644 --- a/ansible/delta-hosts/variables +++ b/ansible/delta-hosts/variables @@ -61,6 +61,8 @@ vault_aws_region=us-east-1 ansible_ssh_private_key_file=~/.ssh/delta.pem api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af datadog_tags=env:delta +datadog_mongodb_user=datadog +datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ domain=runnable.io mongo_port=27017 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead From 57bc162718f961ecedc4b25aa130c27fc1ffcd74 Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Mon, 18 Jan 2016 12:56:02 -0800 Subject: [PATCH 5/6] removing comment --- ansible/group_vars/all.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 05f2a1af..bb58e601 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -52,7 +52,6 @@ consul_api_port: 8500 # datadog datadog_api_key: 6488896fe0c811965ef233b96809d70d -# not sure this ever gets referenced by anything datadog_host_address: "{{ ansible_default_ipv4.address }}" datadog_port: 8125 From 3f3bb8f63679a8232f865b2c55a848bbc80daa80 Mon Sep 17 00:00:00 2001 From: "Christopher M. Neill" Date: Mon, 18 Jan 2016 12:59:26 -0800 Subject: [PATCH 6/6] we dont want to monitor navi mongodb just yet --- ansible/group_vars/alpha-mongo-navi.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/ansible/group_vars/alpha-mongo-navi.yml b/ansible/group_vars/alpha-mongo-navi.yml index 503c2fd8..d82eed00 100644 --- a/ansible/group_vars/alpha-mongo-navi.yml +++ b/ansible/group_vars/alpha-mongo-navi.yml @@ -14,6 +14,3 @@ container_run_opts: > -d -p 27017:27017 -v {{ db_path }}:/data/db:rw - -# DD integration for mongodb -has_dd_integration: true