From ae477004629e737d743e252cbe125092cce6579f Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Wed, 13 Dec 2017 11:12:43 +0100 Subject: [PATCH 1/4] [changelog] updating for 1.12.0 --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5981d07f..44728700 100644 --- 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 From ba0d2a7280c0ad4c66cde10d103c8483126f595d Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Wed, 13 Dec 2017 11:14:56 +0100 Subject: [PATCH 2/4] [pupept5] adding support --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 4905b3f3..c4536450 100644 --- 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": [ From b4c9a3482552e7ce7da184c642f0bebe06a7f29e Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Wed, 13 Dec 2017 11:26:26 +0100 Subject: [PATCH 3/4] [travis] update test matrix --- .travis.yml | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/.travis.yml b/.travis.yml index c2d99bfa..3ca56b18 100644 --- 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 From a01f03e0e5dc4938175a2a72224b4e7f94b82a5e Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Wed, 13 Dec 2017 12:59:35 +0100 Subject: [PATCH 4/4] [puppet5] more strict about includes, fixes reporting --- manifests/init.pp | 1 - manifests/reports.pp | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index f0fc2e36..b15ee82a 100644 --- 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 index fa691f0a..60887530 100644 --- 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