Merge remote-tracking branch 'origin/master' into SAN-6926-starlord-3

Author: Myztiq

ansible/datadog.yml

@@ -5,5 +5,4 @@
   roles:
   - role: notify
 
-  - role: k8-deployment
-  - role: k8-service
+  - role: datadog-daemon

ansible/delta-hosts/variables

@@ -168,7 +168,7 @@ marketing_aws_secret_key=sRvgsTPgHGnZ4cGd37YaF/3fbzv75P01bNBK4kgn
 ansible_ssh_private_key_file=~/.ssh/delta.pem
 api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
 bastion_sshd_port=60506
-builder=delta-api-2
+builder=delta-builder
 consul_host_address=10.8.6.122
 cream_stripe_publishable_key=pk_live_5yYYZlYIwY3LwvKFaXY0jNlm
 datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ
@@ -181,7 +181,7 @@ github_protocol=https
 is_github_enterprise=false
 mongo_hosts=10.8.4.216:27017,10.8.10.254:27017,10.8.13.89:27017
 mongo_port=27017
-navi_mongo=mongo
+navi_mongo=10.8.6.41
 new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
 node_env=production-delta
 pg_host=delta-infradb.cnksgdqarobf.us-west-2.rds.amazonaws.com

ansible/gamma-hosts/hosts

@@ -27,7 +27,7 @@ localhost
 [consul]
 localhost
 
-[deployer]
+[datadog]
 localhost
 
 [docker-listener]
@@ -144,7 +144,7 @@ big-poppa
 charon
 consul
 cream
-deployer
+datadog
 dock
 docker-listener
 docks

ansible/gamma-hosts/variables

@@ -153,7 +153,7 @@ volume_id=vol-040eb379856609100
 ansible_ssh_private_key_file=~/.ssh/gamma.pem
 api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
 bastion_sshd_port=60709
-builder=gamma-api-worker
+builder=gamma-builder
 consul_host_address=10.4.5.144
 cream_stripe_publishable_key=pk_test_sHr5tQaPtgwiE2cpW6dQkzi8
 datadog_mongodb_pwd=sqa3WBgkCgZsFZuex0kBNahZ

ansible/group_vars/all.yml

@@ -180,9 +180,9 @@ prometheus_port: 9090
 prometheus_aws_access_key: AKIAIFG37NSI6O2QMRRQ
 prometheus_aws_secret_key: 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
 
-# prometheus_alart
+# prometheus_alert
 prometheus_alert_port: 9093
-prometheus_alert_url: http://prometheus:{{ prometheus_alert_port }}
+prometheus_alert_url: http://prometheus-alerts:{{ prometheus_alert_port }}
 
 # rabbit
 rabbit_host_address: rabbitmq

ansible/group_vars/alpha-api-base.yml

@@ -1,4 +1,4 @@
-node_version: 4.2.2
+node_version: 4.4.3
 npm_version: 4.0.3
 
 repo: git@github.com:CodeNow/api.git
@@ -39,7 +39,7 @@ api_base_container_envs:
   - name: CREAM_HOST
     value: "http://{{ cream_host_address }}:{{ cream_port }}"
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: DOCKER_BUILD_LINE_TIMEOUT_MS

ansible/group_vars/alpha-arithmancy.yml

@@ -7,7 +7,7 @@ npm_version: "2.14.7"
 
 container_envs:
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: NODE_ENV

ansible/group_vars/alpha-big-poppa-base.yml

@@ -16,7 +16,7 @@ dockerfile_pre_install_commands: [
 
 big_poppa_base_container_envs:
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: GITHUB_TOKEN

ansible/group_vars/alpha-cream-base.yml

@@ -16,7 +16,7 @@ cream_base_container_envs:
   - name: BIG_POPPA_HOST
     value: "http://{{ big_poppa_host_address }}:{{ big_poppa_port }}"
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: GIT_BRANCH

ansible/group_vars/alpha-datadog.yml

@@ -3,7 +3,13 @@ name: datadog
 container_image: datadog/docker-dd-agent
 container_tag: latest-dogstatsd
 hosted_ports: ["{{ datadog_port }}"]
+protocol: UDP
 
 container_envs:
   - name: TAGS
     value: "env:{{ node_env }}"
+  - name: API_KEY
+    value: "{{ datadog_api_key }}"
+
+advance_arg: true
+container_run_args: "sed -i -e \\\"s/^# tags:.*$/tags: ${TAGS}/\\\" /etc/dd-agent/datadog.conf && supervisord -n -c /etc/dd-agent/supervisor.conf"