From f9f3fb43da070dff0a5faf794c22e275a7f8c87b Mon Sep 17 00:00:00 2001 From: thejsj Date: Tue, 25 Apr 2017 18:16:16 -0700 Subject: [PATCH] Add datadog to all hosts --- ansible/group_vars/alpha-api-base.yml | 2 ++ ansible/group_vars/alpha-big-poppa-http.yml | 2 ++ ansible/group_vars/alpha-big-poppa-worker.yml | 2 ++ ansible/group_vars/alpha-cream-http.yml | 2 ++ ansible/group_vars/alpha-cream-worker.yml | 2 ++ ansible/group_vars/alpha-docker-listener.yml | 2 ++ ansible/group_vars/alpha-drake-http.yml | 2 ++ ansible/group_vars/alpha-drake-worker.yml | 2 ++ ansible/group_vars/alpha-khronos.yml | 2 ++ ansible/group_vars/alpha-link.yml | 2 ++ ansible/group_vars/alpha-navi.yml | 2 ++ ansible/group_vars/alpha-palantiri.yml | 2 ++ ansible/group_vars/alpha-pheidi.yml | 2 ++ ansible/group_vars/alpha-sauron.yml | 2 ++ ansible/group_vars/alpha-shiva.yml | 2 ++ 15 files changed, 30 insertions(+) diff --git a/ansible/group_vars/alpha-api-base.yml b/ansible/group_vars/alpha-api-base.yml index b536122..8251ef9 100644 --- a/ansible/group_vars/alpha-api-base.yml +++ b/ansible/group_vars/alpha-api-base.yml @@ -24,6 +24,8 @@ api_base_container_envs: >- -e BIG_POPPA_HOST=http://{{ big_poppa_host_address }}:{{ big_poppa_port }} -e COOKIE_DOMAIN={{ domain }} -e CONTAINER_STOP_LIMIT=10 + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e DOCKER_IMAGE_BUILDER_NAME={{ registry_host }}/runnable/image-builder -e DOCKER_IMAGE_BUILDER_CACHE=/git-cache -e DOCKER_IMAGE_BUILDER_LAYER_CACHE=/layer-cache diff --git a/ansible/group_vars/alpha-big-poppa-http.yml b/ansible/group_vars/alpha-big-poppa-http.yml index 4f61a30..f31dbda 100644 --- a/ansible/group_vars/alpha-big-poppa-http.yml +++ b/ansible/group_vars/alpha-big-poppa-http.yml @@ -21,6 +21,8 @@ dockerfile_pre_install_commands: [ # for container settings container_envs: > + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e GITHUB_TOKEN={{ big_poppa_github_token }} -e INTERCOM_API_KEY={{ big_poppa_intercom_key | default('undefined') }} -e INTERCOM_APP_ID={{ big_poppa_intercom_id | default('undefined') }} diff --git a/ansible/group_vars/alpha-big-poppa-worker.yml b/ansible/group_vars/alpha-big-poppa-worker.yml index 5c2180e..45bf8a6 100644 --- a/ansible/group_vars/alpha-big-poppa-worker.yml +++ b/ansible/group_vars/alpha-big-poppa-worker.yml @@ -20,6 +20,8 @@ dockerfile_pre_install_commands: [ # for container settings container_envs: > + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e GITHUB_TOKEN={{ big_poppa_github_token }} -e INTERCOM_API_KEY={{ big_poppa_intercom_key | default('undefined') }} -e INTERCOM_APP_ID={{ big_poppa_intercom_id | default('undefined') }} diff --git a/ansible/group_vars/alpha-cream-http.yml b/ansible/group_vars/alpha-cream-http.yml index 2873fdb..8340459 100644 --- a/ansible/group_vars/alpha-cream-http.yml +++ b/ansible/group_vars/alpha-cream-http.yml @@ -18,6 +18,8 @@ dockerfile_pre_install_commands: [ # for container settings container_envs: > -e BIG_POPPA_HOST=http://{{ big_poppa_host_address }}:{{ big_poppa_port }} + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e GIT_BRANCH={{ git_branch }} -e HELLO_RUNNABLE_GITHUB_TOKEN={{ cream_hello_runnable_github_token }} -e PORT={{ hosted_ports[0] }} diff --git a/ansible/group_vars/alpha-cream-worker.yml b/ansible/group_vars/alpha-cream-worker.yml index 37df676..78df8df 100644 --- a/ansible/group_vars/alpha-cream-worker.yml +++ b/ansible/group_vars/alpha-cream-worker.yml @@ -17,6 +17,8 @@ dockerfile_pre_install_commands: [ # for container settings container_envs: > -e BIG_POPPA_HOST=http://{{ big_poppa_host_address }}:{{ big_poppa_port }} + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e GIT_BRANCH={{ git_branch }} -e HELLO_RUNNABLE_GITHUB_TOKEN={{ cream_hello_runnable_github_token }} -e NODE_ENV={{ node_env }} diff --git a/ansible/group_vars/alpha-docker-listener.yml b/ansible/group_vars/alpha-docker-listener.yml index 60dc7ea..2c24e83 100644 --- a/ansible/group_vars/alpha-docker-listener.yml +++ b/ansible/group_vars/alpha-docker-listener.yml @@ -10,6 +10,8 @@ restart_policy: "always" container_envs: > -e CONSUL_HOST={{ consul_host_address }}:{{ consul_https_port }} + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e IMAGE_INSPECT_LIST=localhost,registry.runnable.com,runnable -e DOCKER_CERT_PATH=/etc/ssl/docker -e NODE_ENV={{ node_env }} diff --git a/ansible/group_vars/alpha-drake-http.yml b/ansible/group_vars/alpha-drake-http.yml index f75872a..dd139cd 100644 --- a/ansible/group_vars/alpha-drake-http.yml +++ b/ansible/group_vars/alpha-drake-http.yml @@ -15,6 +15,8 @@ is_redis_update_required: 'yes' container_envs: > -e API_URL={{ api_url }} -e DATADOG_SECRET=datadog-secret + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e NODE_ENV={{ node_env }} -e PORT={{ hosted_ports[0] }} -e RABBITMQ_HOSTNAME={{ rabbit_host_address }} diff --git a/ansible/group_vars/alpha-drake-worker.yml b/ansible/group_vars/alpha-drake-worker.yml index 37d063f..7d1806e 100644 --- a/ansible/group_vars/alpha-drake-worker.yml +++ b/ansible/group_vars/alpha-drake-worker.yml @@ -10,6 +10,8 @@ npm_version: 2 container_envs: > -e API_URL={{ api_url }} -e DATADOG_SECRET=datadog-secret + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e LOG_LEVEL=info -e NODE_ENV={{ node_env }} -e RABBITMQ_HOSTNAME={{ rabbit_host_address }} diff --git a/ansible/group_vars/alpha-khronos.yml b/ansible/group_vars/alpha-khronos.yml index 7466789..7d6f243 100644 --- a/ansible/group_vars/alpha-khronos.yml +++ b/ansible/group_vars/alpha-khronos.yml @@ -53,6 +53,8 @@ container_envs: > -e CANARY_LOG_TERMINAL_SLEEP=10 -e CANARY_REBUILD_INSTANCE_ID={{ khronos_canary_rebuild_instance_id | default('undefined') }} -e CANARY_REBUILD_NAVI_URL={{ khronos_canary_rebuild_navi_url | default('undefined') }} + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e DOCKER_USE_HTTP=true -e INTERCOM_API_KEY={{ khronos_intercom_api_key | default('undefined') }} -e INTERCOM_APP_ID={{ khronos_intercom_app_id | default('undefined') }} diff --git a/ansible/group_vars/alpha-link.yml b/ansible/group_vars/alpha-link.yml index ca3d1c2..6c514ce 100644 --- a/ansible/group_vars/alpha-link.yml +++ b/ansible/group_vars/alpha-link.yml @@ -8,6 +8,8 @@ npm_version: "2.14.7" container_envs: > -e API_URL={{ api_url }} + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e HELLO_RUNNABLE_GITHUB_TOKEN={{ link_hello_runnable_github_token }} -e MONGO=mongodb://{{ navi_mongo_auth }}@{{ mongo_hosts }}/{{ navi_mongo_database }} -e NODE_ENV={{ node_env }} diff --git a/ansible/group_vars/alpha-navi.yml b/ansible/group_vars/alpha-navi.yml index b47b561..1a7317e 100644 --- a/ansible/group_vars/alpha-navi.yml +++ b/ansible/group_vars/alpha-navi.yml @@ -17,6 +17,8 @@ container_envs: > -e CERT_PATH={{ content_domain_certs }} -e COOKIE_DOMAIN=.{{ user_content_domain }} -e COOKIE_SECRET={{ navi_cookie_secret }} + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e ENABLE_LRU_CACHE=1 -e ERROR_URL=http://{{ detention_host_address }}:{{ detention_port }} -e HTTP_PORT={{ hosted_ports[0] }} diff --git a/ansible/group_vars/alpha-palantiri.yml b/ansible/group_vars/alpha-palantiri.yml index 4c27565..487eb65 100644 --- a/ansible/group_vars/alpha-palantiri.yml +++ b/ansible/group_vars/alpha-palantiri.yml @@ -9,6 +9,8 @@ npm_version: "2.14.7" # container settings container_envs: > -e CONSUL_HOST={{ consul_host_address }}:{{ consul_https_port }} + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e NODE_ENV={{ node_env }} -e RABBITMQ_HOSTNAME={{ rabbit_host_address }} -e RABBITMQ_PASSWORD={{ rabbit_password }} diff --git a/ansible/group_vars/alpha-pheidi.yml b/ansible/group_vars/alpha-pheidi.yml index e7c1e7f..95177ce 100644 --- a/ansible/group_vars/alpha-pheidi.yml +++ b/ansible/group_vars/alpha-pheidi.yml @@ -19,6 +19,8 @@ dockerfile_pre_install_commands: [ container_envs: > -e BIG_POPPA_HOST=http://{{ big_poppa_host_address }}:{{ big_poppa_port }} + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e DOMAIN={{ domain }} -e FULL_API_DOMAIN=https://api.{{ domain }} {% if pheidi_intercom_admin_id is defined %} -e INTERCOM_ADMIN_ID={{ pheidi_intercom_admin_id }} {% endif %} diff --git a/ansible/group_vars/alpha-sauron.yml b/ansible/group_vars/alpha-sauron.yml index 8e61a01..db35718 100644 --- a/ansible/group_vars/alpha-sauron.yml +++ b/ansible/group_vars/alpha-sauron.yml @@ -18,6 +18,8 @@ dockerfile_pre_install_commands: [ container_envs: > -e CONSUL_HOST={{ consul_host_address }}:{{ consul_https_port }} + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e NODE_ENV="{{ node_env }}" -e RABBITMQ_HOSTNAME="{{ rabbit_host_address }}" -e RABBITMQ_PASSWORD="{{ rabbit_password }}" diff --git a/ansible/group_vars/alpha-shiva.yml b/ansible/group_vars/alpha-shiva.yml index 9a62ad3..23091a4 100644 --- a/ansible/group_vars/alpha-shiva.yml +++ b/ansible/group_vars/alpha-shiva.yml @@ -11,6 +11,8 @@ npm_start_command: run shiva-start # container settings redis_ca_cert_path: /opt/ssl/{{ name }}/redis/ca.pem container_envs: > + {% if datadog_host_address is defined %} -e DATADOG_HOST={{ datadog_host_address }}{% endif %} + {% if datadog_port is defined %} -e DATADOG_PORT={{ datadog_port }}{% endif %} -e RABBITMQ_HOSTNAME={{ rabbit_host_address }} -e RABBITMQ_PASSWORD={{ rabbit_password }} -e RABBITMQ_PORT={{ rabbit_port }}