Merge branch 'xenon8/puppet-8-upgrade' of https://github.com/xenon8/puppet-datadog-agent into xenon8/puppet-8-upgrade

Darren Gipson · Darren Gipson · commit e0e7f090b1f7 · 2025-03-07T07:23:41.000Z
diff --git a/Gemfile b/Gemfile
@@ -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
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -799,7 +799,7 @@
 
   if ($facts['os']['name'] == 'Windows') {
     file { 'C:/ProgramData/Datadog':
-      ensure   => directory,
+      ensure => directory,
     }
 
     file { 'C:/ProgramData/Datadog/datadog.yaml':
diff --git a/manifests/integrations/mongo.pp b/manifests/integrations/mongo.pp
@@ -8,16 +8,20 @@
 # NOTE: In newer versions of the Datadog Agent, the ssl parameters will be deprecated in favor the tls variants
 #
 # Parameters:
+#   $hosts
+#       Array of hosts host (and optional port number) where the mongod instance is running
+#   $dbm
+#       Enable the Database Monitoring feature
+#   $database_autodiscovery
+#       Enable the Database Autodiscovery feature
+#   $reported_database_hostname
+#       Optional database hostname override the mongodb hostname detected by the Agent from mongodb admin command serverStatus
 #   $additional_metrics
 #       Optional array of additional metrics
 #   $database
 #       Optionally specify database to query. Defaults to 'admin'
-#   $host:
-#       The host mongo is running on. Defaults to '127.0.0.1'
 #   $password
 #       Optionally specify password for connection
-#   $port
-#       The port mongo is running on. Defaults to 27017
 #   $ssl
 #       Optionally enable SSL for connection
 #   $ssl_ca_certs
@@ -40,6 +44,12 @@
 #       Optional array of tags
 #   $username
 #       Optionally specify username for connection
+#   $host:
+#       Deprecated use $hosts instead
+#       The host mongo is running on. Defaults to '127.0.0.1'
+#   $port
+#       Deprecated use $hosts instead
+#       The port mongo is running on. Defaults to 27017
 #
 # Sample Usage (Older Agent Versions):
 #
@@ -76,19 +86,20 @@
 #      {
 #        'additional_metrics' => ['top'],
 #        'database'           => 'database_name',
-#        'host'               => 'localhost',
+#        'hosts'              => ['localhost:27017'],
 #        'password'           => 'mongo_password',
-#        'port'               => '27017',
 #        'tls'                => true,
 #        'tls_ca_file'       => '/path/to/ca.pem',
 #        'tls_allow_invalid_certificates'      => false,
 #        'tls_certificate_key_file'       => '/path/to/combined.pem',
 #        'tags'               => ['optional_tag1', 'optional_tag2'],
 #        'username'           => 'mongo_username',
+#        'dbm'                => true,
+#        'database_autodiscovery' => {'enabled' => true},
+#        'reported_database_hostname' => 'mymongodbhost',
 #      },
 #      {
-#        'host'               => 'localhost',
-#        'port'               => '27018',
+#        'hosts'              => ['localhost:27017'],
 #        'tags'               => [],
 #        'additional_metrics' => [],
 #        'collections'        => [],
diff --git a/manifests/integrations/redis.pp b/manifests/integrations/redis.pp
@@ -14,6 +14,20 @@
 #       The main redis port.
 #   $ports
 #       Array of redis ports: overrides port (optional)
+#   $ssl
+#       Enable SSL/TLS encryption for the check (optional)
+#   $ssl_keyfile
+#       The path to the client-side private keyfile (optional)
+#   $ssl_certfile
+#       The path to the client-side certificate file (optional)
+#   $ssl_ca_certs
+#       The path to the ca_certs file (optional)
+#   $ssl_cert_reqs
+#       Specifies whether a certificate is required from the
+#       other side of the connection, and whether it's validated if provided (optional)
+#         * 0 for ssl.CERT_NONE (certificates ignored)
+#         * 1 for ssl.CERT_OPTIONAL (not required, but validated if provided)
+#         * 2 for ssl.CERT_REQUIRED (required and validated)
 #   $slowlog_max_len
 #       The max length of the slow-query log (optional)
 #   $tags
@@ -48,6 +62,11 @@
   String $password                          = '',
   Variant[String, Integer] $port            = '6379',
   Optional[Array] $ports                    = undef,
+  Boolean $ssl                              = false,
+  String $ssl_keyfile                       = '',
+  String $ssl_certfile                      = '',
+  String $ssl_ca_certs                      = '',
+  Optional[Integer] $ssl_cert_reqs          = undef,
   Variant[String, Integer] $slowlog_max_len = '',
   Array $tags                               = [],
   Array $keys                               = [],
@@ -69,6 +88,11 @@
       'host'                 => $host,
       'password'             => $password,
       'port'                 => $instance_port,
+      'ssl'                  => $ssl,
+      'ssl_keyfile'          => $ssl_keyfile,
+      'ssl_certfile'         => $ssl_certfile,
+      'ssl_ca_certs'         => $ssl_ca_certs,
+      'ssl_cert_reqs'        => $ssl_cert_reqs,
       'slowlog_max_len'      => $slowlog_max_len,
       'tags'                 => $tags,
       'keys'                 => $keys,
diff --git a/manifests/redhat.pp b/manifests/redhat.pp
@@ -78,11 +78,11 @@
     }
 
     yumrepo { 'datadog5':
-      ensure   => absent,
+      ensure => absent,
     }
 
     yumrepo { 'datadog6':
-      ensure   => absent,
+      ensure => absent,
     }
 
     yumrepo { 'datadog':
@@ -100,7 +100,7 @@
     }
   } else {
     package { $agent_flavor:
-      ensure  => $agent_version,
+      ensure => $agent_version,
     }
   }
 }
