[service_discovery][dogstatsd] adding relevant SD and dogstatsd to the relevant fragments.

Author: truthbk

spec/classes/datadog_agent_spec.rb

@@ -123,7 +123,7 @@
                     'content' => /^# bind_host: localhost\n/,
                     )}
                     it { should contain_concat__fragment('datadog footer').with(
-                    'content' => /^use_dogstatsd: no\n/,
+                    'content' => /^use_dogstatsd: yes\n/,
                     )}
                     it { should contain_concat__fragment('datadog footer').with(
                     'content' => /^dogstatsd_port: 8125\n/,
@@ -182,26 +182,26 @@
                 end
 
                 context 'for service_discovery' do
-                    it { should contain_file('/etc/dd-agent/datadog.conf').without(
+                    it { should contain_concat__fragment('datadog footer').without(
                     'content' => /^service_discovery_backend:\n/,
                     )}
-                    it { should contain_file('/etc/dd-agent/datadog.conf').without(
+                    it { should contain_concat__fragment('datadog footer').without(
                     'content' => /^sd_config_backend:\n/,
                     )}
-                    it { should contain_file('/etc/dd-agent/datadog.conf').without(
+                    it { should contain_concat__fragment('datadog footer').without(
                     'content' => /^sd_backend_host:\n/,
                     )}
-                    it { should contain_file('/etc/dd-agent/datadog.conf').without(
+                    it { should contain_concat__fragment('datadog footer').without(
                     'content' => /^sd_backend_port:\n/,
                     )}
-                    it { should contain_file('/etc/dd-agent/datadog.conf').without(
+                    it { should contain_concat__fragment('datadog footer').without(
                     'content' => /^sd_template_dir:\n/,
                     )}
-                    it { should contain_file('/etc/dd-agent/datadog.conf').without(
+                    it { should contain_concat__fragment('datadog footer').without(
                     'content' => /^consul_token:\n/,
                     )}
-                    it { should contain_file('/etc/dd-agent/datadog.conf').with(
-                    'content' => /^# sd_jmx_enable: no\n/,
+                    it { should contain_concat__fragment('datadog footer').without(
+                    'content' => /^# sd_jmx_enable:\n/,
                     )}
                 end
 
@@ -536,19 +536,19 @@
                      :sd_backend_port            => '8080',
                      :sd_jmx_enable              =>  true,
                 }}
-                it { should contain_file('/etc/dd-agent/datadog.conf').with(
+                it { should contain_concat__fragment('datadog footer').with(
                 'content' => /^service_discovery_backend: docker\n/,
                 )}
-                it { should contain_file('/etc/dd-agent/datadog.conf').with(
+                it { should contain_concat__fragment('datadog footer').with(
                 'content' => /^sd_config_backend: etcd\n/,
                 )}
-                it { should contain_file('/etc/dd-agent/datadog.conf').with(
+                it { should contain_concat__fragment('datadog footer').with(
                 'content' => /^sd_backend_host: localhost\n/,
                 )}
-                it { should contain_file('/etc/dd-agent/datadog.conf').with(
+                it { should contain_concat__fragment('datadog footer').with(
                 'content' => /^sd_backend_port: 8080\n/,
                 )}
-                it { should contain_file('/etc/dd-agent/datadog.conf').with(
+                it { should contain_concat__fragment('datadog footer').with(
                 'content' => /^sd_jmx_enable: true\n/,
                 )}
             end

templates/datadog_footer.conf.erb

@@ -290,6 +290,59 @@ syslog_host: <%= @syslog_host  %>
 syslog_port: <%= @syslog_port  %>
 <% end -%>
 
+
+# ========================================================================== #
+# Service Discovery
+# ========================================================================== #
+
+# For now only docker is supported so you just need to un-comment this line.
+<% if @service_discovery_backend.empty? -%>
+# service_discovery_backend: docker
+<% else -%>
+service_discovery_backend: <%= @service_discovery_backend %>
+<% end -%>
+
+# Define which key/value store must be used to look for configuration templates.
+# Default is etcd. Consul is also supported.
+<% if @sd_config_backend.empty? -%>
+# sd_config_backend: etcd
+<% else -%>
+sd_config_backend: <%= @sd_config_backend %>
+<% end -%>
+
+# Settings for connecting to the backend. These are the default, edit them if you run a different config.
+<% if @sd_backend_host.empty? -%>
+# sd_backend_host: 127.0.0.1
+<% else -%>
+sd_backend_host: <%= @sd_backend_host %>
+<% end -%>
+<% if @sd_backend_port.to_i < 1 -%>
+# sd_backend_port: 4001
+<% else -%>
+sd_backend_port: <%= @sd_backend_port %>
+<% end -%>
+
+# By default, the agent will look for the configuration templates under the
+# `/datadog/check_configs` key in the back-end.
+# If you wish otherwise, uncomment this option and modify its value.
+<% if @sd_template_dir.empty? -%>
+# sd_template_dir: /datadog/check_configs
+<% else -%>
+sd_template_dir: <%= @sd_template_dir %>
+<% end -%>
+
+# Enable JMX checks for service discovery
+<% if @sd_jmx_enable -%>
+sd_jmx_enable: <%= @sd_jmx_enable %>
+<% end -%>
+
+# If you Consul store requires token authentication for service discovery, you can define that token here.
+<% if @consul_token.empty? -%>
+# consul_token: f45cbd0b-5022-samp-le00-4eaa7c1f40f1
+<% else -%>
+consul_token: <%= @consul_token %>
+<% end -%>
+
 <% if not @extra_template.empty? -%>
 # ========================================================================== #
 # Custom Templates from Puppet                                               #