diff --git a/jobs/dd-agent/templates/config/bpm.yml.erb b/jobs/dd-agent/templates/config/bpm.yml.erb index d343441..bcd549d 100644 --- a/jobs/dd-agent/templates/config/bpm.yml.erb +++ b/jobs/dd-agent/templates/config/bpm.yml.erb @@ -1,18 +1,18 @@ processes: - name: datadog-agent workdir: /var/vcap/jobs/dd-agent - executable: "/var/vcap/jobs/dd-agent/bin/agent_bpm" + executable: "/var/vcap/jobs/dd-agent/bin/agent_ctl" + args: + - start additional_volumes: - path: /var/vcap/data/garden <% if p('dd.process_agent_enabled', false) == true || p('dd.process_agent_enabled', false).to_s =~ (/(true|t|yes|y|1)$/i) %> - name: dd-agent-process-agent workdir: /var/vcap/jobs/dd-agent - hooks: - pre_start: /var/vcap/jobs/dd-agent/bin/process_agent_pre_start - executable: "/var/vcap/jobs/dd-agent/packages/dd-agent/embedded/bin/process-agent" + executable: "/var/vcap/jobs/dd-agent/bin/process_agent_ctl" args: - - --cfgpath=/var/vcap/jobs/dd-agent/config/datadog.yaml + - start additional_volumes: - path: /var/vcap/data/garden <% end %> @@ -20,11 +20,9 @@ processes: <% if p('dd.trace_agent_enabled', false) == true || p('dd.trace_agent_enabled', false).to_s =~ (/(true|t|yes|y|1)$/i) %> - name: dd-agent-trace-agent workdir: /var/vcap/jobs/dd-agent - hooks: - pre_start: /var/vcap/jobs/dd-agent/bin/trace_agent_pre_start - executable: "/var/vcap/jobs/dd-agent/packages/dd-agent/embedded/bin/trace-agent" + executable: "/var/vcap/jobs/dd-agent/bin/trace_agent_ctl" args: - - --config=/var/vcap/jobs/dd-agent/config/datadog.yaml + - start additional_volumes: - path: /var/vcap/data/garden @@ -32,11 +30,9 @@ processes: <% if p('dd.system_probe_enabled', false) == true || p('dd.system_probe_enabled', false).to_s =~ (/(true|t|yes|y|1)$/i) %> - name: dd-agent-system-probe - hooks: - pre_start: /var/vcap/jobs/dd-agent/bin/system_probe_pre_start - executable: "/var/vcap/jobs/dd-agent/packages/dd-agent/embedded/bin/system-probe" + executable: "/var/vcap/jobs/dd-agent/bin/system_probe_ctl" args: - - --config=$JOB_DIR/config/system-probe.yaml + - start additional_volumes: - path: /var/vcap/data/garden unsafe: