Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

nagios_server: more adjustments, drop fas for now, fix gateway hosts harder

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2020-06-30 15:59:32 -07:00
parent 632d4a0273
commit 9d9d7f6c5c
3 changed files with 44 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

34
roles/nagios_server/files/nagios/servicedeps/nrpe.cfg
View file

@ -124,20 +124,20 @@ define servicedependency {
execution_failure_criteria w,c execution_failure_criteria w,c
} }
define servicedependency { #define servicedependency {
host_name packages03 # host_name packages03
service_description packages-internal # service_description packages-internal
dependent_host_name packages03 # dependent_host_name packages03
dependent_service_description packages-internal-bugstab # dependent_service_description packages-internal-bugstab
notification_failure_criteria w,c # notification_failure_criteria w,c
execution_failure_criteria w,c # execution_failure_criteria w,c
} #}
#
define servicedependency { #define servicedependency {
host_name packages04 # host_name packages04
service_description packages-internal # service_description packages-internal
dependent_host_name packages04 # dependent_host_name packages04
dependent_service_description packages-internal-bugstab # dependent_service_description packages-internal-bugstab
notification_failure_criteria w,c # notification_failure_criteria w,c
execution_failure_criteria w,c # execution_failure_criteria w,c
} #}

19
roles/nagios_server/templates/nagios/hosts/gateway-hosts.cfg.j2
View file

@ -2,21 +2,6 @@
# change to the nocs parent. Also hosts which aren't reachable should # change to the nocs parent. Also hosts which aren't reachable should
# be not defined on the external nagios. # be not defined on the external nagios.
# #
define host {
host_name iad2-gw
alias PHX2 Router
use mincheck
check_command check-host-alive4
{% if vars['nagios_location'] == 'iad2_internal' %}
address 10.3.163.254
parents iad2-gw
{% elif vars['nagios_location'] == 'external' %}
address 66.187.228.248
parents ibiblio-gw
{% endif %}
}
#'ibiblio' #'ibiblio'
define host { define host {
host_name ibiblio-gw host_name ibiblio-gw
@ -136,9 +121,7 @@ define host {
alias iad2 cage gateway alias iad2 cage gateway
use mincheck use mincheck
check_command check-host-alive4 check_command check-host-alive4
{% if vars['nagios_location'] == 'iad2_internal' %} {% if vars['nagios_location'] == 'external' %}
parents iad2-gw
{% elif vars['nagios_location'] == 'external' %}
address 66.187.228.248 address 66.187.228.248
parents ibiblio-gw parents ibiblio-gw
{% endif %} {% endif %}

52
roles/nagios_server/templates/nagios/services/websites.cfg.j2
View file

@ -57,7 +57,7 @@ define service {
service_description http-accounts service_description http-accounts
check_command check_website_ssl!admin.fedoraproject.org!/accounts/help/get_help/user_telephone!emergency check_command check_website_ssl!admin.fedoraproject.org!/accounts/help/get_help/user_telephone!emergency
use websitetemplate use websitetemplate
servicegroups fas # servicegroups fas
} }
define service { define service {
@ -187,13 +187,13 @@ define service {
use internalwebsitetemplate use internalwebsitetemplate
} }
define service { #define service {
hostgroup_name fas # hostgroup_name fas
service_description http-accounts # service_description http-accounts
check_command check_website!localhost!/accounts/help/get_help/user_telephone!emergency # check_command check_website!localhost!/accounts/help/get_help/user_telephone!emergency
use internalwebsitetemplate # use internalwebsitetemplate
servicegroups fas # servicegroups fas
} #}
define service { define service {
hostgroup_name github2fedmsg hostgroup_name github2fedmsg
@ -243,24 +243,24 @@ define service {
use websitetemplate use websitetemplate
} }
define service { #define service {
hostgroup_name packages # hostgroup_name packages
service_description http-packages-internal # service_description http-packages-internal
check_command check_website!localhost!/packages/!Packages # check_command check_website!localhost!/packages/!Packages
max_check_attempts 8 # max_check_attempts 8
use internalwebsitetemplate # use internalwebsitetemplate
event_handler restart_httpd # event_handler restart_httpd
} #}
#
define service { #define service {
hostgroup_name packages # hostgroup_name packages
service_description http-packages-internal-bugstab # service_description http-packages-internal-bugstab
check_command check_website!localhost!/packages/fcomm_connector/bugzilla/query/query_bugs/%7B%22filters%22:%7B%22package%22:%22nethack%22,%22version%22:%22%22%7D,%22rows_per_page%22:10,%22start_row%22:0%7D!total_rows # check_command check_website!localhost!/packages/fcomm_connector/bugzilla/query/query_bugs/%7B%22filters%22:%7B%22package%22:%22nethack%22,%22version%22:%22%22%7D,%22rows_per_page%22:10,%22start_row%22:0%7D!total_rows
max_check_attempts 8 # max_check_attempts 8
use internalwebsitetemplate # use internalwebsitetemplate
# When this thing dies, you usually just need to nuke /var/cache/fedoracommunity/bugzillacookies # # When this thing dies, you usually just need to nuke /var/cache/fedoracommunity/bugzillacookies
#event_handler nuke_bugzillacookies_handler # #event_handler nuke_bugzillacookies_handler
} #}
define service { define service {