diff --git a/nagios/manifests/init.pp b/nagios/manifests/init.pp index 87f5e73..df354bb 100644 --- a/nagios/manifests/init.pp +++ b/nagios/manifests/init.pp @@ -334,11 +334,13 @@ define nagios::contact::email($group=["all"], # === Parameters # # $name: +# Descriptive name for contact. +# $key: # Prowl API key. # $group: # List of contact groups. Defaults to "all". # -define nagios::contact::prowl($group=["all"], +define nagios::contact::prowl($key, $group=["all"], $confdir=$nagios::common::confdir) { $contactgroups = inline_template('<%= @group.join(",") -%>') @@ -360,7 +362,7 @@ define nagios::contact::prowl($group=["all"], service_notification_commands => "notify-service-by-prowl", service_notification_options => "c", service_notification_period => "24x7", - address1 => $name, + address1 => $key, notify => Service["nagios"], } @@ -372,13 +374,15 @@ define nagios::contact::prowl($group=["all"], # === Parameters # # $name: +# Descriptive name for contact. +# $key: # Pushover user key. # $token: # Pushover application token. # $group: # List of contact groups. Defaults to "all". # -define nagios::contact::pushover($token, $group=["all"], +define nagios::contact::pushover($key, $token, $group=["all"], $confdir=$nagios::common::confdir) { $contactgroups = inline_template('<%= @group.join(",") -%>') @@ -400,7 +404,7 @@ define nagios::contact::pushover($token, $group=["all"], service_notification_commands => "notify-service-by-pushover", service_notification_options => "c", service_notification_period => "24x7", - address1 => $name, + address1 => $key, address2 => $token, notify => Service["nagios"], }