Skip to content

Commit a06fadf

Browse files
committed
Use different file name for processes plugin config
Resubmission of PR voxpupuli#856
1 parent a5d546f commit a06fadf

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

manifests/plugin/processes.pp

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
order => $order,
2121
interval => $interval,
2222
}
23+
$config_file = "${collectd::plugin_conf_dir}/processes-plugin-config.conf"
2324

24-
concat { "${collectd::plugin_conf_dir}/processes-config.conf":
25+
concat { $config_file:
2526
ensure => $ensure,
2627
mode => $collectd::config_mode,
2728
owner => $collectd::config_owner,
@@ -32,13 +33,13 @@
3233
concat::fragment { 'collectd_plugin_processes_conf_header':
3334
order => '00',
3435
content => epp('collectd/plugin/processes-header.conf.epp'),
35-
target => "${collectd::plugin_conf_dir}/processes-config.conf",
36+
target => $config_file,
3637
}
3738

3839
concat::fragment { 'collectd_plugin_processes_conf_footer':
3940
order => '99',
4041
content => '</Plugin>',
41-
target => "${collectd::plugin_conf_dir}/processes-config.conf",
42+
target => $config_file,
4243
}
4344

4445
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)