diff --git a/CHANGELOG.md b/CHANGELOG.md index c0ffa7642..fb63146f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,29 +1,46 @@ # Change Log +## [v2.4.0](https://github.com/icinga/puppet-icinga2/tree/v2.4.0) (2020-04-24) +[Full Changelog](https://github.com/icinga/puppet-icinga2/compare/v2.3.4...v2.4.0) + +**Implemented enhancements:** + +- Add new icingadb feature [\#612](https://github.com/Icinga/puppet-icinga2/issues/612) +- Rework examples and docs [\#423](https://github.com/Icinga/puppet-icinga2/issues/423) + +**Fixed bugs:** + +- Fix rubocop LineLength \# see https://rubocop.readthedocs.io/en/latest… [\#611](https://github.com/Icinga/puppet-icinga2/pull/611) ([thomas-merz](https://github.com/thomas-merz)) + ## [v2.3.4](https://github.com/icinga/puppet-icinga2/tree/v2.3.4) (2020-03-25) [Full Changelog](https://github.com/icinga/puppet-icinga2/compare/v2.3.3...v2.3.4) **Implemented enhancements:** - Remove Support for some platforms [\#610](https://github.com/Icinga/puppet-icinga2/issues/610) +- Allow to parse a simple hash in strings [\#588](https://github.com/Icinga/puppet-icinga2/issues/588) +- Allow to parse an array in strings [\#587](https://github.com/Icinga/puppet-icinga2/issues/587) - rework icinga2::repo class to a public class [\#609](https://github.com/Icinga/puppet-icinga2/pull/609) ([lbetz](https://github.com/lbetz)) - Influxdb can be reachable via any port [\#607](https://github.com/Icinga/puppet-icinga2/pull/607) ([b3n4kh](https://github.com/b3n4kh)) +- Debian10 support [\#604](https://github.com/Icinga/puppet-icinga2/pull/604) ([lbetz](https://github.com/lbetz)) +- Enhancement/allow to get attributes from function result [\#603](https://github.com/Icinga/puppet-icinga2/pull/603) ([lbetz](https://github.com/lbetz)) +- RHEL 8 support [\#600](https://github.com/Icinga/puppet-icinga2/pull/600) ([lbetz](https://github.com/lbetz)) +- Porting functions to the modern Puppet 4.x API [\#598](https://github.com/Icinga/puppet-icinga2/pull/598) ([binford2k](https://github.com/binford2k)) + +**Fixed bugs:** + +- add missing EPEL repo on RedHat [\#599](https://github.com/Icinga/puppet-icinga2/pull/599) ([lbetz](https://github.com/lbetz)) ## [v2.3.3](https://github.com/icinga/puppet-icinga2/tree/v2.3.3) (2020-03-16) [Full Changelog](https://github.com/icinga/puppet-icinga2/compare/v2.3.2...v2.3.3) **Implemented enhancements:** -- Allow to parse a simple hash in strings [\#588](https://github.com/Icinga/puppet-icinga2/issues/588) -- Debian10 support [\#604](https://github.com/Icinga/puppet-icinga2/pull/604) ([lbetz](https://github.com/lbetz)) -- Enhancement/allow to get attributes from function result [\#603](https://github.com/Icinga/puppet-icinga2/pull/603) ([lbetz](https://github.com/lbetz)) -- RHEL 8 support [\#600](https://github.com/Icinga/puppet-icinga2/pull/600) ([lbetz](https://github.com/lbetz)) -- Porting functions to the modern Puppet 4.x API [\#598](https://github.com/Icinga/puppet-icinga2/pull/598) ([binford2k](https://github.com/binford2k)) +- install icinga2-selinux [\#602](https://github.com/Icinga/puppet-icinga2/pull/602) ([b3n4kh](https://github.com/b3n4kh)) **Fixed bugs:** - Private keys: no diff, no backup [\#606](https://github.com/Icinga/puppet-icinga2/pull/606) ([Thomas-Gelf](https://github.com/Thomas-Gelf)) -- add missing EPEL repo on RedHat [\#599](https://github.com/Icinga/puppet-icinga2/pull/599) ([lbetz](https://github.com/lbetz)) **Closed issues:** @@ -39,10 +56,6 @@ ## [v2.3.1](https://github.com/icinga/puppet-icinga2/tree/v2.3.1) (2019-12-17) [Full Changelog](https://github.com/icinga/puppet-icinga2/compare/v2.3.0...v2.3.1) -**Implemented enhancements:** - -- Allow to parse an array in strings [\#587](https://github.com/Icinga/puppet-icinga2/issues/587) - **Fixed bugs:** - Add Backports Repo on Debian [\#595](https://github.com/Icinga/puppet-icinga2/issues/595) @@ -832,4 +845,4 @@ ## [v0.6.1](https://github.com/icinga/puppet-icinga2/tree/v0.6.1) (2014-12-03) -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* diff --git a/REFERENCE.md b/REFERENCE.md index 7d66dcd86..5f431ab08 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -994,7 +994,7 @@ The following parameters are available in the `icinga2::feature::icingadb` class Data type: `Enum['absent', 'present']` -Set to present, enables the feature icingadb, absent disabled it. Defaults to present. +Set to present, enables the feature icingadb, absent disabled it. Default value: present @@ -1002,7 +1002,7 @@ Default value: present Data type: `Optional[Stdlib::Host]` -IcingaDB Redis host address. Icinga defaults to '127.0.0.1'. +IcingaDB Redis host address. Default value: `undef` @@ -1010,30 +1010,24 @@ Default value: `undef` Data type: `Optional[Stdlib::Port::Unprivileged]` -IcingaDB Redis port. Icinga defaults to 6380. +IcingaDB Redis port. Default value: `undef` -##### `path` +##### `socket_path` Data type: `Optional[Stdlib::Absolutepath]` IcingaDB Redis unix sockt. Can be used instead of host and port attributes. +Default value: `undef` + ##### `password` Data type: `Optional[String]` IcingaDB Redis password. -Default value: `undef` - -##### `socket_path` - -Data type: `Optional[Stdlib::Absolutepath]` - - - Default value: `undef` ### icinga2::feature::idomysql @@ -3409,37 +3403,9 @@ Manage Icinga 2 service objects. #### Examples -##### # A service `ping` is applied to all hosts with a valid ipv4 address. - -```puppet -::icinga2::object::service { 'ping4': - import => ['generic-service'], - apply => true, - check_command => 'ping', - assign => ['host.address'], - target => '/etc/icinga2/zones.d/global-templates/services.conf', -} -``` - -##### A `apply Service for (disk_name =>config in host.vars.disks)` rule is applied to all Linux hosts with an Icinga Agent. Note in this example it's required that the endpoint (see `command_endpoint`) and the host object has the same name! - -```puppet -::icinga2::object::service { 'linux_disks': - import => ['generic-service'], - apply => 'disk_name => config in host.vars.disks', - check_command => 'disk', - command_endpoint => 'host.name', - vars => '+ config', - assign => ['host.vars.os == Linux'], - ignore => ['host.vars.noagent'], - target => '/etc/icinga2/zones.d/global-templates/services.conf', -} -``` - ##### A service `ping` is applied to all hosts with a valid ipv4 address. ```puppet - ::icinga2::object::service { 'ping4': import => ['generic-service'], apply => true, @@ -3452,7 +3418,6 @@ Manage Icinga 2 service objects. ##### A `apply Service for (disk_name =>config in host.vars.disks)` rule is applied to all Linux hosts with an Icinga Agent. Note in this example it's required that the endpoint (see `command_endpoint`) and the host object has the same name! ```puppet - ::icinga2::object::service { 'linux_disks': import => ['generic-service'], apply => 'disk_name => config in host.vars.disks', diff --git a/manifests/feature/icingadb.pp b/manifests/feature/icingadb.pp index e77da3f01..50665b499 100644 --- a/manifests/feature/icingadb.pp +++ b/manifests/feature/icingadb.pp @@ -2,15 +2,15 @@ # Configures the Icinga 2 feature icingadb. # # @param [Enum['absent', 'present']] ensure -# Set to present, enables the feature icingadb, absent disabled it. Defaults to present. +# Set to present, enables the feature icingadb, absent disabled it. # # @param [Optional[Stdlib::Host]] host -# IcingaDB Redis host address. Icinga defaults to '127.0.0.1'. +# IcingaDB Redis host address. # # @param [Optional[Stdlib::Port::Unprivileged]] port -# IcingaDB Redis port. Icinga defaults to 6380. +# IcingaDB Redis port. # -# @param [Optional[Stdlib::Absolutepath]] path +# @param [Optional[Stdlib::Absolutepath]] socket_path # IcingaDB Redis unix sockt. Can be used instead of host and port attributes. # # @param [Optional[String]] password diff --git a/manifests/object/service.pp b/manifests/object/service.pp index 7167e306d..ed392d2df 100644 --- a/manifests/object/service.pp +++ b/manifests/object/service.pp @@ -1,7 +1,7 @@ # @summary # Manage Icinga 2 service objects. # -# @example # A service `ping` is applied to all hosts with a valid ipv4 address. +# @example A service `ping` is applied to all hosts with a valid ipv4 address. # ::icinga2::object::service { 'ping4': # import => ['generic-service'], # apply => true, @@ -145,29 +145,6 @@ # @param [Variant[String, Integer]] order # String or integer to set the position in the target file, sorted alpha numeric. # -# @example A service `ping` is applied to all hosts with a valid ipv4 address. -# -# ::icinga2::object::service { 'ping4': -# import => ['generic-service'], -# apply => true, -# check_command => 'ping', -# assign => ['host.address'], -# target => '/etc/icinga2/zones.d/global-templates/services.conf', -# } -# -# @example A `apply Service for (disk_name =>config in host.vars.disks)` rule is applied to all Linux hosts with an Icinga Agent. Note in this example it's required that the endpoint (see `command_endpoint`) and the host object has the same name! -# -# ::icinga2::object::service { 'linux_disks': -# import => ['generic-service'], -# apply => 'disk_name => config in host.vars.disks', -# check_command => 'disk', -# command_endpoint => 'host.name', -# vars => '+ config', -# assign => ['host.vars.os == Linux'], -# ignore => ['host.vars.noagent'], -# target => '/etc/icinga2/zones.d/global-templates/services.conf', -# } -# define icinga2::object::service ( Stdlib::Absolutepath $target, Enum['absent', 'present'] $ensure = present, diff --git a/metadata.json b/metadata.json index fba0c6f57..2f20379a6 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "icinga-icinga2", - "version": "2.3.4", + "version": "2.4.0", "author": "Icinga Development Team", "summary": "Icinga 2 Puppet Module", "license": "Apache-2.0",