diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95c85b6..e864f43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
#Changelog
- - -
+###v0.6.1 (December 2nd, 2014)
+
+* 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)
* Added a defined type for `ServiceGroup` objects
@@ -10,7 +17,7 @@
* Feature [#7264](https://dev.icinga.org/issues/7264): Added Debian 7 support
* Feature: Added the ability to use the Debmon repository on Debian 7 systems: [PR-17](https://github.com/Icinga/puppet-icinga2/pull/17)
* Feature: Added the ability to make NRPE accept command arguments; turned off by default for obvious security reasons: [PR-22](https://github.com/Icinga/puppet-icinga2/pull/22)
-* Feature: Added the ability to enable/disable Icinga 2 components via parameters: [PR-23](https://github.com/Icinga/puppet-icinga2/pull/23)
+* Feature: Added the ability to enable/disable Icinga 2 components via parameters: [PR-23](https://github.com/Icinga/puppet-icinga2/pull/23)
* Feature: Added a `GraphiteWriter` object defined type: [PR-24](https://github.com/Icinga/puppet-icinga2/pull/24)
* Feature: Added the ability to upload or create custom check plugins on an Icinga 2 server (as opposed to just for NRPE clients): [PR-27](https://github.com/Icinga/puppet-icinga2/pull/27)
* Bug [#7308](https://dev.icinga.org/issues/7308): Allow multiple `assign_where` and `ignore_where` conditions
@@ -21,7 +28,6 @@
* Feature: [PR-35](https://github.com/Icinga/puppet-icinga2/pull/35): Added the ability to use a static file or custom ERB template for check command objects
* Feature: [PR-36](https://github.com/Icinga/puppet-icinga2/pull/36) and [dev.icinga.org issue #7216](https://dev.icinga.org/issues/7216): Added a [Notification](http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/configuring-icinga2#objecttype-notification) object defined type.
* Feature: [PR-37](https://github.com/Icinga/puppet-icinga2/pull/37) and [dev.icinga.org issue #7217](https://dev.icinga.org/issues/7217): Added a [TimePeriod](http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/configuring-icinga2#objecttype-timeperiod) object defined type.
-* Fix: [PR-42](https://github.com/Icinga/puppet-icinga2/pull/42): Fixed anchor links in the README.
* Feature: [PR-39](https://github.com/Icinga/puppet-icinga2/pull/39) and [dev.icinga.org issue #7673](https://dev.icinga.org/issues/7673): Added the ability to purge non-Puppet managed NRPE config files.
* Feature: [PR-41](https://github.com/Icinga/puppet-icinga2/pull/41) and [dev.icinga.org issue #7674](https://dev.icinga.org/issues/7674): Added CentOS 5 server and NRPE client support.
* Fix: [PR-40](https://github.com/Icinga/puppet-icinga2/pull/40) and [dev.icinga.org issue #7675](https://dev.icinga.org/issues/7675): Escape single quotes around the `PGPASSWORD` environment variable so that single quotes can be used in the Postgres password
diff --git a/README.md b/README.md
index 9142188..779a381 100644
--- a/README.md
+++ b/README.md
@@ -300,6 +300,22 @@ icinga2::checkplugin { 'check_diskstats':
This module includes several defined types that can be used to automatically generate Icinga 2 format object definitions. They function in a similar way to [the built-in Nagios types that are included in Puppet](http://docs.puppetlabs.com/guides/exported_resources.html#exported-resources-with-nagios).
+####Default object file locations, owner, group and mode
+
+The default file location for each object type is controlled by the `target_file_dir` parameter. For each object type, it defaults to a subdirectory under `/etc/icinga2/objects`.
+
+The default locations are under `/etc/icinga2/objects` and not `/etc/icinga2/conf.d/` so that user-defined objects can be kept completely separate from the objects included with Icinga 2. However, you can change the `target_file_dir` parameter to `/etc/icinga2/conf.d` if needed.
+
+The default file owner and group are controlled by the `target_file_owner` and `target_file_group` parameters. Both default to `root`.
+
+The default file mode is controlled by the `target_file_mode` parameter. It defaults to `0644`.
+
+####Purging unmanaged object files
+
+The `purge_unmanaged_object_files` parameter of the `icinga2::server` class controls whether object files in `/etc/icinga2/objects` that are not managed by Puppet get purged. It defaults to `false`.
+
+**Note:** This will purge unmanaged subdirectories as well as unmanaged files!
+
####Exported resources
Like the built-in Nagios types, the Icinga 2 objects in this module can be exported to PuppetDB as virtual resources and collected on your Icinga 2 server.
@@ -357,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`:
+
+
+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,
+}
+
+
####[Objects](id:objects)
Object types:
@@ -365,6 +396,8 @@ Object types:
* [icinga2::object::applynotificationtohost](#icinga2objectapplynotificationtohost)
* [icinga2::object::applynotificationtoservice](#icinga2objectapplynotificationtoservice)
* [icinga2::object::checkcommand](#icinga2objectcheckcommand)
+* [icinga2::object::compatlogger](#icinga2objectcompatlogger)
+* [icinga2::object::checkresultreader](#icinga2objectcheckresultreader)
* [icinga2::object::eventcommand](#icinga2objecteventcommand)
* [icinga2::object::externalcommandlistener](#icinga2objectexternalcommandlistener)
* [icinga2::object::host](#icinga2objecthost)
@@ -506,6 +539,34 @@ Available parameters are:
* `target_file_group`
* `target_file_mode`
+####`icinga2::object::compatlogger`
+
+The `compatlogger` defined type can create `compatlogger` objects.
+
+
+icinga2::object::compatlogger { 'daily-log':
+ log_dir => '/var/log/icinga2/compat',
+ rotation_method => 'DAILY'
+}
+
+
+Both patameters as optionals. The parameter `rotation_method` can one of `HOURLY`, `DAILY`, `WEEKLY` or `MONTHY`.
+See [CompatLogger](http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/configuring-icinga2#objecttype-compatlogger) on [docs.icinga.org](http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc) for a full list of parameters.
+
+####[`icinga2::object::checkresultreader`](id:object_checkresultreader)
+
+The `checkresultreader` defined type can create `checkresultreader` objects.
+
+Example:
+
+
+icinga2::object::checkresultreader {'reader':
+ spool_dir => '/data/check-results'
+}
+
+
+See [CheckResultReader](http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/configuring-icinga2#objecttype-checkresultreader) on [docs.icinga.org](http://docs.icinga.org/icinga2/latest/doc/module/icinga2/toc) for a full list of parameters.
+
####`icinga2::object::eventcommand`
The `eventcommand` defined type can create `eventcommand` objects.
diff --git a/manifests/object/apply_dependency.pp b/manifests/object/apply_dependency.pp
index c606ca4..f965597 100644
--- a/manifests/object/apply_dependency.pp
+++ b/manifests/object/apply_dependency.pp
@@ -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'),
+ }
+
}
-}
+}
\ No newline at end of file
diff --git a/manifests/object/apply_notification_to_host.pp b/manifests/object/apply_notification_to_host.pp
index 5ace072..56dc001 100644
--- a/manifests/object/apply_notification_to_host.pp
+++ b/manifests/object/apply_notification_to_host.pp
@@ -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'),
+ }
+
+ }
+
}
diff --git a/manifests/object/apply_notification_to_service.pp b/manifests/object/apply_notification_to_service.pp
index 2ddb64e..bda9a16 100644
--- a/manifests/object/apply_notification_to_service.pp
+++ b/manifests/object/apply_notification_to_service.pp
@@ -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'),
+ }
+
+ }
+
}
diff --git a/manifests/object/apply_service_to_host.pp b/manifests/object/apply_service_to_host.pp
index 12358de..6b86c6f 100644
--- a/manifests/object/apply_service_to_host.pp
+++ b/manifests/object/apply_service_to_host.pp
@@ -2,7 +2,8 @@
#
# This is a defined type for Icinga 2 apply objects that apply services to hosts.
# See the following Icinga 2 doc page for more info:
-# http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/configuring-icinga2#objecttype-service
+# http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/configuring-icinga2#objecttype-host
+# http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/configuring-icinga2#apply
#
# === Parameters
#
@@ -42,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:
@@ -55,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'),
+ }
+
}
}
diff --git a/manifests/object/checkcommand.pp b/manifests/object/checkcommand.pp
index 6ca9624..bf5ea50 100644
--- a/manifests/object/checkcommand.pp
+++ b/manifests/object/checkcommand.pp
@@ -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',
+ }
+ }
+
}
+
}
diff --git a/manifests/object/checkresultreader.pp b/manifests/object/checkresultreader.pp
new file mode 100644
index 0000000..afe4d89
--- /dev/null
+++ b/manifests/object/checkresultreader.pp
@@ -0,0 +1,66 @@
+# == Defined type: icinga2::object::checkresultreader
+#
+# This is a defined type for Icinga 2 apply objects that create Check Result Reader
+# See the following Icinga 2 doc page for more info:
+# http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/configuring-icinga2#objecttype-checkresultreader
+#
+# === Parameters
+#
+# See the inline comments.
+#
+
+define icinga2::object::checkresultreader (
+ $ensure = 'file',
+ $object_checkresultreadername = $name,
+ $spool_dir = undef,
+ $target_dir = '/etc/icinga2/objects/checkresultreaders',
+ $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:
+ if $object_checkresultreadername {
+ validate_string($object_checkresultreadername)
+ }
+ if $spool_dir {
+ validate_string($spool_dir)
+ }
+ validate_string($target_dir)
+ validate_string($target_file_name)
+ 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 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'),
+ }
+
+ }
+
+}
diff --git a/manifests/object/compatlogger.pp b/manifests/object/compatlogger.pp
new file mode 100644
index 0000000..00edfdf
--- /dev/null
+++ b/manifests/object/compatlogger.pp
@@ -0,0 +1,70 @@
+# == Defined type: icinga2::object::compatlogger
+#
+# This is a defined type for Icinga 2 apply objects that create Compat Logger
+# See the following Icinga 2 doc page for more info:
+# http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/configuring-icinga2#objecttype-compatlogger
+#
+# === Parameters
+#
+# See the inline comments.
+#
+
+define icinga2::object::compatlogger (
+ $ensure = 'file',
+ $object_compatloggername = $name,
+ $log_dir = undef,
+ $rotation_method = undef,
+ $target_dir = '/etc/icinga2/objects/compatloggers',
+ $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:
+ if $object_compatloggername {
+ validate_string($object_compatloggername)
+ }
+ if $log_dir {
+ validate_string($log_dir)
+ }
+ if $rotation_method {
+ validate_string($rotation_method)
+ }
+ validate_string($target_dir)
+ validate_string($target_file_name)
+ 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 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'),
+ }
+
+ }
+
+}
diff --git a/manifests/object/dependency.pp b/manifests/object/dependency.pp
index 555d77d..aa31649 100644
--- a/manifests/object/dependency.pp
+++ b/manifests/object/dependency.pp
@@ -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'),
+ }
+
}
}
diff --git a/manifests/object/eventcommand.pp b/manifests/object/eventcommand.pp
index d815d81..96dd3f0 100644
--- a/manifests/object/eventcommand.pp
+++ b/manifests/object/eventcommand.pp
@@ -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'),
+ }
+
}
}
diff --git a/manifests/object/externalcommandlistener.pp b/manifests/object/externalcommandlistener.pp
index 7d9f2fd..671650a 100644
--- a/manifests/object/externalcommandlistener.pp
+++ b/manifests/object/externalcommandlistener.pp
@@ -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'),
+ }
+
}
}
diff --git a/manifests/object/graphitewriter.pp b/manifests/object/graphitewriter.pp
index cf5629b..5fd4be3 100644
--- a/manifests/object/graphitewriter.pp
+++ b/manifests/object/graphitewriter.pp
@@ -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'),
+ }
+
+ }
+
}
diff --git a/manifests/object/host.pp b/manifests/object/host.pp
index 123e360..9937582 100644
--- a/manifests/object/host.pp
+++ b/manifests/object/host.pp
@@ -37,12 +37,13 @@ define icinga2::object::host (
$action_url = undef,
$icon_image = undef,
$icon_image_alt = undef,
- $target_dir = '/etc/icinga2/conf.d',
+ $target_dir = '/etc/icinga2/objects',
$target_file_name = "${fqdn}.conf",
$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'),
+ }
+
}
}
diff --git a/manifests/object/hostgroup.pp b/manifests/object/hostgroup.pp
index 95937b4..dde685b 100644
--- a/manifests/object/hostgroup.pp
+++ b/manifests/object/hostgroup.pp
@@ -14,14 +14,15 @@ define icinga2::object::hostgroup (
$display_name = $name,
$template_to_import = undef,
$groups = [],
- $target_dir = '/etc/icinga2/conf.d',
+ $target_dir = '/etc/icinga2/objects',
$target_file_name = "${name}.conf",
$target_file_ensure = file,
$target_file_owner = 'root',
$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'),
+ }
+
}
}
diff --git a/manifests/object/idomysqlconnection.pp b/manifests/object/idomysqlconnection.pp
index d411e07..7e7eb42 100644
--- a/manifests/object/idomysqlconnection.pp
+++ b/manifests/object/idomysqlconnection.pp
@@ -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'),
+ }
+
}
}
diff --git a/manifests/object/idopgsqlconnection.pp b/manifests/object/idopgsqlconnection.pp
index 2a269a3..f281b99 100644
--- a/manifests/object/idopgsqlconnection.pp
+++ b/manifests/object/idopgsqlconnection.pp
@@ -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'),
+ }
+
}
}
diff --git a/manifests/object/livestatuslistener.pp b/manifests/object/livestatuslistener.pp
index 8ad7980..19290fc 100644
--- a/manifests/object/livestatuslistener.pp
+++ b/manifests/object/livestatuslistener.pp
@@ -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'),
+ }
+
}
}
diff --git a/manifests/object/notification.pp b/manifests/object/notification.pp
index bc0e678..e8d5b4e 100644
--- a/manifests/object/notification.pp
+++ b/manifests/object/notification.pp
@@ -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'),
+ }
+
}
}
diff --git a/manifests/object/notificationcommand.pp b/manifests/object/notificationcommand.pp
index 57bc252..d909c47 100644
--- a/manifests/object/notificationcommand.pp
+++ b/manifests/object/notificationcommand.pp
@@ -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'),
+ }
+
}
}
diff --git a/manifests/object/perfdatawriter.pp b/manifests/object/perfdatawriter.pp
index 4a47d17..946a8a2 100644
--- a/manifests/object/perfdatawriter.pp
+++ b/manifests/object/perfdatawriter.pp
@@ -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'),
+ }
+
}
}
diff --git a/manifests/object/scheduleddowntime.pp b/manifests/object/scheduleddowntime.pp
index 9d0a87b..1b3c7fb 100644
--- a/manifests/object/scheduleddowntime.pp
+++ b/manifests/object/scheduleddowntime.pp
@@ -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'),
+ }
+
}
}
diff --git a/manifests/object/service.pp b/manifests/object/service.pp
index 9cf7a82..e6af2da 100644
--- a/manifests/object/service.pp
+++ b/manifests/object/service.pp
@@ -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'),
+ }
+
}
}
diff --git a/manifests/object/servicegroup.pp b/manifests/object/servicegroup.pp
index 67c8538..2650fed 100644
--- a/manifests/object/servicegroup.pp
+++ b/manifests/object/servicegroup.pp
@@ -14,14 +14,15 @@ define icinga2::object::servicegroup (
$display_name = $name,
$template_to_import = undef,
$groups = [],
- $target_dir = '/etc/icinga2/conf.d',
+ $target_dir = '/etc/icinga2/objects',
$target_file_name = "${name}.conf",
$target_file_ensure = file,
$target_file_owner = 'root',
$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'),
+ }
+
}
}
diff --git a/manifests/object/statusdatawriter.pp b/manifests/object/statusdatawriter.pp
index 563e11c..34fd8a2 100644
--- a/manifests/object/statusdatawriter.pp
+++ b/manifests/object/statusdatawriter.pp
@@ -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'),
+ }
+
}
}
diff --git a/manifests/object/sysloglogger.pp b/manifests/object/sysloglogger.pp
index c33c682..fd72091 100644
--- a/manifests/object/sysloglogger.pp
+++ b/manifests/object/sysloglogger.pp
@@ -12,12 +12,13 @@
define icinga2::object::sysloglogger (
$object_name = $name,
$severity = 'warning',
- $target_dir = '/etc/icinga2/conf.d',
+ $target_dir = '/etc/icinga2/objects',
$target_file_name = "${name}.conf",
$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'),
+ }
+
}
}
diff --git a/manifests/object/timeperiod.pp b/manifests/object/timeperiod.pp
index 1e8d368..7643384 100644
--- a/manifests/object/timeperiod.pp
+++ b/manifests/object/timeperiod.pp
@@ -2,7 +2,7 @@
#
# This is a defined type for Icinga 2 host objects.
# See the following Icinga 2 doc page for more info:
-# http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/monitoring-basics#timeperiods
+# http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/configuring-icinga2#objecttype-timeperiod
#
# === Parameters
#
@@ -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'),
+ }
+
+ }
+
}
diff --git a/manifests/object/user.pp b/manifests/object/user.pp
index 327ea0b..21ea6d7 100644
--- a/manifests/object/user.pp
+++ b/manifests/object/user.pp
@@ -20,12 +20,13 @@ define icinga2::object::user (
$period = undef,
$types = [],
$states = [],
- $target_dir = '/etc/icinga2/conf.d',
+ $target_dir = '/etc/icinga2/objects',
$target_file_name = "${name}.conf",
$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'),
+ }
+
}
}
diff --git a/manifests/object/usergroup.pp b/manifests/object/usergroup.pp
index 3c58096..7c96545 100644
--- a/manifests/object/usergroup.pp
+++ b/manifests/object/usergroup.pp
@@ -14,14 +14,15 @@ define icinga2::object::usergroup (
$display_name = $name,
$template_to_import = undef,
$groups = [],
- $target_dir = '/etc/icinga2/conf.d',
+ $target_dir = '/etc/icinga2/objects',
$target_file_name = "${name}.conf",
$target_file_ensure = file,
$target_file_owner = 'root',
$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'),
+ }
+
}
}
diff --git a/manifests/params.pp b/manifests/params.pp
index f0382bb..0871254 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -235,6 +235,9 @@ class icinga2::params {
#Fail if we're on any other OS:
default: { fail("${::operatingsystem} is not supported!") }
}
+
+ #Whether to purge object files or directories in /etc/icinga2/objects that aren't managed by Puppet
+ $purge_unmanaged_object_files = false
##################
# Icinga 2 server service settings
diff --git a/manifests/server.pp b/manifests/server.pp
index e93a15f..32d9932 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -26,6 +26,7 @@ class icinga2::server (
$install_mail_utils_package = $icinga2::params::install_mail_utils_package,
$server_enabled_features = $icinga2::params::server_enabled_features,
$server_disabled_features = $icinga2::params::server_disabled_features,
+ $purge_unmanaged_object_files = $icinga2::params::purge_unmanaged_object_files
) inherits icinga2::params {
#Do some validation of parameters so we know we have the right data types:
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
index 989d280..ee46770 100644
--- a/manifests/server/config.pp
+++ b/manifests/server/config.pp
@@ -15,6 +15,18 @@ class icinga2::server::config inherits icinga2::server {
include icinga2::params
+ if $purge_unmanaged_object_files == true {
+ $recurse_objects = true
+ $purge_objects = true
+ $force_purge = true
+ }
+ else {
+ $recurse_objects = false
+ $purge_objects = false
+ $force_purge = true
+ }
+
+
#Directory resource for /etc/icinga2/:
file { '/etc/icinga2/':
ensure => directory,
@@ -99,6 +111,9 @@ class icinga2::server::config inherits icinga2::server {
owner => $etc_icinga2_obejcts_owner,
group => $etc_icinga2_obejcts_group,
mode => $etc_icinga2_obejcts_mode,
+ recurse => $recurse_objects,
+ purge => $purge_objects,
+ force => $force_purge
}
#Directory resource for /etc/icinga2/objects/hosts/:
diff --git a/manifests/server/features/disable.pp b/manifests/server/features/disable.pp
index 6d73555..af6564c 100644
--- a/manifests/server/features/disable.pp
+++ b/manifests/server/features/disable.pp
@@ -1,9 +1,9 @@
# Disable Icinga 2 Features/Modules
define icinga2::server::features::disable () {
- exec { "icinga2-disable-feature ${name}":
+ exec { "icinga2 disable feature ${name}":
user => 'root',
path => '/usr/bin:/usr/sbin:/bin/:/sbin',
- command => "/usr/sbin/icinga2-disable-feature ${name}",
+ command => "/usr/sbin/icinga2 feature disable ${name}",
unless => "[ ! -f /etc/icinga2/features-enabled/${name}.conf ]",
require => Class['icinga2::server::install::packages'],
}
diff --git a/manifests/server/features/enable.pp b/manifests/server/features/enable.pp
index 0dc0d6d..63c11ed 100644
--- a/manifests/server/features/enable.pp
+++ b/manifests/server/features/enable.pp
@@ -1,9 +1,9 @@
# Enable Icinga 2 Features/Modules
define icinga2::server::features::enable () {
- exec { "icinga2-enable-feature ${name}":
+ exec { "icinga2 enable feature ${name}":
user => 'root',
path => '/usr/bin:/usr/sbin:/bin/:/sbin',
- command => "/usr/sbin/icinga2-enable-feature ${name}",
+ command => "/usr/sbin/icinga2 feature enable ${name}",
unless => "[ ! -f /etc/icinga2/features-available/${name}.conf ] || [ -f /etc/icinga2/features-enabled/${name}.conf ]",
require => Class['icinga2::server::install::packages'],
}
diff --git a/manifests/server/install.pp b/manifests/server/install.pp
index ad43ba2..9db78be 100644
--- a/manifests/server/install.pp
+++ b/manifests/server/install.pp
@@ -149,7 +149,7 @@ class icinga2::server::install::execs inherits icinga2::server {
exec { 'mysql_module_enable':
user => 'root',
path => '/usr/bin:/usr/sbin:/bin/:/sbin',
- command => '/usr/sbin/icinga2-enable-feature ido-mysql && touch /etc/icinga2/mysql_module_loaded.txt',
+ command => '/usr/sbin/icinga2 enable feature ido-mysql && touch /etc/icinga2/mysql_module_loaded.txt',
creates => '/etc/icinga2/mysql_module_loaded.txt',
require => Exec['mysql_schema_load'],
}
@@ -168,7 +168,7 @@ class icinga2::server::install::execs inherits icinga2::server {
exec { 'postgres_module_enable':
user => 'root',
path => '/usr/bin:/usr/sbin:/bin/:/sbin',
- command => '/usr/sbin/icinga2-enable-feature ido-pgsql && touch /etc/icinga2/postgres_module_loaded.txt',
+ command => '/usr/sbin/icinga2 enable feature ido-pgsql && touch /etc/icinga2/postgres_module_loaded.txt',
creates => '/etc/icinga2/postgres_module_loaded.txt',
require => Exec['postgres_schema_load'],
}
diff --git a/templates/object_checkresultreader.conf.erb b/templates/object_checkresultreader.conf.erb
new file mode 100644
index 0000000..a2fc393
--- /dev/null
+++ b/templates/object_checkresultreader.conf.erb
@@ -0,0 +1,20 @@
+/**
+* WARNING: This CheckResultReader definition is automatically generated by Puppet.
+* ANY MANUAL CHANGES TO IT WILL GET OVERWRITTEN!
+*/
+
+/**
+* A CheckResultReader definition. You can create your own configuration files
+* in the conf.d directory (e.g. one per commnand). By default all *.conf
+* files in this directory are included.
+*
+*/
+
+library "compat"
+
+object CheckResultReader "<%= @object_checkresultreadername %>" {
+ <%#- If any of the @ parameters are undefined, don't print anything for them: -%>
+ <%- if @spool_dir -%>
+ spool_dir = "<%= @spool_dir %>"
+ <%- end -%>
+}
diff --git a/templates/object_compatlogger.conf.erb b/templates/object_compatlogger.conf.erb
new file mode 100644
index 0000000..17004f8
--- /dev/null
+++ b/templates/object_compatlogger.conf.erb
@@ -0,0 +1,24 @@
+/**
+* WARNING: This CompatLogger definition is automatically generated by Puppet.
+* ANY MANUAL CHANGES TO IT WILL GET OVERWRITTEN!
+*/
+
+/**
+* A CompatLogger definition. You can create your own configuration files
+* in the conf.d directory (e.g. one per commnand). By default all *.conf
+* files in this directory are included.
+*
+*/
+
+library "compat"
+
+object CompatLogger "<%= @object_compatloggername %>" {
+ <%#- If any of the @ parameters are undefined, don't print anything for them: -%>
+ <%- if @log_dir -%>
+
+ log_dir = "<%= @log_dir %>"
+ <%- end -%>
+ <%- if @rotation_method -%>
+ rotation_method = "<%= @rotation_method %>"
+ <%- end -%>
+}