Skip to content

[agents] allow provider service override #444

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 3 commits into from
Jul 10, 2018
Merged

[agents] allow provider service override #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24e9ffc
[agents] allow provider service override
truthbk Jul 5, 2018
6fc0f25
[ci] pinning fog-openstack for older rubies
truthbk Jul 5, 2018
9db03e8
[main] adding service provider option to main manifest + test cleanup
truthbk Jul 6, 2018
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 @@ -14,6 +14,7 @@ group :test do
end

group :development do
gem "fog-openstack", "0.1.25" if RUBY_VERSION < '2.2.0'
gem "beaker-rspec"
gem "beaker", '3.31.0'
gem "guard-rake"
Expand Down
21 changes: 13 additions & 8 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
$agent5_repo_uri = $datadog_agent::params::agent5_default_repo,
$agent6_repo_uri = $datadog_agent::params::agent6_default_repo,
$apt_release = $datadog_agent::params::apt_default_release,
Optional[String] $service_provider = undef,
) inherits datadog_agent::params {

# Allow ports to be passed as integers or strings.
Expand Down Expand Up @@ -399,6 +400,7 @@
class { 'datadog_agent::ubuntu::agent5':
service_ensure => $service_ensure,
service_enable => $service_enable,
service_provider => $service_provider,
location => $agent5_repo_uri,
release => $apt_release,
skip_apt_key_trusting => $skip_apt_key_trusting,
Expand All @@ -407,6 +409,7 @@
class { 'datadog_agent::ubuntu::agent6':
service_ensure => $service_ensure,
service_enable => $service_enable,
service_provider => $service_provider,
location => $agent6_repo_uri,
release => $apt_release,
skip_apt_key_trusting => $skip_apt_key_trusting,
Expand All @@ -416,17 +419,19 @@
'RedHat','CentOS','Fedora','Amazon','Scientific' : {
if $agent5_enable {
class { 'datadog_agent::redhat::agent5':
baseurl => $agent5_repo_uri,
manage_repo => $manage_repo,
service_ensure => $service_ensure,
service_enable => $service_enable,
baseurl => $agent5_repo_uri,
manage_repo => $manage_repo,
service_ensure => $service_ensure,
service_enable => $service_enable,
service_provider => $service_provider,
}
} else {
class { 'datadog_agent::redhat::agent6':
baseurl => $agent6_repo_uri,
manage_repo => $manage_repo,
service_ensure => $service_ensure,
service_enable => $service_enable,
baseurl => $agent6_repo_uri,
manage_repo => $manage_repo,
service_ensure => $service_ensure,
service_enable => $service_enable,
service_provider => $service_provider,
}
}
}
Expand Down
24 changes: 18 additions & 6 deletions manifests/redhat/agent5.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
String $agent_version = 'latest',
String $service_ensure = 'running',
Boolean $service_enable = true,
Optional[String] $service_provider = undef,
) inherits datadog_agent::params {

validate_legacy('Boolean', 'validate_bool', $manage_repo)
Expand Down Expand Up @@ -89,12 +90,23 @@
ensure => $agent_version,
}

service { $datadog_agent::params::service_name:
ensure => $service_ensure,
enable => $service_enable,
hasstatus => false,
pattern => 'dd-agent',
require => Package[$datadog_agent::params::package_name],
if $service_provider {
service { $datadog_agent::params::service_name:
ensure => $service_ensure,
enable => $service_enable,
provider => $service_provider,
hasstatus => false,
pattern => 'dd-agent',
require => Package[$datadog_agent::params::package_name],
}
} else {
service { $datadog_agent::params::service_name:
ensure => $service_ensure,
enable => $service_enable,
hasstatus => false,
pattern => 'dd-agent',
require => Package[$datadog_agent::params::package_name],
}
}

}
24 changes: 18 additions & 6 deletions manifests/redhat/agent6.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
String $agent_version = 'latest',
String $service_ensure = 'running',
Boolean $service_enable = true,
Optional[String] $service_provider = undef,
) inherits datadog_agent::params {

validate_legacy('Boolean', 'validate_bool', $manage_repo)
Expand Down Expand Up @@ -63,12 +64,23 @@
ensure => $agent_version,
}

service { $datadog_agent::params::service_name:
ensure => $service_ensure,
enable => $service_enable,
hasstatus => false,
pattern => 'dd-agent',
require => Package[$datadog_agent::params::package_name],
if $service_provider {
service { $datadog_agent::params::service_name:
ensure => $service_ensure,
enable => $service_enable,
provider => $service_provider,
hasstatus => false,
pattern => 'dd-agent',
require => Package[$datadog_agent::params::package_name],
}
} else {
service { $datadog_agent::params::service_name:
ensure => $service_ensure,
enable => $service_enable,
hasstatus => false,
pattern => 'dd-agent',
require => Package[$datadog_agent::params::package_name],
}
}

}
24 changes: 18 additions & 6 deletions manifests/ubuntu/agent5.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
Boolean $skip_apt_key_trusting = false,
String $service_ensure = 'running',
Boolean $service_enable = true,
Optional[String] $service_provider = undef,
) inherits datadog_agent::params{

ensure_packages(['apt-transport-https'])
Expand Down Expand Up @@ -79,11 +80,22 @@
Exec['apt_update']],
}

