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

* fixed conflict.

Browse source
This commit is contained in:
Ricardo Cropalato de Melo 2014-11-13 12:09:50 -05:00
commit 18147f9dc2
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -18,6 +18,11 @@
* Feature: [PR-29](https://github.com/Icinga/puppet-icinga2/pull/29) and issue [#7213](https://dev.icinga.org/issues/7213): Added a CheckCommand object defined type
* Feature: [PR-32](https://github.com/Icinga/puppet-icinga2/pull/32): Added a NotificationCommand object.
* Feature: [PR-33](https://github.com/Icinga/puppet-icinga2/pull/33): Added an EventCommand object.
* 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.
###v0.5 (August 17th, 2014)

30
README.md
View file

@ -328,22 +328,22 @@ This means that they will not be added to the rendered object definition files.
Object types:
* [icinga2::object::apply_service_to_host](#object_apply_service_to_host)
* [icinga2::object::checkcommand](#object_checkcommand)
* [icinga2::object::eventcommand](id:object_eventcommand)
* [icinga2::object::host](id:object_host)
* [icinga2::object::hostgroup](id:object_hostgroup)
* [icinga2::object::idomysqlconnection](id:object_idomysqlconnection)
* [icinga2::object::idopgsqlconnection](id:object_idopgsqlconnection)
* [icinga2::object::notification](id:object_notification)
* [icinga2::object::notificationcommand](id:object_notificationcommand)
* [icinga2::object::applyservicetohost](#icinga2objectapplyservicetohost)
* [icinga2::object::checkcommand](#icinga2objectcheckcommand)
* [icinga2::object::eventcommand](#icinga2objecteventcommand)
* [icinga2::object::host](#icinga2objecthost)
* [icinga2::object::hostgroup](#icinga2objecthostgroup)
* [icinga2::object::idomysqlconnection](#icinga2objectidomysqlconnection)
* [icinga2::object::idopgsqlconnection](#icinga2objectidopgsqlconnection)
* [icinga2::object::notification](#icinga2objectnotification)
* [icinga2::object::notificationcommand](#icinga2objectnotificationcommand)
* [icinga2::object::scheduleddowntime](#icinga2objectscheduleddowntime)
* [icinga2::object::service](id:object_service)
* [icinga2::object::servicegroup](id:object_servicegroup)
* [icinga2::object::syslogger](id:object_syslogger)
* [icinga2::object::timeperiod](#object_timeperiod)
* [icinga2::object::user](id:object_user)
* [icinga2::object::usergroup](id:object_usergroup)
* [icinga2::object::service](#icinga2objectservice)
* [icinga2::object::servicegroup](#icinga2objectservicegroup)
* [icinga2::object::syslogger](#icinga2objectsyslogger)
* [icinga2::object::timeperiod](#icinga2objecttimeperiod)
* [icinga2::object::user](#icinga2objectuser)
* [icinga2::object::usergroup](#icinga2objectusergroup)
####[`icinga2::object::apply_service_to_host`](id:object_apply_service_to_host)