add datadog

Anandkumar Patel · Anandkumar Patel · commit 849872d1594e · 2017-05-05T12:15:20.000-07:00
diff --git a/ansible/datadog.yml b/ansible/datadog.yml
@@ -5,5 +5,4 @@
   roles:
   - role: notify
 
-  - role: k8-deployment
-  - role: k8-service
+  - role: datadog-daemon
diff --git a/ansible/group_vars/alpha-api-base.yml b/ansible/group_vars/alpha-api-base.yml
@@ -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
diff --git a/ansible/group_vars/alpha-arithmancy.yml b/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
diff --git a/ansible/group_vars/alpha-big-poppa-base.yml b/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
diff --git a/ansible/group_vars/alpha-cream-base.yml b/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
diff --git a/ansible/group_vars/alpha-docker-listener.yml b/ansible/group_vars/alpha-docker-listener.yml
@@ -14,7 +14,7 @@ container_envs:
   - name: CONSUL_HOST
     value: "{{ consul_host_address }}:{{ consul_api_port }}"
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: DOCKER_CERT_PATH
diff --git a/ansible/group_vars/alpha-drake-base.yml b/ansible/group_vars/alpha-drake-base.yml
@@ -16,7 +16,7 @@ drake_base_container_envs:
   - name: API_URL
     value: "{{ api_url }}"
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: NODE_ENV
diff --git a/ansible/group_vars/alpha-kartographer.yml b/ansible/group_vars/alpha-kartographer.yml
@@ -10,7 +10,7 @@ container_envs:
   - name: CONFIG_FILE_PATH
     value: "{{ kube_config }}/{{ kube_config_name }}"
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: GOOGLE_APPLICATION_CREDENTIALS
diff --git a/ansible/group_vars/alpha-khronos.yml b/ansible/group_vars/alpha-khronos.yml
@@ -82,7 +82,7 @@ container_envs:
   - name: CANARY_REBUILD_NAVI_URL
     value: "{{ khronos_canary_rebuild_navi_url | default('undefined') }}"
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: INTERCOM_API_KEY
diff --git a/ansible/group_vars/alpha-link.yml b/ansible/group_vars/alpha-link.yml
@@ -9,7 +9,7 @@ container_envs:
   - name: API_URL
     value: "{{ api_url }}"
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: HELLO_RUNNABLE_GITHUB_TOKEN
diff --git a/ansible/group_vars/alpha-navi.yml b/ansible/group_vars/alpha-navi.yml
@@ -15,7 +15,7 @@ container_envs:
   - name: COOKIE_SECRET
     value: "{{ navi_cookie_secret }}"
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: ENABLE_LRU_CACHE
diff --git a/ansible/group_vars/alpha-optimus.yml b/ansible/group_vars/alpha-optimus.yml
@@ -10,7 +10,7 @@ container_envs:
   - name: NODE_ENV
     value: "{{ node_env }}"
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: PORT
diff --git a/ansible/group_vars/alpha-palantiri.yml b/ansible/group_vars/alpha-palantiri.yml
@@ -16,7 +16,7 @@ container_envs:
   - name: NODE_ENV
     value: "{{ node_env }}"
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: RABBITMQ_HOSTNAME
diff --git a/ansible/group_vars/alpha-pheidi.yml b/ansible/group_vars/alpha-pheidi.yml
@@ -17,7 +17,7 @@ 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: DOMAIN
diff --git a/ansible/group_vars/alpha-sauron.yml b/ansible/group_vars/alpha-sauron.yml
@@ -24,7 +24,7 @@ container_envs:
   - name: CONSUL_HOST
     value: "{{ consul_host_address }}:{{ consul_api_port }}"
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: LOGGLY_TOKEN
diff --git a/ansible/group_vars/alpha-shiva.yml b/ansible/group_vars/alpha-shiva.yml
@@ -9,7 +9,7 @@ container_run_args: npm run shiva-start
 
 container_envs:
   - name: DATADOG_HOST
-    value: "{{ datadog_host_address }}"
+    valueFrom: "spec.nodeName"
   - name: DATADOG_PORT
     value: "{{ datadog_port }}"
   - name: RABBITMQ_HOSTNAME
diff --git a/ansible/k8/delta/datadog/daemonSets/datadog b/ansible/k8/delta/datadog/daemonSets/datadog
@@ -0,0 +1,48 @@
+apiVersion: extensions/v1beta1
+kind: DaemonSet
+metadata:
+  name: dd-agent
+spec:
+  template:
+    metadata:
+      labels:
+        app: dd-agent
+      name: dd-agent
+    spec:
+      containers:
+      - image: datadog/docker-dd-agent:latest
+        imagePullPolicy: Always
+        name: dd-agent
+        ports:
+          - containerPort: 8125
+            hostPort: 8125
+            name: dogstatsdport
+            protocol: UDP
+        env:
+          - name: API_KEY
+            value: d3ab5d85bca924f9d4e33d307beacb4a
+          - name: KUBERNETES
+            value: "yes"
+          - name: SD_BACKEND
+            value: docker
+          - name: TAGS
+            value: "env:delta"
+        volumeMounts:
+          - name: dockersocket
+            mountPath: /var/run/docker.sock
+          - name: procdir
+            mountPath: /host/proc
+            readOnly: true
+          - name: cgroups
+            mountPath: /host/sys/fs/cgroup
+            readOnly: true
+      volumes:
+        - hostPath:
+            path: /var/run/docker.sock
+          name: dockersocket
+        - hostPath:
+            path: /proc
+          name: procdir
+        - hostPath:
+            path: /sys/fs/cgroup
+          name: cgroups
diff --git a/ansible/k8/delta/khronos/deployments/khronos b/ansible/k8/delta/khronos/deployments/khronos
@@ -27,6 +27,7 @@ spec:
             - 1h
             - npm
             - start
+
           env:
             - name: API_SOCKET_SERVER
               value: "https://apisock.runnable.io"
@@ -51,7 +52,9 @@ spec:
             - name: CANARY_REBUILD_NAVI_URL
               value: "http://canary-build-staging-runnabletest.runnableapp.com:8000/"
             - name: DATADOG_HOST
-              value: "datadog"
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
             - name: DATADOG_PORT
               value: "8125"
             - name: INTERCOM_API_KEY
@@ -82,6 +85,7 @@ spec:
               value: "80"
             - name: GITHUB_PROTOCOL
               value: "http"
+
           volumeMounts:
             - name: khronos-docker-ssl-certs
               mountPath: /etc/ssl/docker
diff --git a/ansible/k8/gamma/datadog/daemonSets/datadog b/ansible/k8/gamma/datadog/daemonSets/datadog
@@ -0,0 +1,48 @@
+apiVersion: extensions/v1beta1
+kind: DaemonSet
+metadata:
+  name: dd-agent
+spec:
+  template:
+    metadata:
+      labels:
+        app: dd-agent
+      name: dd-agent
+    spec:
+      containers:
+      - image: datadog/docker-dd-agent:latest
+        imagePullPolicy: Always
+        name: dd-agent
+        ports:
+          - containerPort: 8125
+            hostPort: 8125
+            name: dogstatsdport
+            protocol: UDP
+        env:
+          - name: API_KEY
+            value: d3ab5d85bca924f9d4e33d307beacb4a
+          - name: KUBERNETES
+            value: "yes"
+          - name: SD_BACKEND
+            value: docker
+          - name: TAGS
+            value: "env:gamma"
+        volumeMounts:
+          - name: dockersocket
+            mountPath: /var/run/docker.sock
+          - name: procdir
+            mountPath: /host/proc
+            readOnly: true
+          - name: cgroups
+            mountPath: /host/sys/fs/cgroup
+            readOnly: true
+      volumes:
+        - hostPath:
+            path: /var/run/docker.sock
+          name: dockersocket
+        - hostPath:
+            path: /proc
+          name: procdir
+        - hostPath:
+            path: /sys/fs/cgroup
+          name: cgroups
diff --git a/ansible/roles/datadog-daemon/tasks/main.yml b/ansible/roles/datadog-daemon/tasks/main.yml
@@ -0,0 +1,11 @@
+---
+- name: create daemon set folder
+  file:
+    state: directory
+    path: "{{ daemon_sets_path }}"
+
+- name: create datadog daemonset
+  tags: [ deploy ]
+  template:
+    dest: "{{ daemon_sets_path }}/{{ name }}"
+    src: datadog-deamon.yml
diff --git a/ansible/roles/datadog-daemon/templates/datadog-deamon.yml b/ansible/roles/datadog-daemon/templates/datadog-deamon.yml
@@ -15,15 +15,18 @@ spec:
         name: dd-agent
         ports:
           - containerPort: 8125
+            hostPort: 8125
             name: dogstatsdport
             protocol: UDP
         env:
           - name: API_KEY
-            value: d3ab5d85bca924f9d4e33d307beacb4a
+            value: {{ datadog_api_key }}
           - name: KUBERNETES
             value: "yes"
           - name: SD_BACKEND
             value: docker
+          - name: TAGS
+            value: "env:{{ env }}"
         volumeMounts:
           - name: dockersocket
             mountPath: /var/run/docker.sock
diff --git a/ansible/roles/k8-deployment/templates/deployment.yml b/ansible/roles/k8-deployment/templates/deployment.yml
@@ -44,10 +44,17 @@ spec:
 {% if container_envs is defined %}
           env:
 {% for env in container_envs %}
-{% if env.value != 'ansible_undefined' %}
+{% if (env.value is defined and env.value != 'ansible_undefined') or env.valueFrom is defined %}
             - name: {{ env.name }}
+{% if env.value is defined %}
               value: "{{ env.value }}"
 {% endif %}
+{% if env.valueFrom is defined %}
+              valueFrom:
+                fieldRef:
+                  fieldPath: {{ env.valueFrom }}
+{% endif %}
+{% endif %}
 {% endfor %}
 {% endif %}
 {% if add_capabilities is defined %}
