move common datadog config for services

vinted · May 13, 2020 · 56f8b60 · 56f8b60
1 parent ea092cc
commit 56f8b60
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 30 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -18,3 +18,9 @@
 default['vitess']['version']['vtctl'] = 'v6.0-9fe7fd3'
 default['vitess']['version']['vtexplain'] = 'v6.0-9fe7fd3'
 default['vitess']['version']['vtbench'] = 'v6.0-9fe7fd3'
+
+# host to send spans to. if empty, no tracing will be done
+default['vitess']['datadog-agent-host'] = nil
+
+# port to send spans to. if empty, no tracing will be done
+default['vitess']['datadog-agent-port'] = nil
diff --git a/attributes/mysqlctld.rb b/attributes/mysqlctld.rb
@@ -33,12 +33,6 @@
 # write cpu profile to file
 default['vitess']['mysqlctld']['cpu_profile'] = nil
 
-# host to send spans to. if empty, no tracing will be done
-default['vitess']['mysqlctld']['datadog-agent-host'] = nil
-
-# port to send spans to. if empty, no tracing will be done
-default['vitess']['mysqlctld']['datadog-agent-port'] = nil
-
 # deprecated: use db_charset (default "utf8")
 default['vitess']['mysqlctld']['db-config-dba-charset'] = 'utf8'
 

diff --git a/attributes/vtctld.rb b/attributes/vtctld.rb
@@ -48,12 +48,6 @@
 # write cpu profile to file
 default['vitess']['vtctld']['cpu_profile'] = nil
 
-# host to send spans to. if empty, no tracing will be done
-default['vitess']['vtctld']['datadog-agent-host'] = nil
-
-# port to send spans to. if empty, no tracing will be done
-default['vitess']['vtctld']['datadog-agent-port'] = nil
-
 # db credentials file; send SIGHUP to reload this file
 default['vitess']['vtctld']['db-credentials-file'] = nil
 

diff --git a/attributes/vtgate.rb b/attributes/vtgate.rb
@@ -37,12 +37,6 @@
 # write cpu profile to file
 default['vitess']['vtgate']['cpu_profile'] = nil
 
-# host to send spans to. if empty, no tracing will be done
-default['vitess']['vtgate']['datadog-agent-host'] = nil
-
-# port to send spans to. if empty, no tracing will be done
-default['vitess']['vtgate']['datadog-agent-port'] = nil
-
 # The default tablet type to set for queries, when one is not explicitly selected (default MASTER)
 default['vitess']['vtgate']['default_tablet_type'] = 'MASTER'
 

diff --git a/attributes/vttablet.rb b/attributes/vttablet.rb
@@ -58,12 +58,6 @@
 # write cpu profile to file
 default['vitess']['vttablet']['cpu_profile'] = nil
 
-# host to send spans to. if empty, no tracing will be done
-default['vitess']['vttablet']['datadog-agent-host'] = nil
-
-# port to send spans to. if empty, no tracing will be done
-default['vitess']['vttablet']['datadog-agent-port'] = nil
-
 # deprecated: use db_charset (default "utf8")
 default['vitess']['vttablet']['db-config-allprivs-charset'] = 'utf8'
 

diff --git a/attributes/vtworker.rb b/attributes/vtworker.rb
@@ -46,12 +46,6 @@
 # write cpu profile to file
 default['vitess']['vtworker']['cpu_profile'] = nil
 
-# host to send spans to. if empty, no tracing will be done
-default['vitess']['vtworker']['datadog-agent-host'] = nil
-
-# port to send spans to. if empty, no tracing will be done
-default['vitess']['vtworker']['datadog-agent-port'] = nil
-
 # db credentials file; send SIGHUP to reload this file
 default['vitess']['vtworker']['db-credentials-file'] = nil
 

diff --git a/libraries/base_service.rb b/libraries/base_service.rb
@@ -50,6 +50,16 @@ class VitessBaseService < Chef::Resource
         kind_of: String,
         default: lazy { node['vitess']['topo_implementation'] }
       )
+      attribute(
+        :datadog_agent_host,
+        kind_of: String,
+        default: lazy { node['vitess']['datadog-agent-host'] }
+      )
+      attribute(
+        :datadog_agent_port,
+        kind_of: String,
+        default: lazy { node['vitess']['datadog-agent-port'] }
+      )
 
       attribute(:vtroot, kind_of: String, default: '/var/lib/vt')
       attribute(:vtdataroot, kind_of: String, default: '/var/lib/vtdataroot')
@@ -88,6 +98,8 @@ def additional_args
           'topo_global_server_address' => new_resource.topo_global_server_address,
           'topo_implementation' => new_resource.topo_implementation,
         }
+        args['datadog-agent-host'] = new_resource.datadog_agent_host if !new_resource.datadog_agent_host.nil?
+        args['datadog-agent-port'] = new_resource.datadog_agent_port if !new_resource.datadog_agent_port.nil?
         args['log_dir'] = service_log_dir if new_resource.args['log_dir'].nil?
         args
       end