[icinga-checkins] icinga.org: puppet-icinga2/master: correctly merge conflicts

git at icinga.org git at icinga.org
Mon Nov 17 06:37:41 CET 2014


Module: puppet-icinga2
Branch: master
Commit: 1c6637252e8554471ea35aa2a11c99c56bca5a48
URL:    https://git.icinga.org/?p=puppet-icinga2.git;a=commit;h=1c6637252e8554471ea35aa2a11c99c56bca5a48

Author: Steven Bambling <smbambling at gmail.com>
Date:   Fri Nov 14 06:34:12 2014 -0500

correctly merge conflicts

Signed-off-by: Nick Chappell <nick at intronic.org>

Merged this from: https://github.com/Icinga/puppet-icinga2/pull/44

refs#7677: https://dev.icinga.org/issues/7677

---

 README.md |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/README.md b/README.md
index 56be660..c4b313f 100644
--- a/README.md
+++ b/README.md
@@ -356,6 +356,7 @@ Object types:
 
 * [icinga2::object::applyservicetohost](#icinga2objectapplyservicetohost)
 * [icinga2::object::applynotificationtohost](#icinga2objectapplynotificationtohost)
+* [icinga2::object::applynotificationtoservice](#icinga2objectapplynotificationtoservice)
 * [icinga2::object::checkcommand](#icinga2objectcheckcommand)
 * [icinga2::object::eventcommand](#icinga2objecteventcommand)
 * [icinga2::object::host](#icinga2objecthost)
@@ -420,6 +421,23 @@ icinga2::object::apply_notification_to_host { 'pagerduty-host':
   states       => [ 'Up', 'Down' ],
   types        => [ 'Problem', 'Acknowledgement', 'Recovery', 'Custom' ],
   period       => '24x7',
+
+````
+
+####[`icinga2::object::applynotificationtoservice`](id:object_apply_notification_to_service)
+
+The `apply_notification_to_service` defined type can create `apply` objects to apply notifications to service:
+
+This defined type has the same available attributes that the `icinga2::object::notification` defined type does. With the addition of assign_where and ignore_where
+
+````
+icinga2::object::apply_notification_to_service { 'pagerduty-service':
+  assign_where => 'service.vars.enable_pagerduty == "true"',
+  command      => 'notify-service-by-pagerduty',
+  users        => [ 'pagerduty' ],
+  states       => [ 'OK', 'Warning', 'Critical', 'Unknown' ],
+  types        => [ 'Problem', 'Acknowledgement', 'Recovery', 'Custom' ],
+  period       => '24x7',
 }
 ````
 



More information about the icinga-checkins mailing list