From 3df3930a92844a969f6bbbaea224698d84d52cb8 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 9 Apr 2014 00:07:39 +0200 Subject: [PATCH] Update example config. Refs #5909 --- etc/icinga2/conf.d/notifications.conf | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/etc/icinga2/conf.d/notifications.conf b/etc/icinga2/conf.d/notifications.conf index 14c35c54c..7decaeb04 100644 --- a/etc/icinga2/conf.d/notifications.conf +++ b/etc/icinga2/conf.d/notifications.conf @@ -20,16 +20,16 @@ object NotificationCommand "mail-host-notification" { env = { "NOTIFICATIONTYPE" = "$notification.type$" - "HOSTALIAS" = "$host.displayname$", - "HOSTADDRESS" = "$host.vars.address$", + "HOSTALIAS" = "$host.display_name$", + "HOSTADDRESS" = "$address$", "HOSTSTATE" = "$host.state$", - "LONGDATETIME" = "$icinga.longdatetime$", + "LONGDATETIME" = "$icinga.long_date_time$", "HOSTOUTPUT" = "$host.output$", "NOTIFICATIONAUTHORNAME" = "$notification.author$", "NOTIFICATIONCOMMENT" = "$notification.comment$", - "HOSTDISPLAYNAME" = "$host.displayname$", - "HOSTDISPLAYNAME" = "$host.displayname$", - "USEREMAIL" = "$user.vars.email$" + "HOSTDISPLAYNAME" = "$host.display_name$", + "HOSTDISPLAYNAME" = "$host.display_name$", + "USEREMAIL" = "$user.email$" } } @@ -51,17 +51,17 @@ object NotificationCommand "mail-service-notification" { env = { "NOTIFICATIONTYPE" = "$notification.type$" - "SERVICEDESC" = "$service.description$" - "HOSTALIAS" = "$host.displayname$", - "HOSTADDRESS" = "$host.vars.address$", + "SERVICEDESC" = "$service.name$" + "HOSTALIAS" = "$host.display_name$", + "HOSTADDRESS" = "$address$", "SERVICESTATE" = "$service.state$", - "LONGDATETIME" = "$icinga.longdatetime$", + "LONGDATETIME" = "$icinga.long_date_time$", "SERVICEOUTPUT" = "$service.output$", "NOTIFICATIONAUTHORNAME" = "$notification.author$", "NOTIFICATIONCOMMENT" = "$notification.comment$", - "HOSTDISPLAYNAME" = "$host.displayname$", - "SERVICEDISPLAYNAME" = "$service.displayname$", - "USEREMAIL" = "$user.vars.email$" + "HOSTDISPLAYNAME" = "$host.display_name$", + "SERVICEDISPLAYNAME" = "$service.display_name$", + "USEREMAIL" = "$user.email$" } }