Skip to content

Commit 2f03da3

Browse files
Aramacktruthbk
Aramack
authored and
truthbk
committed
Track integration configuration directories (#525)
* Track integration configuration directories * Fix path to redisdb configuration directory
1 parent 9f9efc2 commit 2f03da3

48 files changed

Lines changed: 549 additions & 50 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎manifests/integrations/apache.pp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,20 @@
4141

4242
$legacy_dst = "${datadog_agent::conf_dir}/apache.yaml"
4343
if !$::datadog_agent::agent5_enable {
44-
$dst = "${datadog_agent::conf6_dir}/apache.d/conf.yaml"
44+
$dst_dir = "${datadog_agent::conf6_dir}/apache.d"
4545
file { $legacy_dst:
4646
ensure => 'absent'
4747
}
48+
49+
file { $dst_dir:
50+
ensure => directory,
51+
owner => $datadog_agent::params::dd_user,
52+
group => $datadog_agent::params::dd_group,
53+
mode => '0755',
54+
require => Package[$datadog_agent::params::package_name],
55+
notify => Service[$datadog_agent::params::service_name]
56+
}
57+
$dst = "${dst_dir}/conf.yaml"
4858
} else {
4959
$dst = $legacy_dst
5060
}

‎manifests/integrations/cacti.pp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,20 @@
2222

2323
$legacy_dst = "${datadog_agent::conf_dir}/cacti.yaml"
2424
if !$::datadog_agent::agent5_enable {
25-
$dst = "${datadog_agent::conf6_dir}/cacti.d/conf.yaml"
25+
$dst_dir = "${datadog_agent::conf6_dir}/cacti.d"
2626
file { $legacy_dst:
2727
ensure => 'absent'
2828
}
29+
30+
file { $dst_dir:
31+
ensure => directory,
32+
owner => $datadog_agent::params::dd_user,
33+
group => $datadog_agent::params::dd_group,
34+
mode => '0755',
35+
require => Package[$datadog_agent::params::package_name],
36+
notify => Service[$datadog_agent::params::service_name]
37+
}
38+
$dst = "${dst_dir}/conf.yaml"
2939
} else {
3040
$dst = $legacy_dst
3141
}

‎manifests/integrations/cassandra.pp‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,20 @@
3838

3939
$legacy_dst = "${datadog_agent::conf_dir}/cassandra.yaml"
4040
if !$::datadog_agent::agent5_enable {
41-
$dst = "${datadog_agent::conf6_dir}/cassandra.d/conf.yaml"
41+
$dst_dir = "${datadog_agent::conf6_dir}/cassandra.d"
4242

4343
file { $legacy_dst:
4444
ensure => 'absent'
4545
}
46+
file { $dst_dir:
47+
ensure => directory,
48+
owner => $datadog_agent::params::dd_user,
49+
group => $datadog_agent::params::dd_group,
50+
mode => '0755',
51+
require => Package[$datadog_agent::params::package_name],
52+
notify => Service[$datadog_agent::params::service_name]
53+
}
54+
$dst = "${dst_dir}/conf.yaml"
4655
} else {
4756
$dst = $legacy_dst
4857
}

‎manifests/integrations/ceph.pp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,20 @@
2828

2929
$legacy_dst = "${datadog_agent::conf_dir}/ceph.yaml"
3030
if !$::datadog_agent::agent5_enable {
31-
$dst = "${datadog_agent::conf6_dir}/ceph.d/conf.yaml"
31+
$dst_dir = "${datadog_agent::conf6_dir}/ceph.d"
3232
file { $legacy_dst:
3333
ensure => 'absent'
3434
}
35+
36+
file { $dst_dir:
37+
ensure => directory,
38+
owner => $datadog_agent::params::dd_user,
39+
group => $datadog_agent::params::dd_group,
40+
mode => '0755',
41+
require => Package[$datadog_agent::params::package_name],
42+
notify => Service[$datadog_agent::params::service_name]
43+
}
44+
$dst = "${dst_dir}/conf.yaml"
3545
} else {
3646
$dst = $legacy_dst
3747
}

‎manifests/integrations/consul.pp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,20 @@
4242

4343
$legacy_dst = "${datadog_agent::conf_dir}/consul.yaml"
4444
if !$::datadog_agent::agent5_enable {
45-
$dst = "${datadog_agent::conf6_dir}/consul.d/conf.yaml"
45+
$dst_dir = "${datadog_agent::conf6_dir}/consul.d"
4646
file { $legacy_dst:
4747
ensure => 'absent'
4848
}
49+
50+
file { $dst_dir:
51+
ensure => directory,
52+
owner => $datadog_agent::params::dd_user,
53+
group => $datadog_agent::params::dd_group,
54+
mode => '0755',
55+
require => Package[$datadog_agent::params::package_name],
56+
notify => Service[$datadog_agent::params::service_name]
57+
}
58+
$dst = "${dst_dir}/conf.yaml"
4959
} else {
5060
$dst = $legacy_dst
5161
}

‎manifests/integrations/directory.pp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,20 @@
9595

9696
$legacy_dst = "${datadog_agent::conf_dir}/directory.yaml"
9797
if !$::datadog_agent::agent5_enable {
98-
$dst = "${datadog_agent::conf6_dir}/directory.d/conf.yaml"
98+
$dst_dir = "${datadog_agent::conf6_dir}/directory.d"
9999
file { $legacy_dst:
100100
ensure => 'absent'
101101
}
102+
103+
file { $dst_dir:
104+
ensure => directory,
105+
owner => $datadog_agent::params::dd_user,
106+
group => $datadog_agent::params::dd_group,
107+
mode => '0755',
108+
require => Package[$datadog_agent::params::package_name],
109+
notify => Service[$datadog_agent::params::service_name]
110+
}
111+
$dst = "${dst_dir}/conf.yaml"
102112
} else {
103113
$dst = $legacy_dst
104114
}

‎manifests/integrations/disk.pp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,20 @@
5656

5757
$legacy_dst = "${datadog_agent::conf_dir}/disk.yaml"
5858
if !$::datadog_agent::agent5_enable {
59-
$dst = "${datadog_agent::conf6_dir}/disk.d/conf.yaml"
59+
$dst_dir = "${datadog_agent::conf6_dir}/disk.d"
6060
file { $legacy_dst:
6161
ensure => 'absent'
6262
}
63+
64+
file { $dst_dir:
65+
ensure => directory,
66+
owner => $datadog_agent::params::dd_user,
67+
group => $datadog_agent::params::dd_group,
68+
mode => '0755',
69+
require => Package[$datadog_agent::params::package_name],
70+
notify => Service[$datadog_agent::params::service_name]
71+
}
72+
$dst = "${dst_dir}/conf.yaml"
6373
} else {
6474
$dst = $legacy_dst
6575
}

‎manifests/integrations/dns_check.pp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,20 @@
3939

4040
$legacy_dst = "${datadog_agent::conf_dir}/dns_check.yaml"
4141
if !$::datadog_agent::agent5_enable {
42-
$dst = "${datadog_agent::conf6_dir}/dns_check.d/conf.yaml"
42+
$dst_dir = "${datadog_agent::conf6_dir}/dns_check.d"
4343
file { $legacy_dst:
4444
ensure => 'absent'
4545
}
46+
47+
file { $dst_dir:
48+
ensure => directory,
49+
owner => $datadog_agent::params::dd_user,
50+
group => $datadog_agent::params::dd_group,
51+
mode => '0755',
52+
require => Package[$datadog_agent::params::package_name],
53+
notify => Service[$datadog_agent::params::service_name]
54+
}
55+
$dst = "${dst_dir}/conf.yaml"
4656
} else {
4757
$dst = $legacy_dst
4858
}

‎manifests/integrations/docker_daemon.pp‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,17 @@
6565
}
6666