service { $datadog_agent::params::service_name:
ensure => $service_ensure,
enable => $service_enable,
hasstatus => false,
pattern => 'dd-agent',
require => Package[$datadog_agent::params::package_name],
if $service_provider {
service { $datadog_agent::params::service_name:
ensure => $service_ensure,
enable => $service_enable,
provider => $service_provider,
hasstatus => false,
pattern => 'dd-agent',
require => Package[$datadog_agent::params::package_name],
}
} else {
service { $datadog_agent::params::service_name:
ensure => $service_ensure,
enable => $service_enable,
hasstatus => false,
pattern => 'dd-agent',
require => Package[$datadog_agent::params::package_name],
}
}
}
24 changes: 18 additions & 6 deletions manifests/ubuntu/agent6.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
$skip_apt_key_trusting = false,
$service_ensure = 'running',
$service_enable = true,
Optional[String] $service_provider = undef,
) inherits datadog_agent::params {

ensure_packages(['apt-transport-https'])
Expand Down Expand Up @@ -45,11 +46,22 @@
Exec['apt_update']],
}

service { $datadog_agent::params::service_name:
ensure => $service_ensure,
enable => $service_enable,
hasstatus => false,
pattern => 'dd-agent',
require => Package['datadog-agent'],
if $service_provider {
service { $datadog_agent::params::service_name:
ensure => $service_ensure,
enable => $service_enable,
provider => $service_provider,
hasstatus => false,
pattern => 'dd-agent',
require => Package['datadog-agent'],
}
} else {
service { $datadog_agent::params::service_name:
ensure => $service_ensure,
enable => $service_enable,
hasstatus => false,
pattern => 'dd-agent',
require => Package['datadog-agent'],
}
}
}
30 changes: 30 additions & 0 deletions spec/classes/datadog_agent_redhat_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@
should_not contain_yumrepo('datadog6')
end
end
context 'overriding provider' do
let(:params) {{
service_provider: 'upstart',
}}
it do
should contain_service('datadog-agent')\
.that_requires('package[datadog-agent]')
end
it do
should contain_service('datadog-agent').with(
'provider' => 'upstart',
'ensure' => 'running',
)
end
end


# it should install the packages
Expand Down Expand Up @@ -76,6 +91,21 @@
should_not contain_yumrepo('datadog6')
end
end
context 'overriding provider' do
let(:params) {{
service_provider: 'upstart',
}}
it do
should contain_service('datadog-agent')\
.that_requires('package[datadog-agent]')
end
it do
should contain_service('datadog-agent').with(
'provider' => 'upstart',
'ensure' => 'running',
)
end
end


# it should install the packages
Expand Down
40 changes: 38 additions & 2 deletions spec/classes/datadog_agent_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,22 @@
)}
end

context 'with service provider override' do
let(:params) {{
:service_provider => 'upstart',
}}
it do
should contain_service('datadog-agent')\
.that_requires('package[datadog-agent]')
end
it do
should contain_service('datadog-agent').with(
'provider' => 'upstart',
'ensure' => 'running',
)
end
end

end
end

Expand Down Expand Up @@ -899,7 +915,9 @@
)}
it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
'content' => /^logs_enabled: false\n/,
'content' => /^\ \ container_collect_all: false\n/,
)}
it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
'content' => /^logs_config:\n\ \ container_collect_all: false\n/,
)}
end
end
Expand Down Expand Up @@ -1051,8 +1069,26 @@
}}
it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
'content' => /^logs_enabled: true\n/,
'content' => /^\ \ container_collect_all: true\n/,
)}
it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
'content' => /^logs_config:\n\ \ container_collect_all: true\n/,
)}
end

context 'with service provider override' do
let(:params) {{
:service_provider => 'upstart',
}}
it do
should contain_service('datadog-agent')\
.that_requires('package[datadog-agent]')
end
it do
should contain_service('datadog-agent').with(
'provider' => 'upstart',
'ensure' => 'running',
)
end
end

end
Expand Down
32 changes: 32 additions & 0 deletions spec/classes/datadog_agent_ubuntu_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,22 @@
should contain_service('datadog-agent')\
.that_requires('package[datadog-agent]')
end

context 'overriding provider' do
let(:params) {{
service_provider: 'upstart',
}}
it do
should contain_service('datadog-agent')\
.that_requires('package[datadog-agent]')
end
it do
should contain_service('datadog-agent').with(
'provider' => 'upstart',
'ensure' => 'running',
)
end
end
end

describe 'datadog_agent::ubuntu::agent6' do
Expand Down Expand Up @@ -93,4 +109,20 @@
should contain_service('datadog-agent')\
.that_requires('package[datadog-agent]')
end

context 'overriding provider' do
let(:params) {{
service_provider: 'upstart',
}}
it do
should contain_service('datadog-agent')\
.that_requires('package[datadog-agent]')
end
it do
should contain_service('datadog-agent').with(
'provider' => 'upstart',
'ensure' => 'running',
)
end
end
end
⚡