Skip to content

[agent6] adding support for the agent beta #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
truthbk merged 10 commits into from
Oct 26, 2017
Merged

[agent6] adding support for the agent beta #356

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3c190e1
[agent6] add support for agent6 config locations.
truthbk Oct 9, 2017
1f67d73
[agent6] adding agent6 repos.
truthbk Oct 10, 2017
bb05402
[agent6] adding datadog.yaml config template.
truthbk Oct 10, 2017
a68bcd6
[agent6] preparing main manifest for agent6 support.
truthbk Oct 10, 2017
07a6b98
[agent6][spec] fixes + spec test work
truthbk Oct 11, 2017
883f762
[agent6][repo] remove beta if on stable and viceversa
truthbk Oct 12, 2017
5afc6e2
[agent6][spec] adding RHEL and Ubuntu repo tests
truthbk Oct 12, 2017
03cf2c7
[agent6][yum] no ensure on yumrepo -> use datadog repo definition for…
truthbk Oct 13, 2017
9347fb5
[docker_daemon] agent6 goes back to docker.yaml for config
truthbk Oct 24, 2017
4923d33
[gemfile] pin jwt to 1.5.6
truthbk Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ source "https://rubygems.org"

group :test do
gem "syck"
gem "public_suffix", "~> 2.0.5"
gem "safe_yaml", "~> 1.0.4"
gem "hiera-eyaml", "~> 2.1.0"
gem "listen", "~> 3.0.0"
Expand Down
1 change: 1 addition & 0 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.send('disable_class_parameter_defaults')
# http://puppet-lint.com/checks/class_inherits_from_params_class/
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
PuppetLint.configuration.send('disable_variable_scope')

