diff --git a/roles/nagios_server/files/nagios/commands/notify.cfg b/roles/nagios_server/files/nagios/commands/notify.cfg index 867b387ef0..6083eeb0bb 100644 --- a/roles/nagios_server/files/nagios/commands/notify.cfg +++ b/roles/nagios_server/files/nagios/commands/notify.cfg @@ -57,13 +57,6 @@ define command{ command_line /usr/bin/echo '{"type": "$NOTIFICATIONTYPE$", "host": "$HOSTALIAS$", "state": "$HOSTSTATE$", "output": "$HOSTOUTPUT$", "host_ack_author": "$HOSTACKAUTHOR$", "service_ack_author": "$SERVICEACKAUTHOR$"}' | fedmsg-logger --cert-prefix nagios --modname nagios --topic host.state.change --json-input } -# 'notify-by-epager' command definition -define command{ - command_name notify-by-epager - command_line /usr/bin/printf "%b" "Service: $SERVICEDESC$\nHost: $HOSTNAME$\nInfo: $SERVICEOUTPUT$\nSource: $$(hostname -s)\nDate: $LONGDATETIME$" | /bin/mail -s "$NOTIFICATIONTYPE$: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$" $CONTACTPAGER$ - } - - # 'notify-by-fedmsg' command definition define command{ command_name notify-by-fedmsg diff --git a/roles/nagios_server/files/nagios/commands/ssh.cfg b/roles/nagios_server/files/nagios/commands/ssh.cfg index 6553347890..55128528f5 100644 --- a/roles/nagios_server/files/nagios/commands/ssh.cfg +++ b/roles/nagios_server/files/nagios/commands/ssh.cfg @@ -4,19 +4,3 @@ define command{ command_line $USER1$/check_ssh -H $HOSTADDRESS$ } - -define command { - command_name check_by_ssh_check_raid - command_line $USER1$/check_by_ssh -t 30 -H $HOSTADDRESS$ "$USER1$/check_raid.py" -} - -define command { - command_name check_by_ssh_check_disk - command_line $USER1$/check_by_ssh -t 30 -H $HOSTADDRESS$ "$USER1$/check_disk -w $ARG1$% -c $ARG2$% -p $ARG3$" -} - -# 'check_postgres_conns' command definition -define command{ - command_name check_postgres_conns - command_line $USER1$/check_by_ssh -t 30 -H $HOSTADDRESS$ "$USER1$/check_procs -u postgres -w $ARG1$ -c $ARG2$ -a $ARG3$" -} diff --git a/roles/nagios_server/files/nagios/configs/nagios.cfg b/roles/nagios_server/files/nagios/configs/nagios.cfg index b641c13ae1..204f459112 100644 --- a/roles/nagios_server/files/nagios/configs/nagios.cfg +++ b/roles/nagios_server/files/nagios/configs/nagios.cfg @@ -54,14 +54,14 @@ log_file=/var/log/nagios/nagios.log #cfg_dir=/etc/nagios/switches #cfg_dir=/etc/nagios/routers +cfg_dir=/etc/nagios/hosts +cfg_dir=/etc/nagios/hostgroups cfg_dir=/etc/nagios/commands cfg_dir=/etc/nagios/contacts cfg_dir=/etc/nagios/contactgroups -cfg_dir=/etc/nagios/hosts -cfg_dir=/etc/nagios/hostgroups cfg_dir=/etc/nagios/services cfg_dir=/etc/nagios/servicegroups -cfg_dir=/etc/nagios/servicedeps +#cfg_dir=/etc/nagios/servicedeps cfg_dir=/etc/nagios/conf.d diff --git a/roles/nagios_server/files/nagios/configs/timeperiods.cfg b/roles/nagios_server/files/nagios/configs/timeperiods.cfg index 3ea8eb2461..f1b92112ab 100644 --- a/roles/nagios_server/files/nagios/configs/timeperiods.cfg +++ b/roles/nagios_server/files/nagios/configs/timeperiods.cfg @@ -68,19 +68,6 @@ define timeperiod{ # This defines a timeperiod where all times are valid for checks, # notifications, etc. The classic "24x7" support nightmare. :-) -define timeperiod{ - timeperiod_name 24x7 - alias 24 Hours A Day, 7 Days A Week - sunday 00:00-24:00 - monday 00:00-24:00 - tuesday 00:00-24:00 - wednesday 00:00-24:00 - thursday 00:00-24:00 - friday 00:00-24:00 - saturday 00:00-24:00 - } - - # 'workhours' timeperiod definition define timeperiod{ timeperiod_name workhours diff --git a/roles/nagios_server/files/nagios/hosts/other.cfg b/roles/nagios_server/files/nagios/hosts/other.cfg new file mode 100644 index 0000000000..d88cce7e27 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/other.cfg @@ -0,0 +1,7 @@ +define host { + host_name status-fedora2 + alias status-fedora2.rhcloud.com + use mincheck + address status-fedora2.rhcloud.com + parents phx2-gw +} diff --git a/roles/nagios_server/files/nagios/hosts/templates.cfg b/roles/nagios_server/files/nagios/hosts/templates.cfg index a68ffe1b12..68cb21b623 100644 --- a/roles/nagios_server/files/nagios/hosts/templates.cfg +++ b/roles/nagios_server/files/nagios/hosts/templates.cfg @@ -4,7 +4,6 @@ define host { check_command check-host-alive-nrpe max_check_attempts 8 checks_enabled 1 - failure_prediction_enabled 0 retain_status_information 1 retain_nonstatus_information 1 notification_interval 10 @@ -20,7 +19,6 @@ define host { check_command check-host-alive max_check_attempts 8 checks_enabled 1 - failure_prediction_enabled 0 retain_status_information 1 retain_nonstatus_information 1 notification_interval 10 @@ -35,7 +33,6 @@ define host { check_command check-host-alive max_check_attempts 8 checks_enabled 1 - failure_prediction_enabled 0 retain_status_information 1 retain_nonstatus_information 1 notification_interval 480 @@ -50,7 +47,6 @@ define host { check_command check-host-alive max_check_attempts 8 checks_enabled 1 - failure_prediction_enabled 0 retain_status_information 1 retain_nonstatus_information 1 notification_interval 10 @@ -65,7 +61,6 @@ define host { check_command check-host-alive max_check_attempts 8 checks_enabled 1 - failure_prediction_enabled 0 retain_status_information 1 retain_nonstatus_information 1 notification_interval 10 @@ -79,7 +74,6 @@ define host { name defaultbuilders max_check_attempts 8 checks_enabled 1 - failure_prediction_enabled 0 retain_status_information 1 retain_nonstatus_information 1 notification_interval 10 diff --git a/roles/nagios_server/files/nagios/services/websites.cfg b/roles/nagios_server/files/nagios/services/websites.cfg index 2960623925..0c83a8b924 100644 --- a/roles/nagios_server/files/nagios/services/websites.cfg +++ b/roles/nagios_server/files/nagios/services/websites.cfg @@ -307,7 +307,7 @@ define service { } define service { - host_name magazine + host_name magazine.fedorainfracloud.org service_description HTTP check use websitetemplate check_command check_website!magazine.fedorainfracloud.org!/