default: remove deprecated options.
MODIFY
attributes/default.rb
attributes/default.rb
@@ -71,11 +71,6 @@ default['datadog']['agent6_config_dir'] =
# Defaults to 'datadoghq.com', set to 'datadoghq.eu' to send data to the EU site.
default['datadog']['site'] = nil
-# Set a key to true to make the agent6 use the v2 api on that endpoint, false otherwise.
-# Leave key value to nil to use agent6 default for that endpoint.
-# Supported keys: "series", "events", "service checks"
-default['datadog']['use_v2_api'] = {}
-
### End of Agent6-only attributes ###
########################################################################
@@ -140,9 +135,11 @@ default['datadog']['tags_submission_retries'] = nil
default['datadog']['handler_extra_config'] = {}
# Autorestart agent
+# Agent v5 only.
default['datadog']['autorestart'] = false
# Run the agent in developer mode
+# Agent v5 only.
default['datadog']['developer_mode'] = false
# Repository configuration
@@ -249,6 +246,7 @@ default['datadog']['bind_host'] = 'localhost'
# How often you want the agent to collect data, in seconds. Any value between
# 15 and 60 is a reasonable interval.
+# Agent v5 only.
default['datadog']['check_freq'] = 15
# Specify agent hostname
@@ -260,6 +258,7 @@ default['datadog']['hostname'] = node.name
default['datadog']['use_ec2_instance_id'] = false
# Use mount points instead of volumes to track disk and fs metrics
+# Agent v5 only.
default['datadog']['use_mount'] = false
# Change port the agent is listening to
@@ -273,13 +272,16 @@ default['datadog']['agent_start'] = true
# Start a graphite listener on this port
# https://github.com/DataDog/dd-agent/wiki/Feeding-Datadog-with-Graphite
+# Agent v5 only.
default['datadog']['graphite'] = false
default['datadog']['graphite_port'] = 17124
# log-parsing configuration
+# Agent v5 only.
default['datadog']['dogstreams'] = []
# custom emitter configuration
+# Agent v5 only.
default['datadog']['custom_emitters'] = []
# Logging configuration
@@ -305,9 +307,9 @@ default['datadog']['web_proxy']['no_proxy'] = nil # only used for agent v6.0+
# dogstatsd
default['datadog']['dogstatsd'] = true
default['datadog']['dogstatsd_port'] = 8125
-default['datadog']['dogstatsd_interval'] = 10
-default['datadog']['dogstatsd_normalize'] = 'yes'
-default['datadog']['dogstatsd_target'] = 'http://localhost:17123'
+default['datadog']['dogstatsd_interval'] = 10 # Agent v5 only.
+default['datadog']['dogstatsd_normalize'] = 'yes' # Agent v5 only.
+default['datadog']['dogstatsd_target'] = 'http://localhost:17123' # Agent v5 only.
default['datadog']['statsd_forward_host'] = nil
default['datadog']['statsd_forward_port'] = 8125
default['datadog']['statsd_metric_namespace'] = nil
@@ -329,6 +331,7 @@ default['datadog']['extra_packages'] = {}
# Read more at http://docs.datadoghq.com/
# For older integrations that do not consume the conf.d yaml files
+# Agent v5 only.
default['datadog']['legacy_integrations']['nagios']['enabled'] = false
default['datadog']['legacy_integrations']['nagios']['description'] = 'Nagios integration'
default['datadog']['legacy_integrations']['nagios']['config']['nagios_log'] = '/var/log/nagios3/nagios.log'
@@ -355,9 +358,6 @@ default['datadog']['receiver_port'] = nil
# `connection_limit` is ignored in Agent 6
default['datadog']['connection_limit'] = nil
-# ddtrace python version
-default['datadog']['ddtrace_python_version'] = nil
-
# ddtrace ruby gem version
default['datadog']['ddtrace_gem_version'] = nil

default: remove deprecated options.