forked from redhat-openstack/openstack-puppet-modules
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request redhat-openstack#255 from deric/python
multiple Python modules support
- Loading branch information
Showing
10 changed files
with
547 additions
and
126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,81 @@ | ||
| # See http://collectd.org/documentation/manpages/collectd.conf.5.shtml#plugin_python | ||
| define collectd::plugin::python ( | ||
| $modulepath, | ||
| $module, | ||
| $script_source, | ||
| $ensure = present, | ||
| $config = {}, | ||
| $order = '10', | ||
| class collectd::plugin::python ( | ||
| $modulepaths = [], | ||
| $ensure = present, | ||
| $modules = {}, | ||
| # Unlike most other plugins, this one should set "Globals true". This will cause collectd | ||
| # to export the name of all objects in the Python interpreter for all plugins to see. | ||
| $globals = true, | ||
| $order = '10', | ||
| $interval = undef, | ||
| # Python 2 defaults to 'ascii' and Python 3 to 'utf-8' | ||
| $encoding = undef, | ||
| $interactive = false, | ||
| $logtraces = false, | ||
| ) { | ||
| include collectd::params | ||
|
|
||
| validate_hash($config) | ||
| validate_hash($modules) | ||
| validate_bool($interactive) | ||
| validate_bool($logtraces) | ||
| validate_bool($globals) | ||
| validate_array($modulepaths) | ||
|
|
||
| $conf_dir = $collectd::params::plugin_conf_dir | ||
| $module_dirs = empty($modulepaths) ? { | ||
| true => [$collectd::params::python_dir], | ||
| # use paths provided by the user | ||
| false => $modulepaths | ||
| } | ||
|
|
||
| collectd::plugin {'python': | ||
| ensure => $ensure, | ||
| interval => $interval, | ||
| order => $order, | ||
| globals => $globals, | ||
| } | ||
|
|
||
| $ensure_modulepath = $ensure ? { | ||
| 'absent' => $ensure, | ||
| default => 'directory', | ||
| } | ||
|
|
||
| # This is deprecated file naming ensuring old style file removed, and should be removed in next major relese | ||
| file { "${name}.load-deprecated": | ||
| ensure => absent, | ||
| path => "${conf_dir}/${name}.conf", | ||
| ensure_resource('file', $module_dirs, | ||
| { | ||
| 'ensure' => $ensure_modulepath, | ||
| 'mode' => '0750', | ||
| 'owner' => 'root', | ||
| 'group' => $collectd::params::root_group, | ||
| 'require' => Package[$collectd::params::package] | ||
| } | ||
| ) | ||
|
|
||
| # should be loaded after global plugin configuration | ||
| $python_conf = "${collectd::params::plugin_conf_dir}/python-config.conf" | ||
|
|
||
| concat{ $python_conf: | ||
| ensure => $ensure, | ||
| mode => '0640', | ||
| owner => 'root', | ||
| group => $collectd::params::root_group, | ||
| notify => Service['collectd'], | ||
| ensure_newline => true, | ||
| } | ||
| # End deprecation | ||
|
|
||
| file { | ||
| "${name}.load": | ||
| ensure => $ensure, | ||
| path => "${conf_dir}/${order}-${name}.conf", | ||
| owner => 'root', | ||
| group => $collectd::params::root_group, | ||
| mode => '0640', | ||
| content => template('collectd/python.conf.erb'), | ||
| notify => Service['collectd'], | ||
|
|
||
| concat::fragment{'collectd_plugin_python_conf_header': | ||
| order => '00', | ||
| content => template('collectd/plugin/python/header.conf.erb'), | ||
| target => $python_conf, | ||
| } | ||
|
|
||
| concat::fragment{'collectd_plugin_python_conf_footer': | ||
| order => '99', | ||
| content => '</Plugin>', | ||
| target => $python_conf, | ||
| } | ||
|
|
||
| file { | ||
| "${name}.script": | ||
| ensure => $ensure, | ||
| path => "${modulepath}/${module}.py", | ||
| owner => 'root', | ||
| group => $collectd::params::root_group, | ||
| mode => '0640', | ||
| source => $script_source, | ||
| require => File["${name}.load"], | ||
| notify => Service['collectd'], | ||
| $defaults = { | ||
| 'ensure' => $ensure, | ||
| 'modulepath' => $module_dirs[0], | ||
| } | ||
| create_resources(collectd::plugin::python::module, $modules, $defaults) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| # Single module definition | ||
| define collectd::plugin::python::module ( | ||
| $config, | ||
| $modulepath = undef, | ||
| $script_source = undef, | ||
| $module = $title, | ||
| $ensure = 'present', | ||
| ){ | ||
| include collectd::params | ||
| include collectd::plugin::python | ||
|
|
||
| validate_hash($config) | ||
|
|
||
| $module_dir = $modulepath ? { | ||
| undef => $collectd::params::python_dir, | ||
| default => $modulepath | ||
| } | ||
| validate_absolute_path($module_dir) | ||
|
|
||
| if $script_source { | ||
| file { "${module}.script": | ||
| ensure => $ensure, | ||
| path => "${module_dir}/${module}.py", | ||
| owner => 'root', | ||
| group => $collectd::params::root_group, | ||
| mode => '0640', | ||
| source => $script_source, | ||
| require => File[$module_dir], | ||
| notify => Service['collectd'], | ||
| } | ||
| } | ||
|
|
||
| concat::fragment{"collectd_plugin_python_conf_${module}": | ||
| ensure => $ensure, | ||
| order => '50', # somewhere between header and footer | ||
| target => $collectd::plugin::python::python_conf, | ||
| content => template('collectd/plugin/python/module.conf.erb'), | ||
| } | ||
| } |
Oops, something went wrong.