From ac772176ca07a1fc6b5e2177e2fefa0c89555317 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 14:17:39 +0200
Subject: [PATCH 01/21] removed config * check

---
 datadog/config.sls  | 2 --
 datadog/service.sls | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index f5f1c2c..a7519f3 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 {% from "datadog/map.jinja" import datadog with context %}
 
 datadog-example:
diff --git a/datadog/service.sls b/datadog/service.sls
index 394843d..cc10997 100644
--- a/datadog/service.sls
+++ b/datadog/service.sls
@@ -10,4 +10,4 @@ datadog-agent-service:
     - watch:
       - pkg: datadog-agent
       - file: {{ datadog.config }}
-      - file: {{ datadog.checks_config }}/*
+      # - file: {{ datadog.checks_config }}/*

From 0fefb58959c102290732f6d5451eea92d7a25007 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 14:59:08 +0200
Subject: [PATCH 02/21] improvements

---
 datadog/config.sls | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index a7519f3..6080b25 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -9,7 +9,7 @@ datadog-example:
       - pkg: datadog-pkg
 
 {% if datadog.api_key is defined %}
-datadog-conf:
+datadog-api_key-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: "api_key:(.*)"
@@ -17,8 +17,34 @@ datadog-conf:
     - count: 1
     - watch:
       - pkg: datadog-pkg
-    - require:
-      - cmd: datadog-example
+    # - require:
+    #   - cmd: datadog-example
+{% endif %}
+
+{% if datadog.hostname is defined %}
+datadog-api_key-conf:
+  file.replace:
+    - name: {{ datadog.config }}
+    - pattern: "^(\#\s)?hostname:(.*)"
+    - repl: "hostname: {{ datadog.hostname }}"
+    - count: 1
+    - watch:
+      - pkg: datadog-pkg
+    # - require:
+    #   - cmd: datadog-example
+{% endif %}
+
+{% if datadog.tags %}
+datadog-api_key-conf:
+  file.replace:
+    - name: {{ datadog.config }}
+    - pattern: "^(\#\s)?tags:(.*)"
+    - repl: "tags: {{ datadog.tags|join(', ') }}"
+    - count: 1
+    - watch:
+      - pkg: datadog-pkg
+    # - require:
+    #   - cmd: datadog-example
 {% endif %}
 
 {% for check_name in datadog.checks %}

From bf91cf546c8beba2fd42fec97d69505b65b60c18 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:01:57 +0200
Subject: [PATCH 03/21] added hsotname and tags

---
 datadog/config.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index 6080b25..2939670 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -25,7 +25,7 @@ datadog-api_key-conf:
 datadog-api_key-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "^(\#\s)?hostname:(.*)"
+    - pattern: "^(#\s)?hostname:(.*)"
     - repl: "hostname: {{ datadog.hostname }}"
     - count: 1
     - watch:

From 7535fe3bf54c3e71090611ac9a0b9430162f09b8 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:04:56 +0200
Subject: [PATCH 04/21] added hsotname and tags

---
 datadog/config.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index 2939670..c3d192e 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -25,7 +25,7 @@ datadog-api_key-conf:
 datadog-api_key-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "^(#\s)?hostname:(.*)"
+    - pattern: "^(\\#\\s)?hostname:(.*)"
     - repl: "hostname: {{ datadog.hostname }}"
     - count: 1
     - watch:
@@ -38,7 +38,7 @@ datadog-api_key-conf:
 datadog-api_key-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "^(\#\s)?tags:(.*)"
+    - pattern: "^(\\#\\s)?tags:(.*)"
     - repl: "tags: {{ datadog.tags|join(', ') }}"
     - count: 1
     - watch:

From f17623811a69eb9b6ed8d686627cbae5b914484c Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:07:32 +0200
Subject: [PATCH 05/21] added hsotname and tags

---
 datadog/config.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index c3d192e..adae51a 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -25,7 +25,7 @@ datadog-api_key-conf:
 datadog-api_key-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "^(\\#\\s)?hostname:(.*)"
+    - pattern: "^(#\s)?hostname:(.*)| regex_escape"
     - repl: "hostname: {{ datadog.hostname }}"
     - count: 1
     - watch:
@@ -38,7 +38,7 @@ datadog-api_key-conf:
 datadog-api_key-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "^(\\#\\s)?tags:(.*)"
+    - pattern: "^(\#\s)?tags:(.*)| regex_escape"
     - repl: "tags: {{ datadog.tags|join(', ') }}"
     - count: 1
     - watch:

From 68b5792e5382e59ae67fa0b1e88244f1366f455e Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:09:46 +0200
Subject: [PATCH 06/21] added hsotname and tags

---
 datadog/config.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index adae51a..18254bf 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -22,7 +22,7 @@ datadog-api_key-conf:
 {% endif %}
 
 {% if datadog.hostname is defined %}
-datadog-api_key-conf:
+datadog-hostname-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: "^(#\s)?hostname:(.*)| regex_escape"
@@ -35,7 +35,7 @@ datadog-api_key-conf:
 {% endif %}
 
 {% if datadog.tags %}
-datadog-api_key-conf:
+datadog-tags-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: "^(\#\s)?tags:(.*)| regex_escape"

From 116dd23d77873e8cba0182dc8e5a35726d67aad5 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:12:37 +0200
Subject: [PATCH 07/21] added hsotname and tags

---
 datadog/config.sls | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index 18254bf..c140f78 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -25,7 +25,8 @@ datadog-api_key-conf:
 datadog-hostname-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "^(#\s)?hostname:(.*)| regex_escape"
+    - pattern: |
+      ^(#\s)?hostname:(.*)
     - repl: "hostname: {{ datadog.hostname }}"
     - count: 1
     - watch:
@@ -38,7 +39,8 @@ datadog-hostname-conf:
 datadog-tags-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "^(\#\s)?tags:(.*)| regex_escape"
+    - pattern: |
+      ^(\#\s)?tags:(.*)
     - repl: "tags: {{ datadog.tags|join(', ') }}"
     - count: 1
     - watch:

From 2693f170733acb609059fba2ff13aef8a4297b96 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:15:48 +0200
Subject: [PATCH 08/21] added hsotname and tags

---
 datadog/config.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index c140f78..7f39a9f 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -26,7 +26,7 @@ datadog-hostname-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: |
-      ^(#\s)?hostname:(.*)
+      (\#\s)?hostname:(.*)
     - repl: "hostname: {{ datadog.hostname }}"
     - count: 1
     - watch:
@@ -40,7 +40,7 @@ datadog-tags-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: |
-      ^(\#\s)?tags:(.*)
+      (\#\s)?tags:(.*)
     - repl: "tags: {{ datadog.tags|join(', ') }}"
     - count: 1
     - watch:

From 0f3d7515c13f5af3d9482a9064636e1d6c891949 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:18:19 +0200
Subject: [PATCH 09/21] added hsotname and tags

---
 datadog/config.sls | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index 7f39a9f..489aca1 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -25,8 +25,7 @@ datadog-api_key-conf:
 datadog-hostname-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: |
-      (\#\s)?hostname:(.*)
+    - pattern: "{{ '^(\#\s)?hostname:(.*)' | regex_escape }}"
     - repl: "hostname: {{ datadog.hostname }}"
     - count: 1
     - watch:
@@ -39,8 +38,7 @@ datadog-hostname-conf:
 datadog-tags-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: |
-      (\#\s)?tags:(.*)
+    - pattern: "{{ '^(\#\s)?tags:(.*)' | regex_escape }}"
     - repl: "tags: {{ datadog.tags|join(', ') }}"
     - count: 1
     - watch:

From 444c9ebd9e3cd8a37426a64628178804b198a49e Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:20:30 +0200
Subject: [PATCH 10/21] added hsotname and tags

---
 datadog/config.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index 489aca1..c0df89f 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -25,7 +25,7 @@ datadog-api_key-conf:
 datadog-hostname-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "{{ '^(\#\s)?hostname:(.*)' | regex_escape }}"
+    - pattern: "{{ '(\#\s)?hostname:(.*)' | regex_escape }}"
     - repl: "hostname: {{ datadog.hostname }}"
     - count: 1
     - watch:
@@ -38,7 +38,7 @@ datadog-hostname-conf:
 datadog-tags-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "{{ '^(\#\s)?tags:(.*)' | regex_escape }}"
+    - pattern: "{{ '(\#\s)?tags:(.*)' | regex_escape }}"
     - repl: "tags: {{ datadog.tags|join(', ') }}"
     - count: 1
     - watch:

From 90233c0e3991f9e989471458a1e7ba6eb132ba2f Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:22:09 +0200
Subject: [PATCH 11/21] added hsotname and tags

---
 datadog/config.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index c0df89f..7e5d978 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -25,7 +25,7 @@ datadog-api_key-conf:
 datadog-hostname-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "{{ '(\#\s)?hostname:(.*)' | regex_escape }}"
+    - pattern: "{{ '(#\s)?hostname:(.*)' | regex_escape }}"
     - repl: "hostname: {{ datadog.hostname }}"
     - count: 1
     - watch:
@@ -38,7 +38,7 @@ datadog-hostname-conf:
 datadog-tags-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "{{ '(\#\s)?tags:(.*)' | regex_escape }}"
+    - pattern: "{{ '(#\s)?tags:(.*)' | regex_escape }}"
     - repl: "tags: {{ datadog.tags|join(', ') }}"
     - count: 1
     - watch:

From 823957cab88537220952665d739ffa9cd6fb6c4c Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:24:14 +0200
Subject: [PATCH 12/21] added hsotname and tags

---
 datadog/config.sls | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index 7e5d978..1540eb9 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -25,8 +25,10 @@ datadog-api_key-conf:
 datadog-hostname-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "{{ '(#\s)?hostname:(.*)' | regex_escape }}"
-    - repl: "hostname: {{ datadog.hostname }}"
+    - pattern: |
+      (\#\s)?hostname:(.*)
+    - repl: |
+      hostname: {{ datadog.hostname }}
     - count: 1
     - watch:
       - pkg: datadog-pkg
@@ -38,7 +40,8 @@ datadog-hostname-conf:
 datadog-tags-conf:
   file.replace:
     - name: {{ datadog.config }}
-    - pattern: "{{ '(#\s)?tags:(.*)' | regex_escape }}"
+    - pattern: |
+      (\#\s)?tags:(.*)
     - repl: "tags: {{ datadog.tags|join(', ') }}"
     - count: 1
     - watch:

From 9c62156552d519c3e09f21d46c00e38eec1fb891 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:24:40 +0200
Subject: [PATCH 13/21] improvements

---
 datadog/config.sls | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index 1540eb9..faacaaf 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -42,7 +42,8 @@ datadog-tags-conf:
     - name: {{ datadog.config }}
     - pattern: |
       (\#\s)?tags:(.*)
-    - repl: "tags: {{ datadog.tags|join(', ') }}"
+    - repl: |
+      tags: {{ datadog.tags|join(', ') }}
     - count: 1
     - watch:
       - pkg: datadog-pkg

From 12b41d7e82acf813fc2fb769ee1b1f1ce9b6941e Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:27:27 +0200
Subject: [PATCH 14/21] improvements

---
 datadog/config.sls | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index faacaaf..255ed60 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -26,9 +26,9 @@ datadog-hostname-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: |
-      (\#\s)?hostname:(.*)
+      (\#\s)?hostname\:(.*)
     - repl: |
-      hostname: {{ datadog.hostname }}
+      'hostname: {{ datadog.hostname }}'
     - count: 1
     - watch:
       - pkg: datadog-pkg
@@ -41,9 +41,9 @@ datadog-tags-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: |
-      (\#\s)?tags:(.*)
+      (\#\s)?tags\:(.*)
     - repl: |
-      tags: {{ datadog.tags|join(', ') }}
+      'tags: {{ datadog.tags|join(', ') }}'
     - count: 1
     - watch:
       - pkg: datadog-pkg

From 3cb4a110d6afbb39366f383d65fbffd8e054dbe3 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:31:43 +0200
Subject: [PATCH 15/21] improvements

---
 datadog/config.sls | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index 255ed60..2249fe7 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -27,8 +27,7 @@ datadog-hostname-conf:
     - name: {{ datadog.config }}
     - pattern: |
       (\#\s)?hostname\:(.*)
-    - repl: |
-      'hostname: {{ datadog.hostname }}'
+    - repl: 'hostname: {{ datadog.hostname }}'
     - count: 1
     - watch:
       - pkg: datadog-pkg
@@ -42,8 +41,7 @@ datadog-tags-conf:
     - name: {{ datadog.config }}
     - pattern: |
       (\#\s)?tags\:(.*)
-    - repl: |
-      'tags: {{ datadog.tags|join(', ') }}'
+    - repl: 'tags: {{ datadog.tags|join(", ") }}'
     - count: 1
     - watch:
       - pkg: datadog-pkg

From fd6ae90bfb18df7d569ca02b35f386d8754ce9e5 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:33:43 +0200
Subject: [PATCH 16/21] improvements

---
 datadog/config.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index 2249fe7..b097971 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -27,7 +27,7 @@ datadog-hostname-conf:
     - name: {{ datadog.config }}
     - pattern: |
       (\#\s)?hostname\:(.*)
-    - repl: 'hostname: {{ datadog.hostname }}'
+    - repl: 'hostname\: {{ datadog.hostname }}'
     - count: 1
     - watch:
       - pkg: datadog-pkg
@@ -41,7 +41,7 @@ datadog-tags-conf:
     - name: {{ datadog.config }}
     - pattern: |
       (\#\s)?tags\:(.*)
-    - repl: 'tags: {{ datadog.tags|join(", ") }}'
+    - repl: 'tags\: {{ datadog.tags|join(", ") }}'
     - count: 1
     - watch:
       - pkg: datadog-pkg

From da71b6b581a2bf65489571e8bb525e19bf42de13 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:47:08 +0200
Subject: [PATCH 17/21] improvements

---
 datadog/config.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index b097971..8afa067 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -26,7 +26,7 @@ datadog-hostname-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: |
-      (\#\s)?hostname\:(.*)
+        (\#\s)?hostname\:(.*)
     - repl: 'hostname\: {{ datadog.hostname }}'
     - count: 1
     - watch:
@@ -40,7 +40,7 @@ datadog-tags-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: |
-      (\#\s)?tags\:(.*)
+        (\#\s)?tags\:(.*)
     - repl: 'tags\: {{ datadog.tags|join(", ") }}'
     - count: 1
     - watch:

From 4033f8b367d7c1f7a3358cc29288d8bb202cd500 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 15:52:57 +0200
Subject: [PATCH 18/21] updates

---
 datadog/config.sls | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index 8afa067..35356d8 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -27,7 +27,8 @@ datadog-hostname-conf:
     - name: {{ datadog.config }}
     - pattern: |
         (\#\s)?hostname\:(.*)
-    - repl: 'hostname\: {{ datadog.hostname }}'
+    - repl: |
+        hostname: {{ datadog.hostname }}
     - count: 1
     - watch:
       - pkg: datadog-pkg
@@ -41,7 +42,8 @@ datadog-tags-conf:
     - name: {{ datadog.config }}
     - pattern: |
         (\#\s)?tags\:(.*)
-    - repl: 'tags\: {{ datadog.tags|join(", ") }}'
+    - repl: |
+        tags: {{ datadog.tags|join(", ") }}
     - count: 1
     - watch:
       - pkg: datadog-pkg

From 4c8c583ca9fb13e8295bf5e017c7601787381709 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 22:23:37 +0200
Subject: [PATCH 19/21] updates

---
 datadog/config.sls | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index 35356d8..fcef6d2 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -8,48 +8,56 @@ datadog-example:
     - require:
       - pkg: datadog-pkg
 
-{% if datadog.api_key is defined %}
 datadog-api_key-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: "api_key:(.*)"
+{% if datadog.api_key is defined %}
     - repl: "api_key: {{ datadog.api_key }}"
+{% else %}
+    - repl: "# api_key: "
+{% endif %}
     - count: 1
     - watch:
       - pkg: datadog-pkg
-    # - require:
-    #   - cmd: datadog-example
-{% endif %}
+    - require:
+      - file: {{ datadog.config }}
 
-{% if datadog.hostname is defined %}
 datadog-hostname-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: |
         (\#\s)?hostname\:(.*)
+{% if datadog.hostname is defined %}
     - repl: |
         hostname: {{ datadog.hostname }}
+{% else %}
+    - repl: |
+        "# hostname: none"
+{% endif %}
     - count: 1
     - watch:
       - pkg: datadog-pkg
-    # - require:
-    #   - cmd: datadog-example
-{% endif %}
+    - require:
+      - file: {{ datadog.config }}
 
-{% if datadog.tags %}
 datadog-tags-conf:
   file.replace:
     - name: {{ datadog.config }}
     - pattern: |
         (\#\s)?tags\:(.*)
+{% if datadog.tags %}
     - repl: |
         tags: {{ datadog.tags|join(", ") }}
+{% else %}
+    - repl: |
+        "# tags: none"
+{% endif %}
     - count: 1
     - watch:
       - pkg: datadog-pkg
-    # - require:
-    #   - cmd: datadog-example
-{% endif %}
+    - require:
+      - file: {{ datadog.config }}
 
 {% for check_name in datadog.checks %}
 datadog_{{ check_name }}_yaml_installed:

From 3b5178c1783b4f3851f9fcdabd1e1b46b9bf9411 Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Thu, 31 May 2018 22:26:08 +0200
Subject: [PATCH 20/21] updates

---
 datadog/config.sls | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/datadog/config.sls b/datadog/config.sls
index fcef6d2..236444c 100644
--- a/datadog/config.sls
+++ b/datadog/config.sls
@@ -20,8 +20,6 @@ datadog-api_key-conf:
     - count: 1
     - watch:
       - pkg: datadog-pkg
-    - require:
-      - file: {{ datadog.config }}
 
 datadog-hostname-conf:
   file.replace:
@@ -38,8 +36,6 @@ datadog-hostname-conf:
     - count: 1
     - watch:
       - pkg: datadog-pkg
-    - require:
-      - file: {{ datadog.config }}
 
 datadog-tags-conf:
   file.replace:
@@ -56,8 +52,6 @@ datadog-tags-conf:
     - count: 1
     - watch:
       - pkg: datadog-pkg
-    - require:
-      - file: {{ datadog.config }}
 
 {% for check_name in datadog.checks %}
 datadog_{{ check_name }}_yaml_installed:

From 7b508e56ac9b49a1384374736acc8c969480660d Mon Sep 17 00:00:00 2001
From: Ross Crawford-d'Heureuse <sendrossemail@gmail.com>
Date: Fri, 1 Jun 2018 19:30:04 +0200
Subject: [PATCH 21/21] updates

---
 datadog/defaults.yaml |  3 +++
 datadog/install.sls   | 10 ++++++++++
 pillar.example        |  4 ++++
 3 files changed, 17 insertions(+)

diff --git a/datadog/defaults.yaml b/datadog/defaults.yaml
index 630c4e3..f9a934f 100644
--- a/datadog/defaults.yaml
+++ b/datadog/defaults.yaml
@@ -6,4 +6,7 @@ datadog:
   checks_config: '/etc/dd-agent/conf.d'
   service:
     name: datadog-agent
+  docker:
+    image: datadog/agent
+    tag: latest
   api_key: aaaaaaaabbbbbbbbccccccccdddddddd
diff --git a/datadog/install.sls b/datadog/install.sls
index 4c935cd..896e538 100644
--- a/datadog/install.sls
+++ b/datadog/install.sls
@@ -32,3 +32,13 @@ datadog-pkg:
     - refresh: True
     - require:
       - pkgrepo: datadog-repo
+
+#
+# DD docker-agent
+#
+#docker run -d --name dd-agent -v /var/run/docker.sock:/var/run/docker.sock:ro -v /proc/:/host/proc/:ro -v /sys/fs/cgroup/:/host/sys/fs/cgroup:ro -e DD_API_KEY=2494bbd7f3f567e4142cb25ef9d9f389 datadog/agent:latest
+# docker-agent-present:
+#   docker_image.present:
+#     - image: {{ config.docker.image }}
+#     - tag: {{ config.docker.tag }}
+#     - force: true  # ensure its always pulled
\ No newline at end of file
diff --git a/pillar.example b/pillar.example
index 1bfb7bc..415a579 100644
--- a/pillar.example
+++ b/pillar.example
@@ -1,5 +1,9 @@
 datadog:
   api_key: aaaaaaaabbbbbbbbccccccccdddddddd
+  hostname: {{ grains.id }}  # or done include to have it automatically be calculated
+  tags:
+    - env:staging
+    - team:sunny
   checks:
     process:
       init_config: