Merge branch 'main' into asenci/instances-hash

Author: asenci

environments/etc/manifests/site.pp

@@ -1,5 +1,25 @@
 node default {
+
   class { 'datadog_agent':
-    api_key => 'somenonnullapikeythats32charlong',
+    api_key             => 'somenonnullapikeythats32charlong',
+    agent_extra_options => {
+        use_http => true,
+    },
+    facts_to_tags       => ['osfamily'],
+    integrations        => {
+      'ntp' => {
+        init_config => {},
+        instances   => [{
+            offset_threshold => 30,
+        }],
+      },
+    },
   }
+
+  class { 'datadog_agent::integrations::apache':
+    url      => 'http://example.com/server-status?auto',
+    username => 'status',
+    password => 'hunter1',
+  }
+
 }

kitchen.yml

@@ -28,6 +28,7 @@ platforms:
         - mkdir /home/kitchen/puppet
         - printf <%= File.read('environments/etc/Puppetfile').inspect %> > /home/kitchen/puppet/Puppetfile
 
+        - gem install bundler -v '= 1.17.3'
         - gem install r10k -v 2.6.7
         - cd /home/kitchen/puppet && r10k puppetfile install --moduledir=/tmp/modules
 
@@ -45,6 +46,7 @@ platforms:
         - mkdir /home/kitchen/puppet
         - printf <%= File.read('environments/etc/Puppetfile').inspect %> > /home/kitchen/puppet/Puppetfile
 
+        - gem install bundler -v '= 1.17.3'
         - gem install r10k -v 2.6.7
         - cd /home/kitchen/puppet && r10k puppetfile install --moduledir=/tmp/modules
 
@@ -64,6 +66,7 @@ platforms:
         - mkdir /home/kitchen/puppet
         - printf <%= File.read('environments/etc/Puppetfile').inspect %> > /home/kitchen/puppet/Puppetfile
 
+        - gem install bundler -v '= 1.17.3'
         - gem install r10k -v 2.6.7
         - cd /home/kitchen/puppet && r10k puppetfile install --moduledir=/tmp/modules
 
@@ -81,7 +84,8 @@ platforms:
       provision_command:
         - zypper ar -G https://yum.puppet.com/puppet/sles/15/x86_64/ puppet-repo
         - zypper install -y puppet-agent ruby=2.5
-        - gem install bundler serverspec rspec
+        - gem install bundler -v '= 1.17.3'
+        - gem install serverspec rspec
         - ln -s /usr/bin/rspec.ruby2.5 /usr/bin/rspec
         - ln -s /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
         - mkdir /home/kitchen/puppet

manifests/install_integration.pp

@@ -5,7 +5,7 @@
   Boolean                   $third_party      = false,
 ){
 
-  include datadog_agent
+  require ::datadog_agent
 
   if $ensure == 'present' {
 

manifests/integration.pp

@@ -7,7 +7,9 @@
   Enum['present', 'absent'] $ensure = 'present',
 ){
 
-  include datadog_agent
+  # We can't `require ::datadog_agent` from here since this class is used by the
+  # datadog_agent class, causing a dependency cycle. If using this class
+  # directly, you should define datadog_agent before datadog_agent::integration.
 
   if $::datadog_agent::_agent_major_version > 5 {
     $dst_dir = "${datadog_agent::params::conf_dir}/${integration}.d"

manifests/integrations/activemq_xml.pp

@@ -52,7 +52,7 @@
   Optional[Array[String]] $detailed_subscribers = [],
   Optional[Array] $instances                    = undef,
 ) inherits datadog_agent::params {
-  include datadog_agent
+  require ::datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/activemq_xml.yaml"
   if $::datadog_agent::_agent_major_version > 5 {

manifests/integrations/apache.pp

@@ -36,7 +36,7 @@
   Optional[Array] $instances                = undef,
   Optional[Array] $logs                     = undef,
 ) inherits datadog_agent::params {
-  include datadog_agent
+  require ::datadog_agent
 
   if !$instances {
     $_instances = datadog_agent::clean_empty([{

manifests/integrations/cacti.pp

@@ -18,7 +18,7 @@
   $mysql_password = undef,
   $rrd_path = '/var/lib/cacti/rra/',
 ) inherits datadog_agent::params {
-  include datadog_agent
+  require ::datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/cacti.yaml"
   if $::datadog_agent::_agent_major_version > 5 {

manifests/integrations/ceph.pp

@@ -17,7 +17,7 @@
   Array $tags = [ 'name:ceph_cluster' ],
   String $ceph_cmd = '/usr/bin/ceph',
 ) inherits datadog_agent::params {
-  include datadog_agent
+  require ::datadog_agent
 
   file { '/etc/sudoers.d/datadog_ceph':
     content => "# This file is required for dd ceph \ndd-agent ALL=(ALL) NOPASSWD:/usr/bin/ceph\n"

manifests/integrations/consul.pp

@@ -33,7 +33,7 @@
   Boolean $new_leader_checks         = true,
   Optional[Array] $service_whitelist = []
 ) inherits datadog_agent::params {
-  include datadog_agent
+  require ::datadog_agent
 
   $legacy_dst = "${datadog_agent::params::legacy_conf_dir}/consul.yaml"
   if $::datadog_agent::_agent_major_version > 5 {

manifests/integrations/directory.pp

@@ -65,7 +65,7 @@
   String $pattern            = '',
   Optional[Array] $instances = undef,
 ) inherits datadog_agent::params {
-  include datadog_agent
+  require ::datadog_agent
 
   if !$instances and $directory == '' {
     fail('bad directory argument and no instances hash provided')