opuppet/module-icinga2
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'feature/parameterize_service_notification' into develop

Browse source 
refs#7856 : https://dev.icinga.org/issues/7856
This commit is contained in:
Nick Chappell 2014-12-01 21:59:39 -08:00
commit aa8903e8a9
29 changed files with 798 additions and 231 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -6,6 +6,7 @@
* Feature: [PR-54](https://github.com/Icinga/puppet-icinga2/pull/54) and [dev.icinga.org issue #7225](https://dev.icinga.org/issues/7225): Added a CompatLogger object defined type.
* Feature: [PR-55](https://github.com/Icinga/puppet-icinga2/pull/55) and [dev.icinga.org issue #7226](https://dev.icinga.org/issues/7226): Added a CheckResultReader object defined type.
* Feature: Added a parameter that controls whether to purge unmanaged files in `/etc/icinga2/objects/`
* Feature: [dev.icinga.org issue #7856](https://dev.icinga.org/issues/7856): Added a parameter to each object defined type that can controle whether the Icinga 2 service gets refreshed; it can be set to false if the module is being used to just generate object definition files and isn't managing the service
###v0.6.0 (November 19th, 2014)

15
README.md
View file

@ -373,6 +373,21 @@ This means that they will not be added to the rendered object definition files.
**However**, this doesn't mean that the values are undefined in Icinga 2. Icinga 2 itself has built-in default values for many object parameters and falls back to them if one isn't present in an object definition. See the docs for individual object types in [Configuring Icinga 2](http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc#!/icinga2/latest/doc/module/icinga2/chapter/configuring-icinga2) for more info about which object parameters have what default values.
####Notifying the Icinga 2 service
By default, each object defined type will automatically notify and restart the Icinga 2 service. However, if you're using the module to just generate object files and not using it to manage the service, you'll likely get compilation errors about the `icinga2` service not being in the catalog.
Each object defined type has a boolean parameter, `refresh_icinga2_service`, that controls whether the object file will notify the service. To **not** notify the service, set it to `false`:
<pre>
icinga2::object::apply_dependency { 'usermail_dep_on_icinga2mail':
parent_host_name => 'icinga2mail.local',
target_file_owner => vagrant,
assign_where => 'match("^usermail*", host.name)',
refresh_icinga2_service => false,
}
</pre>
####[Objects](id:objects)
Object types:

39
manifests/object/apply_dependency.pp
View file

@ -28,7 +28,9 @@ define icinga2::object::apply_dependency (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644') {
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
# Do some validation of the class' parameters:
validate_string($object_name)
validate_string($display_name)
@ -46,16 +48,35 @@ define icinga2::object::apply_dependency (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
validate_re($object_type, ['^Host', '^Service'])
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_apply_dependency.conf.erb'),
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_apply_dependency.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_apply_dependency.conf.erb'),
}
}
}
}

37
manifests/object/apply_notification_to_host.pp
View file

@ -29,7 +29,8 @@ define icinga2::object::apply_notification_to_host (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -53,13 +54,33 @@ define icinga2::object::apply_notification_to_host (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_apply_notification_to_host.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_apply_notification_to_host.conf.erb'),
notify => Service['icinga2'],
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_apply_notification_to_host.conf.erb'),
}
}
}

37
manifests/object/apply_notification_to_service.pp
View file

@ -30,7 +30,8 @@ define icinga2::object::apply_notification_to_service (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -55,13 +56,33 @@ define icinga2::object::apply_notification_to_service (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_apply_notification_to_service.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_apply_notification_to_service.conf.erb'),
notify => Service['icinga2'],
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_apply_notification_to_service.conf.erb'),
}
}
}

35
manifests/object/apply_service_to_host.pp
View file

@ -43,7 +43,8 @@ define icinga2::object::apply_service_to_host (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -56,15 +57,33 @@ define icinga2::object::apply_service_to_host (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_apply_service_to_host.conf.erb'),
notify => Service['icinga2'],
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_apply_service_to_host.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_apply_service_to_host.conf.erb'),
}
}
}

75
manifests/object/checkcommand.pp
View file

@ -29,6 +29,7 @@ define icinga2::object::checkcommand (
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -50,31 +51,65 @@ define icinga2::object::checkcommand (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
if $checkcommand_file_distribution_method == 'content' {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template("${checkcommand_template_module}/${checkcommand_template}"),
notify => Service['icinga2'],
}
}
elsif $checkcommand_file_distribution_method == 'source' {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
source => $checkcommand_source_file,
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
if $checkcommand_file_distribution_method == 'content' {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template("${checkcommand_template_module}/${checkcommand_template}"),
notify => Service['icinga2'],
}
}
elsif $checkcommand_file_distribution_method == 'source' {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
source => $checkcommand_source_file,
notify => Service['icinga2'],
}
}
else {
notify {'Missing/Incorrect File Distribution Method':
message => 'The parameter checkcommand_file_distribution_method is missing or incorrect. Please set content or source',
}
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
notify {'Missing/Incorrect File Distribution Method':
message => 'The parameter checkcommand_file_distribution_method is missing or incorrect. Please set content or source',
if $checkcommand_file_distribution_method == 'content' {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template("${checkcommand_template_module}/${checkcommand_template}"),
}
}
elsif $checkcommand_file_distribution_method == 'source' {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
source => $checkcommand_source_file,
}
}
else {
notify {'Missing/Incorrect File Distribution Method':
message => 'The parameter checkcommand_file_distribution_method is missing or incorrect. Please set content or source',
}
}
}
}

