From 9cfcc7de0b317ea92b5d46dc775676a00144b4b8 Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Sat, 20 Jan 2018 22:08:49 -0500
Subject: [PATCH] update prod-private network to prod. docker doesn't seem to
 support - in the network names now

---
 .../services/graylog/docker-compose.yml       |  2 +-
 .../services/jenkins/docker-compose.yml       |  8 ++--
 .../services/services/cron/docker-compose.yml |  2 +-
 dockerfiles/services/services/dd-agent/.env   |  2 +
 .../services/dd-agent/docker-compose.yml      | 38 +++++++++++++++++++
 .../services/elasticsearch/docker-compose.yml |  2 +-
 .../services/loggly/docker-compose.yml        |  2 +-
 .../services/mariadb/docker-compose.yml       |  2 +-
 .../services/memcached/docker-compose.yml     |  2 +-
 .../services/mongo/docker-compose.yml         |  2 +-
 .../services/postgres/docker-compose.yml      |  2 +-
 .../services/redis/docker-compose.yml         |  2 +-
 .../services/sslproxy/docker-compose-prod.yml |  6 +--
 13 files changed, 56 insertions(+), 16 deletions(-)
 create mode 100644 dockerfiles/services/services/dd-agent/.env
 create mode 100644 dockerfiles/services/services/dd-agent/docker-compose.yml

diff --git a/dockerfiles/services/graylog/docker-compose.yml b/dockerfiles/services/graylog/docker-compose.yml
index f20c412..781143c 100644
--- a/dockerfiles/services/graylog/docker-compose.yml
+++ b/dockerfiles/services/graylog/docker-compose.yml
@@ -47,4 +47,4 @@ services:
 networks:
   default:
     external:
-      name: prod-private
+      name: prod
diff --git a/dockerfiles/services/jenkins/docker-compose.yml b/dockerfiles/services/jenkins/docker-compose.yml
index 59d9a37..fd6dd98 100644
--- a/dockerfiles/services/jenkins/docker-compose.yml
+++ b/dockerfiles/services/jenkins/docker-compose.yml
@@ -32,7 +32,7 @@ services:
         fluentd-address: "logs.xai-corp.net:24224"
         tag: jenkins
 
-networks:
-  default:
-    external:
-      name: prod-private
+#networks:
+#  default:
+#    external:
+#      name: prod
diff --git a/dockerfiles/services/services/cron/docker-compose.yml b/dockerfiles/services/services/cron/docker-compose.yml
index c0508b9..1830832 100644
--- a/dockerfiles/services/services/cron/docker-compose.yml
+++ b/dockerfiles/services/services/cron/docker-compose.yml
@@ -36,4 +36,4 @@ services:
 #networks:
 #  default:
 #    external:
-#      name: prod-private
+#      name: prod
diff --git a/dockerfiles/services/services/dd-agent/.env b/dockerfiles/services/services/dd-agent/.env
new file mode 100644
index 0000000..3a254ee
--- /dev/null
+++ b/dockerfiles/services/services/dd-agent/.env
@@ -0,0 +1,2 @@
+API_KEY=ca0faf176c4aedd4f547ed7cf85615eb
+NON_LOCAL_TRAFFIC: 'True'
diff --git a/dockerfiles/services/services/dd-agent/docker-compose.yml b/dockerfiles/services/services/dd-agent/docker-compose.yml
new file mode 100644
index 0000000..250cebc
--- /dev/null
+++ b/dockerfiles/services/services/dd-agent/docker-compose.yml
@@ -0,0 +1,38 @@
+---
+# docker-compose file for datadog agent
+# DOCKER_HOST=dkhost:2376 docker-compose up -d
+#
+# DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml services
+#
+# DOCKER_HOST=dkhost:2376  docker stack ps services
+
+version: '3'
+services:
+
+  dd-agent:
+    image: "datadog/docker-dd-agent:latest"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - /proc/:/host/proc/:ro
+      - /sys/fs/cgroup/:/host/sys/fs/cgroup:ro
+    ports:
+      - "8125:8125/udp"
+    env_file:
+      .env
+
+    deploy:
+      mode: global
+
+      restart_policy:
+        condition: any
+        delay: "1s"
+        max_attempts: 3
+      resources:
+        limits:
+          cpus: '2'
+          memory: 512M
+
+#networks:
+#  default:
+#    external:
+#      name: prod
diff --git a/dockerfiles/services/services/elasticsearch/docker-compose.yml b/dockerfiles/services/services/elasticsearch/docker-compose.yml
index c0b2734..48cfc70 100644
--- a/dockerfiles/services/services/elasticsearch/docker-compose.yml
+++ b/dockerfiles/services/services/elasticsearch/docker-compose.yml
@@ -46,4 +46,4 @@ services:
 networks:
   default:
     external:
-      name: prod-private
+      name: prod
diff --git a/dockerfiles/services/services/loggly/docker-compose.yml b/dockerfiles/services/services/loggly/docker-compose.yml
index b867ff8..360b4c9 100644
--- a/dockerfiles/services/services/loggly/docker-compose.yml
+++ b/dockerfiles/services/services/loggly/docker-compose.yml
@@ -29,4 +29,4 @@ services:
 networks:
   default:
     external:
-      name: prod-private
+      name: prod
diff --git a/dockerfiles/services/services/mariadb/docker-compose.yml b/dockerfiles/services/services/mariadb/docker-compose.yml
index 93b8136..1a8a0ad 100644
--- a/dockerfiles/services/services/mariadb/docker-compose.yml
+++ b/dockerfiles/services/services/mariadb/docker-compose.yml
@@ -37,4 +37,4 @@ services:
 networks:
   default:
     external:
-      name: prod-private
+      name: prod
diff --git a/dockerfiles/services/services/memcached/docker-compose.yml b/dockerfiles/services/services/memcached/docker-compose.yml
index 90190d4..8cd970b 100644
--- a/dockerfiles/services/services/memcached/docker-compose.yml
+++ b/dockerfiles/services/services/memcached/docker-compose.yml
@@ -36,4 +36,4 @@ services:
 networks:
   default:
     external:
-      name: prod-private
+      name: prod
diff --git a/dockerfiles/services/services/mongo/docker-compose.yml b/dockerfiles/services/services/mongo/docker-compose.yml
index 3471d74..e983dc2 100644
--- a/dockerfiles/services/services/mongo/docker-compose.yml
+++ b/dockerfiles/services/services/mongo/docker-compose.yml
@@ -37,4 +37,4 @@ services:
 networks:
   default:
     external:
-      name: prod-private
+      name: prod
diff --git a/dockerfiles/services/services/postgres/docker-compose.yml b/dockerfiles/services/services/postgres/docker-compose.yml
index d9dd70a..8108c93 100644
--- a/dockerfiles/services/services/postgres/docker-compose.yml
+++ b/dockerfiles/services/services/postgres/docker-compose.yml
@@ -30,4 +30,4 @@ services:
 networks:
   default:
     external:
-      name: prod-private
+      name: prod
diff --git a/dockerfiles/services/services/redis/docker-compose.yml b/dockerfiles/services/services/redis/docker-compose.yml
index 4e0947a..71d012b 100644
--- a/dockerfiles/services/services/redis/docker-compose.yml
+++ b/dockerfiles/services/services/redis/docker-compose.yml
@@ -31,4 +31,4 @@ services:
 networks:
   default:
     external:
-      name: prod-private
+      name: prod
diff --git a/dockerfiles/services/sslproxy/docker-compose-prod.yml b/dockerfiles/services/sslproxy/docker-compose-prod.yml
index b6b5dae..c575c71 100644
--- a/dockerfiles/services/sslproxy/docker-compose-prod.yml
+++ b/dockerfiles/services/sslproxy/docker-compose-prod.yml
@@ -54,12 +54,12 @@ services:
 
     networks:
     - ingress
-#    - prod-private
+#    - prod
 
 networks:
   ingress:
     external:
       name: ingress
-  prod-private:
+  prod:
     external:
-      name: prod-private
+      name: prod