Skip to content

Commit 8ab87f8

Browse files
truthbktruthbk
authored
Merge pull request #377 from DataDog/jaime/puppet5
[metadata] update for explicit puppet 5 support + changelog
2 parents 04e5185 + a01f03e commit 8ab87f8

5 files changed

Lines changed: 87 additions & 2 deletions

File tree

‎.travis.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,47 @@ env:
2424
- PUPPET_VERSION="~> 4.1.0" STRICT_VARIABLES=yes
2525
- PUPPET_VERSION="~> 4.2.0" STRICT_VARIABLES=yes
2626
- PUPPET_VERSION="~> 4.2.1" STRICT_VARIABLES=yes
27+
- PUPPET_VERSION="~> 4.5.3" STRICT_VARIABLES=yes
28+
- PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
29+
- PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
30+
- PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
31+
- PUPPET_VERSION="~> 4.9.4" STRICT_VARIABLES=yes
32+
- PUPPET_VERSION="~> 4.10.9" STRICT_VARIABLES=yes
33+
- PUPPET_VERSION="~> 5.0.1" STRICT_VARIABLES=yes
34+
- PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
35+
- PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
36+
- PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
2737
matrix:
2838
exclude:
2939
# Ruby 2.0.0
3040
- rvm: 2.0.0
3141
env: PUPPET_VERSION="~> 2.7.0"
42+
- rvm: 2.0.0
43+
env: PUPPET_VERSION="~> 4.1.0"
44+
- rvm: 2.0.0
45+
env: PUPPET_VERSION="~> 4.2.0"
46+
- rvm: 2.0.0
47+
env: PUPPET_VERSION="~> 4.2.1"
48+
- rvm: 2.0.0
49+
env: PUPPET_VERSION="~> 4.5.3" STRICT_VARIABLES=yes
50+
- rvm: 2.0.0
51+
env: PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
52+
- rvm: 2.0.0
53+
env: PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
54+
- rvm: 2.0.0
55+
env: PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
56+
- rvm: 2.0.0
57+
env: PUPPET_VERSION="~> 4.9.4" STRICT_VARIABLES=yes
58+
- rvm: 2.0.0
59+
env: PUPPET_VERSION="~> 4.10.9" STRICT_VARIABLES=yes
60+
- rvm: 2.0.0
61+
env: PUPPET_VERSION="~> 5.0.1" STRICT_VARIABLES=yes
62+
- rvm: 2.0.0
63+
env: PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
64+
- rvm: 2.0.0
65+
env: PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
66+
- rvm: 2.0.0
67+
env: PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
3268

3369
# Ruby 2.1.1
3470
- rvm: 2.1.1
@@ -39,6 +75,32 @@ matrix:
3975
env: PUPPET_VERSION="~> 3.3.0"
4076
- rvm: 2.1.1
4177
env: PUPPET_VERSION="~> 3.4.0"
78+
- rvm: 2.1.1
79+
env: PUPPET_VERSION="~> 4.1.0"
80+
- rvm: 2.1.1
81+
env: PUPPET_VERSION="~> 4.2.0"
82+
- rvm: 2.1.1
83+
env: PUPPET_VERSION="~> 4.2.1"
84+
- rvm: 2.1.1
85+
env: PUPPET_VERSION="~> 4.5.3" STRICT_VARIABLES=yes
86+
- rvm: 2.1.1
87+
env: PUPPET_VERSION="~> 4.6.2" STRICT_VARIABLES=yes
88+
- rvm: 2.1.1
89+
env: PUPPET_VERSION="~> 4.7.1" STRICT_VARIABLES=yes
90+
- rvm: 2.1.1
91+
env: PUPPET_VERSION="~> 4.8.2" STRICT_VARIABLES=yes
92+
- rvm: 2.1.1
93+
env: PUPPET_VERSION="~> 4.9.4" STRICT_VARIABLES=yes
94+
- rvm: 2.1.1
95+
env: PUPPET_VERSION="~> 4.10.9" STRICT_VARIABLES=yes
96+
- rvm: 2.1.1
97+
env: PUPPET_VERSION="~> 5.0.1" STRICT_VARIABLES=yes
98+
- rvm: 2.1.1
99+
env: PUPPET_VERSION="~> 5.1.0" STRICT_VARIABLES=yes
100+
- rvm: 2.1.1
101+
env: PUPPET_VERSION="~> 5.2.0" STRICT_VARIABLES=yes
102+
- rvm: 2.1.1
103+
env: PUPPET_VERSION="~> 5.3.3" STRICT_VARIABLES=yes
42104

43105
# Ruby 2.2.3
44106
- rvm: 2.2.3

‎CHANGELOG.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,29 @@
11
Changes
22
=======
33

4+
# 1.12.0 / Unreleased
5+
6+
### Notes
7+
8+
* [FEATURE] Agent6 Beta support. See #356
9+
* [FEATURE] Directory integration. See #357 (Thanks @alexfouche)
10+
* [FEATURE] Linux_proc_extras integration. See #357 (Thanks @alexfouche)
11+
* [FEATURE] Kafka integration. See #357 (Thanks @alexfouche)
12+
* [FEATURE] Kubernetes integration. See #369 (Thanks @lowkeyshift)
13+
* [FEATURE] Kuberentes_state integration. See #369 (Thanks @lowkeyshift)
14+
* [FEATURE] Network integration. See #346 (Thanks @jameynelson)
15+
* [FEATURE] System core integration. See #359 (Thanks @dan70402)
16+
* [FEATURE] Support for process_agent. See #352 (Thanks @jfrost)
17+
18+
* [IMPROVEMENT] Better support for puppet 4, 5. See #362 and #370 (Thanks @bittner)
19+
* [IMPROVEMENT] PGbouncer: support multiple instances. See #361 (Thanks @ajvb)
20+
* [IMPROVEMENT] General cleanup. See #357 and #376 (Thanks @alexfouche)
21+
22+
* [BUGFIX] Agent6: Fix downgrade back to agent5 if on `latest` version. See #375
23+
* [BUGFIX] APT: only grep for last 8 characters to verify key. See #373 and #374 (Thanks @szponek)
24+
25+
* [DOCUMENTATION] Fix tagging documentation. See #347 (Thanks @bit-herder)
26+
427
# 1.11.0 / 2017-07-27
528

629
### Notes

‎manifests/init.pp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@
407407
require => Package[$datadog_agent::params::package_name],
408408
}
409409

410-
411410
if !$agent6_enable {
412411
file { '/etc/dd-agent':
413412
ensure => directory,

‎manifests/reports.pp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
$hostname_extraction_regex = nil
2222
) {
2323

24+
include datadog_agent
2425
include datadog_agent::params
2526
$rubydev_package = $datadog_agent::params::rubydev_package
2627

‎metadata.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
{
4343
"name": "puppet",
44-
"version_requirement": ">=2.7.20 <5.0.0"
44+
"version_requirement": ">=2.7.20 <6.0.0"
4545
}
4646
],
4747
"dependencies": [

0 commit comments

Comments
 (0)
⚡