omnibus: snmp-traps: drop dependency on datadog-agent (#31868)

DataDog · Dec 10, 2024 · e70c007 · e70c007
1 parent d8125d7
commit e70c007
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/omnibus/config/projects/agent.rb b/omnibus/config/projects/agent.rb
@@ -221,9 +221,6 @@
 # ------------------------------------
 
 if do_build
-  # Include traps db file in snmp.d/traps_db/
-  dependency 'snmp-traps'
-
   # Datadog agent
   dependency 'datadog-agent'
 

diff --git a/omnibus/config/software/datadog-agent-dependencies.rb b/omnibus/config/software/datadog-agent-dependencies.rb
@@ -33,6 +33,9 @@
 
 dependency 'libpcap' if linux_target? and !heroku_target? # system-probe dependency
 
+# Include traps db file in snmp.d/traps_db/
+dependency 'snmp-traps'
+
 # Additional software
 if windows_target?
   if ENV['WINDOWS_DDNPM_DRIVER'] and not ENV['WINDOWS_DDNPM_DRIVER'].empty?

diff --git a/omnibus/config/software/datadog-agent.rb b/omnibus/config/software/datadog-agent.rb
@@ -120,7 +120,8 @@
 
   # move around bin and config files
   move 'bin/agent/dist/datadog.yaml', "#{conf_dir}/datadog.yaml.example"
-  move 'bin/agent/dist/conf.d', "#{conf_dir}/"
+  copy 'bin/agent/dist/conf.d/.', "#{conf_dir}"
+  delete 'bin/agent/dist/conf.d'
 
   unless windows_target?
     copy 'bin/agent', "#{install_dir}/bin/"

diff --git a/omnibus/config/software/snmp-traps.rb b/omnibus/config/software/snmp-traps.rb
@@ -1,9 +1,6 @@
 name "snmp-traps"
 default_version "0.4.0"
 
-# Needs the configuration folder as created in datadog-agent
-dependency 'datadog-agent'
-
 source :url => "https://s3.amazonaws.com/dd-agent-omnibus/snmp_traps_db/dd_traps_db-#{version}.json.gz",
        :sha256 => "04fb9d43754c2656edf35f08fbad11ba8dc20d52654962933f3dd8f4d463b42c",
        :target_filename => "dd_traps_db.json.gz"