Skip to content

[metadata] update for explicit puppet 5 support + changelog #377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
truthbk merged 4 commits into from
Dec 13, 2017
Merged

[metadata] update for explicit puppet 5 support + changelog #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae47700
[changelog] updating for 1.12.0
truthbk Dec 13, 2017
ba0d2a7
[pupept5] adding support
truthbk Dec 13, 2017
b4c9a34
[travis] update test matrix
truthbk Dec 13, 2017
a01f03e
[puppet5] more strict about includes, fixes reporting
truthbk Dec 13, 2017
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
62 changes: 62 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
23 changes: 23 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,6 @@
require => Package[$datadog_agent::params::package_name],
}


if !$agent6_enable {
file { '/etc/dd-agent':
ensure => directory,
Expand Down
1 change: 1 addition & 0 deletions manifests/reports.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
$hostname_extraction_regex = nil
) {

include datadog_agent
include datadog_agent::params
$rubydev_package = $datadog_agent::params::rubydev_package

Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
{
"name": "puppet",
"version_requirement": ">=2.7.20 <5.0.0"
"version_requirement": ">=2.7.20 <6.0.0"
}
],
"dependencies": [
Expand Down
⚡