nagios: Set keys for prowl and pushover in separate parameter

This commit is contained in:
Ossi Salmi 2013-08-22 13:29:05 +03:00
parent 6d3af17844
commit f7d6b9252b

View file

@ -334,11 +334,13 @@ define nagios::contact::email($group=["all"],
# === Parameters # === Parameters
# #
# $name: # $name:
# Descriptive name for contact.
# $key:
# Prowl API key. # Prowl API key.
# $group: # $group:
# List of contact groups. Defaults to "all". # List of contact groups. Defaults to "all".
# #
define nagios::contact::prowl($group=["all"], define nagios::contact::prowl($key, $group=["all"],
$confdir=$nagios::common::confdir) { $confdir=$nagios::common::confdir) {
$contactgroups = inline_template('<%= @group.join(",") -%>') $contactgroups = inline_template('<%= @group.join(",") -%>')
@ -360,7 +362,7 @@ define nagios::contact::prowl($group=["all"],
service_notification_commands => "notify-service-by-prowl", service_notification_commands => "notify-service-by-prowl",
service_notification_options => "c", service_notification_options => "c",
service_notification_period => "24x7", service_notification_period => "24x7",
address1 => $name, address1 => $key,
notify => Service["nagios"], notify => Service["nagios"],
} }
@ -372,13 +374,15 @@ define nagios::contact::prowl($group=["all"],
# === Parameters # === Parameters
# #
# $name: # $name:
# Descriptive name for contact.
# $key:
# Pushover user key. # Pushover user key.
# $token: # $token:
# Pushover application token. # Pushover application token.
# $group: # $group:
# List of contact groups. Defaults to "all". # 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) { $confdir=$nagios::common::confdir) {
$contactgroups = inline_template('<%= @group.join(",") -%>') $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_commands => "notify-service-by-pushover",
service_notification_options => "c", service_notification_options => "c",
service_notification_period => "24x7", service_notification_period => "24x7",
address1 => $name, address1 => $key,
address2 => $token, address2 => $token,
notify => Service["nagios"], notify => Service["nagios"],
} }