Skip to content

Commit aeea133

Browse files
committed
Use different file name for processes plugin config
Replicate commit from Pull Request voxpupuli#856
1 parent 17207e9 commit aeea133

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

manifests/plugin/processes.pp

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
interval => $interval,
2222
}
2323

24-
concat { "${collectd::plugin_conf_dir}/processes-config.conf":
24+
$config_file = "${collectd::plugin_conf_dir}/processes-plugin-config.conf"
25+
26+
concat { $config_file:
2527
ensure => $ensure,
2628
mode => $collectd::config_mode,
2729
owner => $collectd::config_owner,
@@ -32,13 +34,13 @@
3234
concat::fragment { 'collectd_plugin_processes_conf_header':
3335
order => '00',
3436
content => epp('collectd/plugin/processes-header.conf.epp'),
35-
target => "${collectd::plugin_conf_dir}/processes-config.conf",
37+
target => $config_file,
3638
}
3739

3840
concat::fragment { 'collectd_plugin_processes_conf_footer':
3941
order => '99',
4042
content => '</Plugin>',
41-
target => "${collectd::plugin_conf_dir}/processes-config.conf",
43+
target => $config_file,
4244
}
4345

4446
if $processes {

manifests/plugin/processes/process.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
'collect_file_descriptor' => $collect_file_descriptor,
1818
'collect_memory_maps' => $collect_memory_maps,
1919
}),
20-
target => "${collectd::plugin_conf_dir}/processes-config.conf",
20+
target => $collectd::plugin::processes::config_file,
2121
}
2222

2323
}

manifests/plugin/processes/processmatch.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
'collect_file_descriptor' => $collect_file_descriptor,
2020
'collect_memory_maps' => $collect_memory_maps,
2121
}),
22-
target => "${collectd::plugin_conf_dir}/processes-config.conf",
22+
target => $collectd::plugin::processes::config_file,
2323
}
2424
}

0 commit comments

Comments
 (0)