6767
if !$::datadog_agent::agent5_enable {
68-
$legacy_conf = "${datadog_agent::conf6_dir}/docker_daemon.d/conf.yaml"
68+
$legacy_dir = "${datadog_agent::conf6_dir}/docker_daemon.d"
69+
70+
file { $legacy_dir:
71+
ensure => directory,
72+
owner => $datadog_agent::params::dd_user,
73+
group => $datadog_agent::params::dd_group,
74+
mode => '0755',
75+
require => Package[$datadog_agent::params::package_name],
76+
notify => Service[$datadog_agent::params::service_name]
77+
}
78+
$legacy_conf = "${legacy_dir}/conf.yaml"
6979
} else {
7080
$legacy_conf = "${datadog_agent::conf_dir}/docker.yaml"
7181
}
@@ -75,7 +85,17 @@
7585
}
7686

7787
if !$::datadog_agent::agent5_enable {
78-
$dst = "${datadog_agent::conf6_dir}/docker.d/conf.yaml"
88+
$dst_dir = "${datadog_agent::conf6_dir}/docker.d"
89+
90+
file { $dst_dir:
91+
ensure => directory,
92+
owner => $datadog_agent::params::dd_user,
93+
group => $datadog_agent::params::dd_group,
94+
mode => '0755',
95+
require => Package[$datadog_agent::params::package_name],
96+
notify => Service[$datadog_agent::params::service_name]
97+
}
98+
$dst = "${dst_dir}/conf.yaml"
7999
} else {
80100
$dst = "${datadog_agent::conf_dir}/docker_daemon.yaml"
81101
}

‎manifests/integrations/elasticsearch.pp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,20 @@
7676

7777
$legacy_dst = "${datadog_agent::conf_dir}/elastic.yaml"
7878
if !$::datadog_agent::agent5_enable {
79-
$dst = "${datadog_agent::conf6_dir}/elastic.d/conf.yaml"
79+
$dst_dir = "${datadog_agent::conf6_dir}/elastic.d"
8080
file { $legacy_dst:
8181
ensure => 'absent'
8282
}
83+
84+
file { $dst_dir:
85+
ensure => directory,
86+
owner => $datadog_agent::params::dd_user,
87+
group => $datadog_agent::params::dd_group,
88+
mode => '0755',
89+
require => Package[$datadog_agent::params::package_name],
90+
notify => Service[$datadog_agent::params::service_name]
91+
}
92+
$dst = "${dst_dir}/conf.yaml"
8393
} else {
8494
$dst = $legacy_dst
8595
}

0 commit comments

Comments
 (0)
⚡