Lcarr has uploaded a new change for review.
https://gerrit.wikimedia.org/r/73344
Change subject: two fixes
......................................................................
two fixes
1 - Icinga, not Nagios
2 - Not a sample config file any more :)
Change-Id: I985eb916381c67b6e937ca34c7297a9cb7bcd4c1
---
M files/icinga/misccommands.cfg
1 file changed, 3 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/73344/1
diff --git a/files/icinga/misccommands.cfg b/files/icinga/misccommands.cfg
index 3c6a702..3d7f720 100644
--- a/files/icinga/misccommands.cfg
+++ b/files/icinga/misccommands.cfg
@@ -1,16 +1,4 @@
################################################################################
-# Sample object config file for Nagios
-#
-# Read the documentation for more information on this configuration file. I've
-# provided some comments here, but things may not be so clear without further
-# explanation, so make sure to read the HTML documentation!
-#
-# Last Modified: 12-17-2005
-#
-################################################################################
-
-
-################################################################################
# COMMAND DEFINITIONS
#
# SYNTAX:
@@ -28,28 +16,17 @@
# used as a template for this definition (optional)
# <objectname> = object name of command definition, referenced by other
# command definitions that use it as a template (optional)
-# <commandname> = name of the command, as recognized/used by Nagios
+# <commandname> = name of the command, as recognized/used by Icinga
# <commandline> = command line
#
################################################################################
-
-################################################################################
-#
-# SAMPLE NOTIFICATION COMMANDS
-#
-# These are some example notification commands. They may or may not work on
-# your system without modification.
-#
-################################################################################
-
-
# 'host-notify-by-email' command definition
define command{
command_name host-notify-by-email
- command_line /usr/bin/printf "%b" "❤❤❤❤❤ Nagios
❤❤❤❤❤\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState:
$HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time:
$LONGDATETIME$\nLove, Icinga" | /usr/bin/mail -s "Host $HOSTSTATE$ alert for
$HOSTNAME$!" $CONTACTEMAIL$
+ command_line /usr/bin/printf "%b" "❤❤❤❤❤ Icinga
❤❤❤❤❤\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState:
$HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time:
$LONGDATETIME$\nLove, Icinga" | /usr/bin/mail -s "Host $HOSTSTATE$ alert for
$HOSTNAME$!" $CONTACTEMAIL$
}
@@ -62,7 +39,7 @@
# 'notify-by-email' command definition
define command{
command_name notify-by-email
- command_line /usr/bin/printf "%b" "❤❤❤❤❤ Nagios
❤❤❤❤❤\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost:
$HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time:
$LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\nLove, Icinga" |
/usr/bin/mail -s "** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is
$SERVICESTATE$ **" $CONTACTEMAIL$
+ command_line /usr/bin/printf "%b" "❤❤❤❤❤ Icinga
❤❤❤❤❤\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost:
$HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time:
$LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\nLove, Icinga" |
/usr/bin/mail -s "** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is
$SERVICESTATE$ **" $CONTACTEMAIL$
}
--
To view, visit https://gerrit.wikimedia.org/r/73344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I985eb916381c67b6e937ca34c7297a9cb7bcd4c1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Lcarr <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
