Merge pull request #352 from procore/jf/support_live_processes

Add support for process_agent_enabled

Author: truthbk

manifests/init.pp

@@ -163,6 +163,9 @@
 #   $apm_env
 #       String defining the environment for the APM traces
 #       String. Default: empty
+#   $process_agent_enabled
+#       Boolean to enable the process/container agent
+#       Boolean. Default: false
 #
 # Actions:
 #
@@ -259,6 +262,7 @@
   $dd_groups = $datadog_agent::params::dd_groups,
   $apm_enabled = false,
   $apm_env = '',
+  $process_agent_enabled = false,
 ) inherits datadog_agent::params {
 
   # Allow ports to be passed as integers or strings.
@@ -334,6 +338,7 @@
   validate_bool($apm_enabled)
   validate_bool($agent6_enable)
   validate_string($apm_env)
+  validate_bool($process_agent_enabled)
 
   if $hiera_tags {
     $local_tags = hiera_array('datadog_agent::tags', [])

manifests/integrations/jmx.pp

@@ -22,7 +22,7 @@
 #       The JMX port.
 #     jmx_url:
 #       If the agent needs to connect to a non-default JMX URL, specify it here
-#       instead of a host and a port. If you use this you need to specify a ‘name’
+#       instead of a host and a port. If you use this you need to specify a 'name'
 #       for the instance. Optional.
 #     user:
 #       The username for connecting to the running JVM. Optional.

spec/classes/datadog_agent_spec.rb

@@ -211,6 +211,7 @@
                     'content' => /^apm_enabled: false\n/,
                     )}
                 end
+
             end
 
             context 'with user provided paramaters' do
@@ -611,6 +612,15 @@
                 'order' => '07',
                 )}
             end
+            context 'with process_agent enabled' do
+                let(:params) {
+                    {:process_agent_enabled => true,
+                }}
+                it { should contain_concat__fragment('datadog footer').with(
+                'content' => /^process_agent_enabled: true\n/,
+                )}
+            end
+
             end
         end
 

templates/datadog_footer.conf.erb

@@ -336,6 +336,10 @@ sd_jmx_enable: <%= @sd_jmx_enable %>
 consul_token: <%= @consul_token %>
 <% end -%>
 
+<% if @process_agent_enabled -%>
+process_agent_enabled: <%= @process_agent_enabled %>
+<% end -%>
+
 # ========================================================================== #
 # Trace                                                                      #
 # ========================================================================== #