35
manifests/object/checkresultreader.pp
View file

@ -18,7 +18,8 @@ define icinga2::object::checkresultreader (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -33,15 +34,33 @@ define icinga2::object::checkresultreader (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_checkresultreader.conf.erb'),
notify => Service['icinga2'],
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_checkresultreader.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_checkresultreader.conf.erb'),
}
}
}

35
manifests/object/compatlogger.pp
View file

@ -19,7 +19,8 @@ define icinga2::object::compatlogger (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -37,15 +38,33 @@ define icinga2::object::compatlogger (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_compatlogger.conf.erb'),
notify => Service['icinga2'],
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_compatlogger.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_compatlogger.conf.erb'),
}
}
}

37
manifests/object/dependency.pp
View file

@ -25,7 +25,9 @@ define icinga2::object::dependency (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644') {
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
# Do some validation of the class' parameters:
validate_string($object_name)
validate_string($display_name)
@ -43,14 +45,33 @@ define icinga2::object::dependency (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_dependency.conf.erb'),
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_dependency.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_dependency.conf.erb'),
}
}
}

35
manifests/object/eventcommand.pp
View file

@ -24,7 +24,8 @@ define icinga2::object::eventcommand (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -43,15 +44,33 @@ define icinga2::object::eventcommand (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_eventcommand.conf.erb'),
notify => Service['icinga2'],
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_eventcommand.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_eventcommand.conf.erb'),
}
}
}

35
manifests/object/externalcommandlistener.pp
View file

@ -18,7 +18,8 @@ define icinga2::object::externalcommandlistener (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -33,15 +34,33 @@ define icinga2::object::externalcommandlistener (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_externalcommandlistener.conf.erb'),
notify => Service['icinga2'],
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_externalcommandlistener.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_externalcommandlistener.conf.erb'),
}
}
}

37
manifests/object/graphitewriter.pp
View file

@ -19,18 +19,39 @@ define icinga2::object::graphitewriter (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation
validate_string($host)
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_graphitewriter.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_graphitewriter.conf.erb'),
notify => Service['icinga2'],
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_graphitewriter.conf.erb'),
}
}
}

36
manifests/object/host.pp
View file

@ -42,7 +42,8 @@ define icinga2::object::host (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -57,14 +58,33 @@ define icinga2::object::host (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_host.conf.erb'),
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_host.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_host.conf.erb'),
}
}
}

36
manifests/object/hostgroup.pp
View file

@ -21,7 +21,8 @@ define icinga2::object::hostgroup (
$target_file_group = 'root',
$target_file_mode = '0644',
$assign_where = undef,
$ignore_where = undef
$ignore_where = undef,
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -34,14 +35,33 @@ define icinga2::object::hostgroup (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_hostgroup.conf.erb'),
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_hostgroup.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_hostgroup.conf.erb'),
}
}
}

36
manifests/object/idomysqlconnection.pp
View file

@ -42,7 +42,8 @@ define icinga2::object::idomysqlconnection (
$target_file_name = "${name}.conf",
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -61,14 +62,33 @@ define icinga2::object::idomysqlconnection (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_idomysqlconnection.conf.erb'),
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_idomysqlconnection.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_idomysqlconnection.conf.erb'),
}
}
}

36
manifests/object/idopgsqlconnection.pp
View file

@ -42,7 +42,8 @@ define icinga2::object::idopgsqlconnection (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -61,14 +62,33 @@ define icinga2::object::idopgsqlconnection (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_idopgsqlconnection.conf.erb'),
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_idopgsqlconnection.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_idopgsqlconnection.conf.erb'),
}
}
}

37
manifests/object/livestatuslistener.pp
View file

@ -10,7 +10,7 @@
#
define icinga2::object::livestatuslistener (
$object_livestatuslistenername = $name,
$object_livestatuslistenername = $name,
$socket_type = undef,
$bind_host = undef,
$bind_port = undef,
@ -21,7 +21,8 @@ define icinga2::object::livestatuslistener (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -48,15 +49,33 @@ define icinga2::object::livestatuslistener (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_livestatuslistener.conf.erb'),
notify => Service['icinga2'],
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_livestatuslistener.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_livestatuslistener.conf.erb'),
}
}
}

35
manifests/object/notification.pp
View file

@ -27,7 +27,8 @@ define icinga2::object::notification (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -66,15 +67,33 @@ define icinga2::object::notification (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_notification.conf.erb'),
notify => Service['icinga2'],
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_notification.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_notification.conf.erb'),
}
}
}