diff --git a/manifests/suse.pp b/manifests/suse.pp
@@ -96,6 +96,6 @@
   }
 
   package { $agent_flavor:
-    ensure  => $agent_version,
+    ensure => $agent_version,
   }
 }
diff --git a/spec/classes/datadog_agent_integrations_mongo_spec.rb b/spec/classes/datadog_agent_integrations_mongo_spec.rb
@@ -23,6 +23,30 @@
         it { is_expected.to contain_file(conf_file).without_content(%r{tags:}) }
       end
 
+      context 'with one mongo host defined in hosts' do
+        let(:params) do
+          {
+            servers: [
+              {
+                'hosts' => ['localhost:27017'],
+                'username' => 'user',
+                'password' => 'pass',
+                'dbm' => true,
+                'database_autodiscovery' => { 'enabled' => true },
+                'reported_database_hostname' => 'mongohost',
+              },
+            ],
+          }
+        end
+
+        it { is_expected.to contain_file(conf_file).with_content(%r{- hosts:\s+- localhost:27017}) }
+        it { is_expected.to contain_file(conf_file).with_content(%r{username: user}) }
+        it { is_expected.to contain_file(conf_file).with_content(%r{password: pass}) }
+        it { is_expected.to contain_file(conf_file).with_content(%r{dbm: true}) }
+        it { is_expected.to contain_file(conf_file).with_content(%r{database_autodiscovery:\s+enabled: true}) }
+        it { is_expected.to contain_file(conf_file).with_content(%r{reported_database_hostname: mongohost}) }
+      end
+
       context 'with one mongo' do
         let(:params) do
           {
diff --git a/templates/agent-conf.d/mongo.yaml.erb b/templates/agent-conf.d/mongo.yaml.erb
@@ -4,7 +4,24 @@ init_config:
 
 instances:
 <% @servers.each do |server| -%>
+  <% if !server['hosts'].nil? && server['hosts'].any? -%>
+  - hosts:
+    <%- server['hosts'].each do |host| -%>
+      - <%= host %>
+    <%- end -%>
+    <%- if !server['username'].nil? -%>
+      username: <%= server['username'] %>
+    <%- end -%>
+    <%- if !server['password'].nil? -%>
+      password: <%= server['password'] %>
+    <%- end -%>
+    <%- if !server['database'].nil? -%>
+      database: <%= server['database'] %>
+    <%- end -%>
+  <%- end -%>
+  <% if server['hosts'].nil? -%>
   - server: mongodb://<%= server['username'] %><%= ":" unless server['password'].nil? %><%= server['password'] %><%= "@" unless server['username'].nil? %><%= server['host'] %>:<%= server['port'] %>/<%= server['database'] %>
+  <%- end -%>
   <%- if !server['tags'].nil? && server['tags'].any? -%>
     tags:
     <%- server['tags'].each do |tag| -%>
@@ -50,4 +67,16 @@ instances:
       - <%= collection %>
     <%- end -%>
   <%- end -%>
+  <%- if !server['dbm'].nil? -%>
+    dbm: <%= server['dbm'] %>
+  <%- end -%>
+  <%- if !server['database_autodiscovery'].nil? -%>
+    database_autodiscovery:
+    <%- if !server['database_autodiscovery']['enabled'].nil? -%>
+      enabled: <%= server['database_autodiscovery']['enabled'] %>
+    <%- end -%>
+  <%- end -%>
+  <%- if !server['reported_database_hostname'].nil? -%>
+    reported_database_hostname: <%= server['reported_database_hostname'] %>
+  <%- end -%>
 <% end -%>

Original file line number	Diff line number	Diff line change
`@@ -799,7 +799,7 @@`
`799`	`799`
`800`	`800`	`if ($facts['os']['name'] == 'Windows') {`
`801`	`801`	`file { 'C:/ProgramData/Datadog':`
`802`		`- ensure => directory,`
	`802`	`+ ensure => directory,`
`803`	`803`	`}`
`804`	`804`
`805`	`805`	`file { 'C:/ProgramData/Datadog/datadog.yaml':`
Original file line number	Diff line number	Diff line change
`@@ -78,11 +78,11 @@`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`yumrepo { 'datadog5':`
`81`		`- ensure => absent,`
	`81`	`+ ensure => absent,`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`yumrepo { 'datadog6':`
`85`		`- ensure => absent,`
	`85`	`+ ensure => absent,`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`yumrepo { 'datadog':`
`@@ -100,7 +100,7 @@`
`100`	`100`	`}`
`101`	`101`	`} else {`
`102`	`102`	`package { $agent_flavor:`
`103`		`- ensure => $agent_version,`
	`103`	`+ ensure => $agent_version,`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,6 @@`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`package { $agent_flavor:`
`99`		`- ensure => $agent_version,`
	`99`	`+ ensure => $agent_version,`
`100`	`100`	`}`
`101`	`101`	`}`