Merge pull request #377 from DataDog/jaime/puppet5

[metadata] update for explicit puppet 5 support + changelog
DataDog · Dec 13, 2017 · 8ab87f8 · 8ab87f8
2 parents 04e5185 + a01f03e
commit 8ab87f8
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,11 +24,47 @@ env:
   - PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.2.1" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 4.5.3" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 4.9.4" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 4.10.9" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 5.0.1" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
 matrix:
   exclude:
   # Ruby 2.0.0
   - rvm: 2.0.0
     env: PUPPET_VERSION="~> 2.7.0"
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 4.1.0"
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 4.2.0"
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 4.2.1"
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 4.5.3" STRICT_VARIABLES=yes
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 4.9.4" STRICT_VARIABLES=yes
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 4.10.9" STRICT_VARIABLES=yes
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 5.0.1" STRICT_VARIABLES=yes
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
+  - rvm: 2.0.0
+    env: PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
 
   # Ruby 2.1.1
   - rvm: 2.1.1
@@ -39,6 +75,32 @@ matrix:
     env: PUPPET_VERSION="~> 3.3.0"
   - rvm: 2.1.1
     env: PUPPET_VERSION="~> 3.4.0"
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 4.1.0"
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 4.2.0"
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 4.2.1"
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 4.5.3" STRICT_VARIABLES=yes
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 4.9.4" STRICT_VARIABLES=yes
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 4.10.9" STRICT_VARIABLES=yes
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 5.0.1" STRICT_VARIABLES=yes
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
+  - rvm: 2.1.1
+    env: PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
 
   # Ruby 2.2.3
   - rvm: 2.2.3

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,29 @@
 Changes
 =======
 
+# 1.12.0 / Unreleased 
+
+### Notes
+
+* [FEATURE] Agent6 Beta support. See #356
+* [FEATURE] Directory integration. See #357 (Thanks @alexfouche)
+* [FEATURE] Linux_proc_extras integration. See #357 (Thanks @alexfouche)
+* [FEATURE] Kafka integration. See #357 (Thanks @alexfouche)
+* [FEATURE] Kubernetes integration. See #369 (Thanks @lowkeyshift)
+* [FEATURE] Kuberentes_state integration. See #369 (Thanks @lowkeyshift)
+* [FEATURE] Network integration. See #346 (Thanks @jameynelson)
+* [FEATURE] System core integration. See #359 (Thanks @dan70402)
+* [FEATURE] Support for process_agent. See #352 (Thanks @jfrost)
+
+* [IMPROVEMENT] Better support for puppet 4, 5. See #362 and #370 (Thanks @bittner)
+* [IMPROVEMENT] PGbouncer: support multiple instances. See #361 (Thanks @ajvb)
+* [IMPROVEMENT] General cleanup. See #357 and #376 (Thanks @alexfouche)
+
+* [BUGFIX] Agent6: Fix downgrade back to agent5 if on `latest` version. See #375 
+* [BUGFIX] APT: only grep for last 8 characters to verify key. See #373 and #374 (Thanks @szponek) 
+
+* [DOCUMENTATION] Fix tagging documentation. See #347 (Thanks @bit-herder) 
+
 # 1.11.0 / 2017-07-27
 
 ### Notes

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -407,7 +407,6 @@
     require => Package[$datadog_agent::params::package_name],
   }
 
-
   if !$agent6_enable {
     file { '/etc/dd-agent':
       ensure  => directory,

diff --git a/manifests/reports.pp b/manifests/reports.pp
@@ -21,6 +21,7 @@
   $hostname_extraction_regex = nil
 ) {
 
+  include datadog_agent
   include datadog_agent::params
   $rubydev_package = $datadog_agent::params::rubydev_package
 

diff --git a/metadata.json b/metadata.json
@@ -41,7 +41,7 @@
     },
     {
       "name": "puppet",
-      "version_requirement": ">=2.7.20 <5.0.0"
+      "version_requirement": ">=2.7.20 <6.0.0"
     }
   ],
   "dependencies": [