35
manifests/object/notificationcommand.pp
View file

@ -24,7 +24,8 @@ define icinga2::object::notificationcommand (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -43,15 +44,33 @@ define icinga2::object::notificationcommand (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_notificationcommand.conf.erb'),
notify => Service['icinga2'],
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_notificationcommand.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_notificationcommand.conf.erb'),
}
}
}

35
manifests/object/perfdatawriter.pp
View file

@ -24,7 +24,8 @@ define icinga2::object::perfdatawriter (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -57,15 +58,33 @@ define icinga2::object::perfdatawriter (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_perfdatawriter.conf.erb'),
notify => Service['icinga2'],
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_perfdatawriter.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_perfdatawriter.conf.erb'),
}
}
}

36
manifests/object/scheduleddowntime.pp
View file

@ -23,7 +23,8 @@ define icinga2::object::scheduleddowntime (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the define's parameters:
@ -42,14 +43,33 @@ define icinga2::object::scheduleddowntime (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_scheduleddowntime.conf.erb'),
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_scheduleddowntime.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_scheduleddowntime.conf.erb'),
}
}
}

36
manifests/object/service.pp
View file

@ -41,7 +41,8 @@ define icinga2::object::service (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -56,14 +57,33 @@ define icinga2::object::service (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_service.conf.erb'),
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_service.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_service.conf.erb'),
}
}
}

36
manifests/object/servicegroup.pp
View file

@ -21,7 +21,8 @@ define icinga2::object::servicegroup (
$target_file_group = 'root',
$target_file_mode = '0644',
$assign_where = undef,
$ignore_where = undef
$ignore_where = undef,
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -34,14 +35,33 @@ define icinga2::object::servicegroup (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_servicegroup.conf.erb'),
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_servicegroup.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_servicegroup.conf.erb'),
}
}
}

35
manifests/object/statusdatawriter.pp
View file

@ -19,7 +19,8 @@ define icinga2::object::statusdatawriter (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -40,15 +41,33 @@ define icinga2::object::statusdatawriter (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_statusdatawriter.conf.erb'),
notify => Service['icinga2'],
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_statusdatawriter.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_statusdatawriter.conf.erb'),
}
}
}

36
manifests/object/sysloglogger.pp
View file

@ -17,7 +17,8 @@ define icinga2::object::sysloglogger (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -28,14 +29,33 @@ define icinga2::object::sysloglogger (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_sysloglogger.conf.erb'),
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_sysloglogger.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_sysloglogger.conf.erb'),
}
}
}

39
manifests/object/timeperiod.pp
View file

@ -15,12 +15,13 @@ define icinga2::object::timeperiod (
$timeperiod_display_name = undef,
$methods = undef,
$ranges = {},
$timeperiod_target_dir = '/etc/icinga2/objects/timeperiods',
$timeperiod_target_file_name = "${name}.conf",
$target_dir = '/etc/icinga2/objects/timeperiods',
$target_file_name = "${name}.conf",
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
# Do some validation of the class' parameters:
@ -36,13 +37,33 @@ define icinga2::object::timeperiod (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_re($target_file_mode, '^\d{4}$')
validate_bool($refresh_icinga2_service)
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_timeperiod.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
file {"${timeperiod_target_dir}/${timeperiod_target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_timeperiod.conf.erb'),
notify => Service['icinga2'],
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_timeperiod.conf.erb'),
}
}
}

36
manifests/object/user.pp
View file

@ -25,7 +25,8 @@ define icinga2::object::user (
$target_file_ensure = file,
$target_file_owner = 'root',
$target_file_group = 'root',
$target_file_mode = '0644'
$target_file_mode = '0644',
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -41,14 +42,33 @@ define icinga2::object::user (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_user.conf.erb'),
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_user.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_user.conf.erb'),
}
}
}

36
manifests/object/usergroup.pp
View file

@ -21,7 +21,8 @@ define icinga2::object::usergroup (
$target_file_group = 'root',
$target_file_mode = '0644',
$assign_where = undef,
$ignore_where = undef
$ignore_where = undef,
$refresh_icinga2_service = true
) {
#Do some validation of the class' parameters:
@ -33,14 +34,33 @@ define icinga2::object::usergroup (
validate_string($target_file_owner)
validate_string($target_file_group)
validate_string($target_file_mode)
validate_bool($refresh_icinga2_service)
file {"${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_usergroup.conf.erb'),
notify => Service['icinga2'],
#If the refresh_icinga2_service parameter is set to true...
if $refresh_icinga2_service == true {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_usergroup.conf.erb'),
#...notify the Icinga 2 daemon so it can restart and pick up changes made to this config file...
notify => Service['icinga2'],
}
}
#...otherwise, use the same file resource but without a notify => parameter:
else {
file { "${target_dir}/${target_file_name}":
ensure => $target_file_ensure,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
content => template('icinga2/object_usergroup.conf.erb'),
}
}
}