exclude_paths = [
"pkg/**/*",
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/reports/datadog_reports.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

Puppet::Reports.register_report(:datadog_reports) do

configfile = "/etc/dd-agent/datadog.yaml"
configfile = "/etc/datadog-agent/datadog-reports.yaml"
raise(Puppet::ParseError, "Datadog report config file #{configfile} not readable") unless File.readable?(configfile)
config = YAML.load_file(configfile)
API_KEY = config[:datadog_api_key]
Expand Down
161 changes: 115 additions & 46 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@
# $use_dogstatsd
# Enables the dogstatsd server
# Boolean. Default: true
# $dogstatsd_socket
# Specifies the socket file to be used by dogstatsd. Must have use_dogstatsd set
# String. Default: empty
# $dogstatsd_port
# Specifies the port to be used by dogstatsd. Must have use_dogstatsd set
# String. Default: empty
Expand Down Expand Up @@ -139,6 +142,9 @@
# $custom_emitters
# Specifies a comma seperated list of non standard emitters to be used
# String. Default: empty
# $agent6_log_file
# Specifies the log file location for the agent6
# String. Default: empty
# $collector_log_file
# Specifies the log file location for the collector system
# String. Default: empty
Expand Down Expand Up @@ -199,6 +205,7 @@
$manage_repo = true,
$hostname_extraction_regex = nil,
$dogstatsd_port = 8125,
$dogstatsd_socket = '',
$statsd_forward_host = '',
$statsd_forward_port = '',
$statsd_histogram_percentiles = '0.95',
Expand Down Expand Up @@ -227,6 +234,7 @@
$dogstatsd_normalize = true,
$device_blacklist_re = '',
$custom_emitters = '',
$agent6_log_file = '/var/log/datadog/agent.log',
$collector_log_file = '',
$forwarder_log_file = '',
$dogstatsd_log_file = '',
Expand All @@ -240,7 +248,9 @@
$sd_template_dir = '',
$sd_jmx_enable = false,
$consul_token = '',
$agent6_enable = $datadog_agent::params::agent6_enable,
$conf_dir = $datadog_agent::params::conf_dir,
$conf6_dir = $datadog_agent::params::conf6_dir,
Copy link
Copy Markdown
Member

@hush-hush hush-hush Oct 23, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to overwrite $conf_dir if agent6 is enable ? It would avoid adding a if/else statement in every integration .pp.

Copy link
Copy Markdown
Member Author

@truthbk truthbk Oct 24, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

variables are actually constants in puppet, so unfortunately no dice.

I first tried just adding agent6_enable but then that forced the customer to override conf_dir manually, that would result in a ton of issues and most customers would just expect the agent6_enable tag to work.

$conf_dir_purge = $datadog_agent::params::conf_dir_purge,
$service_name = $datadog_agent::params::service_name,
$package_name = $datadog_agent::params::package_name,
Expand Down Expand Up @@ -306,6 +316,7 @@
validate_string($statsd_forward_host)
validate_string($device_blacklist_re)
validate_string($custom_emitters)
validate_string($agent6_log_file)
validate_string($collector_log_file)
validate_string($forwarder_log_file)
validate_string($dogstatsd_log_file)
Expand All @@ -320,6 +331,7 @@
validate_bool($sd_jmx_enable)
validate_string($consul_token)
validate_bool($apm_enabled)
validate_bool($agent6_enable)
validate_string($apm_env)

if $hiera_tags {
Expand Down Expand Up @@ -352,74 +364,131 @@
}

case $::operatingsystem {
'Ubuntu','Debian' : { include datadog_agent::ubuntu }
'Ubuntu','Debian' : {
if !$agent6_enable {
include datadog_agent::ubuntu
} else {
include datadog_agent::ubuntu::agent6
}
}
'RedHat','CentOS','Fedora','Amazon','Scientific' : {
class { 'datadog_agent::redhat':
manage_repo => $manage_repo,
if !$agent6_enable {
class { 'datadog_agent::redhat':
manage_repo => $manage_repo,
}
} else {
class { 'datadog_agent::redhat::agent6':
manage_repo => $manage_repo,
}
}
}
default: { fail("Class[datadog_agent]: Unsupported operatingsystem: ${::operatingsystem}") }
}

file { '/etc/dd-agent':
# required by reports even in agent5 scenario
file { '/etc/datadog-agent':
ensure => directory,
owner => $dd_user,
group => $dd_group,
mode => '0755',
require => Package['datadog-agent'],
}

file { $conf_dir:
ensure => directory,
purge => $conf_dir_purge,
recurse => true,
force => $conf_dir_purge,
owner => $dd_user,
group => $dd_group,
notify => Service['datadog-agent']
}

concat {'/etc/dd-agent/datadog.conf':
owner => $datadog_agent::params::dd_user,
group => $datadog_agent::params::dd_group,
mode => '0640',
notify => Service[$datadog_agent::params::service_name],
require => File['/etc/dd-agent'],
}
if !$agent6_enable {
file { '/etc/dd-agent':
ensure => directory,
owner => $dd_user,
group => $dd_group,
mode => '0755',
require => Package['datadog-agent'],
}

concat::fragment{ 'datadog header':
target => '/etc/dd-agent/datadog.conf',
content => template('datadog_agent/datadog_header.conf.erb'),
order => '01',
}
file { $conf_dir:
ensure => directory,
purge => $conf_dir_purge,
recurse => true,
force => $conf_dir_purge,
owner => $dd_user,
group => $dd_group,
notify => Service['datadog-agent']
}

concat::fragment{ 'datadog tags':
target => '/etc/dd-agent/datadog.conf',
content => 'tags: ',
order => '02',
}
concat {'/etc/dd-agent/datadog.conf':
owner => $datadog_agent::params::dd_user,
group => $datadog_agent::params::dd_group,
mode => '0640',
notify => Service[$datadog_agent::params::service_name],
require => File['/etc/dd-agent'],
}

concat::fragment{ 'datadog footer':
target => '/etc/dd-agent/datadog.conf',
content => template('datadog_agent/datadog_footer.conf.erb'),
order => '05',
}
concat::fragment{ 'datadog header':
target => '/etc/dd-agent/datadog.conf',
content => template('datadog_agent/datadog_header.conf.erb'),
order => '01',
}

concat::fragment{ 'datadog tags':
target => '/etc/dd-agent/datadog.conf',
content => 'tags: ',
order => '02',
}

concat::fragment{ 'datadog footer':
target => '/etc/dd-agent/datadog.conf',
content => template('datadog_agent/datadog_footer.conf.erb'),
order => '05',
}

if ($extra_template != '') {
concat::fragment{ 'datadog extra_template footer':
target => '/etc/dd-agent/datadog.conf',
content => template($extra_template),
order => '06',
}
$apm_footer_order = '07'
} else {
$apm_footer_order = '06'
}

if ($extra_template != '') {
concat::fragment{ 'datadog extra_template footer':
concat::fragment{ 'datadog apm footer':
target => '/etc/dd-agent/datadog.conf',
content => template($extra_template),
order => '06',
content => template('datadog_agent/datadog_apm_footer.conf.erb'),
order => $apm_footer_order,
}
$apm_footer_order = '07'
} else {
$apm_footer_order = '06'
}

concat::fragment{ 'datadog apm footer':
target => '/etc/dd-agent/datadog.conf',
content => template('datadog_agent/datadog_apm_footer.conf.erb'),
order => $apm_footer_order,
file { $conf6_dir:
ensure => directory,
purge => $conf_dir_purge,
recurse => true,
force => $conf_dir_purge,
owner => $dd_user,
group => $dd_group,
notify => Service['datadog-agent']
}

$agent_config = {
'api_key' => $api_key,
'dd_url' => $dd_url,
'cmd_port' => 5001,
'conf_path' => $datadog_agent::params::conf6_dir,
'enable_metadata_collection' => $collect_instance_metadata,
'dogstatsd_port' => $dogstatsd_port,
'dogstatsd_socket' => $dogstatsd_socket,
'dogstatsd_non_local_traffic' => $non_local_traffic,
'log_file' => $agent6_log_file,
'log_level' => $log_level,
}

file { '/etc/datadog-agent/datadog.yaml':
owner => 'dd-agent',
group => 'dd-agent',
mode => '0640',
content => template('datadog_agent/datadog6.yaml.erb'),
notify => Service[$datadog_agent::params::service_name],
require => File['/etc/datadog-agent'],
}
}


Expand Down
8 changes: 7 additions & 1 deletion manifests/integration.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@
}
validate_string($integration)

file { "${datadog_agent::conf_dir}/${integration}.yaml":
if $::datadog_agent::agent6_enable {
$dst = "${datadog_agent::conf6_dir}/${integration}.yaml"
} else {
$dst = "${datadog_agent::conf_dir}/${integration}.yaml"
}

file { $dst:
ensure => file,
owner => $datadog_agent::dd_user,
group => $datadog_agent::dd_group,
Expand Down
8 changes: 7 additions & 1 deletion manifests/integrations/apache.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@
validate_array($tags)
validate_bool($disable_ssl_validation)

file { "${datadog_agent::params::conf_dir}/apache.yaml":
if $::datadog_agent::agent6_enable {
$dst = "${datadog_agent::conf6_dir}/apache.yaml"
} else {
$dst = "${datadog_agent::conf_dir}/apache.yaml"
}

file { $dst:
ensure => file,
owner => $datadog_agent::params::dd_user,
group => $datadog_agent::params::dd_group,
Expand Down
8 changes: 7 additions & 1 deletion manifests/integrations/cacti.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@
) inherits datadog_agent::params {
include datadog_agent

file { "${datadog_agent::params::conf_dir}/cacti.yaml":
if $::datadog_agent::agent6_enable {
$dst = "${datadog_agent::conf6_dir}/cacti.yaml"
} else {
$dst = "${datadog_agent::conf_dir}/cacti.yaml"
}

file { $dst:
ensure => file,
owner => $datadog_agent::params::dd_user,
group => $datadog_agent::params::dd_group,
Expand Down
8 changes: 7 additions & 1 deletion manifests/integrations/cassandra.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@
require ::datadog_agent
validate_hash($tags)

file { "${datadog_agent::params::conf_dir}/cassandra.yaml":
if $::datadog_agent::agent6_enable {
$dst = "${datadog_agent::conf6_dir}/cassandra.yaml"
} else {
$dst = "${datadog_agent::conf_dir}/cassandra.yaml"
}

file { $dst:
ensure => file,
owner => $datadog_agent::params::dd_user,
group => $datadog_agent::params::dd_group,
Expand Down
8 changes: 7 additions & 1 deletion manifests/integrations/ceph.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@
content => "# This file is required for dd ceph \ndd-agent ALL=(ALL) NOPASSWD:/usr/bin/ceph\n"
}

file { "${datadog_agent::params::conf_dir}/ceph.yaml":
if $::datadog_agent::agent6_enable {
$dst = "${datadog_agent::conf6_dir}/ceph.yaml"
} else {
$dst = "${datadog_agent::conf_dir}/ceph.yaml"
}

file { $dst:
ensure => file,
owner => $datadog_agent::params::dd_user,
group => $datadog_agent::params::dd_group,
Expand Down
8 changes: 7 additions & 1 deletion manifests/integrations/consul.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@
validate_bool($new_leader_checks)
validate_array($service_whitelist)

file { "${datadog_agent::params::conf_dir}/consul.yaml":
if $::datadog_agent::agent6_enable {
$dst = "${datadog_agent::conf6_dir}/consul.yaml"
} else {
$dst = "${datadog_agent::conf_dir}/consul.yaml"
}

file { $dst:
ensure => file,
owner => $datadog_agent::params::dd_user,
group => $datadog_agent::params::dd_group,
Expand Down
8 changes: 7 additions & 1 deletion manifests/integrations/directory.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@
fail('you must specify a directory path within the datadog_agent::integrations::directory class')
}

file { "${datadog_agent::params::conf_dir}/directory.yaml":
if $::datadog_agent::agent6_enable {
$dst = "${datadog_agent::conf6_dir}/directory.yaml"
} else {
$dst = "${datadog_agent::conf_dir}/directory.yaml"
}

file { $dst:
ensure => file,
owner => $datadog_agent::params::dd_user,
group => $datadog_agent::params::dd_group,
Expand Down
8 changes: 7 additions & 1 deletion manifests/integrations/disk.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,13 @@
validate_re($all_partitions, '^(no|yes)$', "all_partitions should be either 'yes' or 'no'")
}

file { "${datadog_agent::params::conf_dir}/disk.yaml":
if $::datadog_agent::agent6_enable {
$dst = "${datadog_agent::conf6_dir}/disk.yaml"
} else {
$dst = "${datadog_agent::conf_dir}/disk.yaml"
}

file { $dst:
ensure => file,
owner => $datadog_agent::params::dd_user,
group => $datadog_agent::params::dd_group,
Expand Down
8 changes: 7 additions & 1 deletion manifests/integrations/dns_check.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,13 @@

validate_array($checks)

file { "${datadog_agent::params::conf_dir}/dns_check.yaml":
if $::datadog_agent::agent6_enable {
$dst = "${datadog_agent::conf6_dir}/dns_check.yaml"
} else {
$dst = "${datadog_agent::conf_dir}/dns_check.yaml"
}

file { $dst:
ensure => file,
owner => $datadog_agent::params::dd_user,
group => $datadog_agent::params::dd_group,
Expand Down
Loading
⚡