Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,20 @@ group :development do
gem "metadata-json-lint", '~> 3.0.3', require: false
gem "voxpupuli-puppet-lint-plugins", '~> 4.0', require: false
gem "dependency_checker", '= 0.3.0', require: false
gem 'puppet-lint', '~> 3.4.0', require: false
else
gem "facterdb", '~> 3.4.0', require: false
gem "facterdb", '~> 3.4.0', require: false
gem "test-kitchen", '~> 3.7.0'
gem "rubocop", '~> 1.50.0', require: false
gem "rubocop-rspec", '= 2.19.0', require: false
gem "rspec-puppet-facts", '~> 5.2.0', require: false
gem "rspec-puppet-facts", '~> 5.2.0', require: false
gem "rubocop-performance", '= 1.16.0', require: false
gem "librarian-puppet", '~> 5.0'
gem "io-console", '= 0.7.2', require: false
gem "metadata-json-lint", '~> 4.0', require: false
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
gem "dependency_checker", '~> 1.0.0', require: false
gem 'puppet-lint', '~> 4.3.0', require: false
end
end
group :development, :release_prep do
Expand Down
23 changes: 9 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ GEM
aws-eventstream (~> 1, >= 1.0.2)
base64 (0.2.0)
bcrypt_pbkdf (1.0.1)
bcrypt_pbkdf (1.0.1-x64-mingw32)
bigdecimal (3.1.9)
bindata (2.5.0)
bolt (4.0.0)
Expand Down Expand Up @@ -91,7 +92,6 @@ GEM
fast_gettext (2.4.0)
prime
ffi (1.17.1)
ffi (1.17.1-arm64-darwin)
forwardable (1.3.3)
getoptlong (0.2.1)
gettext (3.5.1)
Expand Down Expand Up @@ -223,18 +223,6 @@ GEM
puppet-resource_api (~> 1.5)
scanf (~> 1.0)
semantic_puppet (~> 1.0)
puppet (8.10.0-universal-darwin)
CFPropertyList (>= 3.0.6, < 4)
concurrent-ruby (~> 1.0)
deep_merge (~> 1.0)
facter (>= 4.3.0, < 5)
fast_gettext (>= 2.1, < 4)
getoptlong (~> 0.2.0)
locale (~> 2.1)
multi_json (~> 1.13)
puppet-resource_api (~> 1.5)
scanf (~> 1.0)
semantic_puppet (~> 1.0)
puppet-blacksmith (7.1.0)
puppet-modulebuilder (~> 1.0)
rest-client (~> 2.0)
Expand All @@ -247,7 +235,7 @@ GEM
rb-readline (>= 0.5.5)
table_print (>= 1.0.0)
tty-pager (~> 0.14)
puppet-lint (4.2.4)
puppet-lint (4.3.0)
puppet-lint-absolute_classname-check (4.0.0)
puppet-lint (>= 3.0, < 5)
puppet-lint-anchor-check (2.0.0)
Expand Down Expand Up @@ -337,6 +325,12 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rest-client (2.1.0-x64-mingw32)
ffi (~> 1.9)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
retryable (3.0.5)
rexml (3.4.1)
rgen (0.10.2)
Expand Down Expand Up @@ -534,6 +528,7 @@ DEPENDENCIES
puppet
puppet-blacksmith (~> 7.0)
puppet-debugger (~> 1.0)
puppet-lint (~> 4.3.0)
puppet-strings (~> 4.0)
puppet_litmus (~> 1.0)
puppetlabs_spec_helper (~> 8.0)
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@

if ($facts['os']['name'] == 'Windows') {
file { 'C:/ProgramData/Datadog':
ensure => directory,
ensure => directory,
}

file { 'C:/ProgramData/Datadog/datadog.yaml':
Expand Down
6 changes: 3 additions & 3 deletions manifests/redhat.pp
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@
}

yumrepo { 'datadog5':
ensure => absent,
ensure => absent,
}

yumrepo { 'datadog6':
ensure => absent,
ensure => absent,
}

yumrepo { 'datadog':
Expand All @@ -100,7 +100,7 @@
}
} else {
package { $agent_flavor:
ensure => $agent_version,
ensure => $agent_version,
}
}
}
2 changes: 1 addition & 1 deletion manifests/suse.pp
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,6 @@
}

package { $agent_flavor:
ensure => $agent_version,
ensure => $agent_version,
}
}