diff --git a/modules/nagios/files/nagios-external/servicedeps/websitedebs.cfg b/modules/nagios/files/nagios-external/servicedeps/websitedebs.cfg index a0568a2..4a3a411 100644 --- a/modules/nagios/files/nagios-external/servicedeps/websitedebs.cfg +++ b/modules/nagios/files/nagios-external/servicedeps/websitedebs.cfg @@ -3,7 +3,7 @@ define servicedependency { host_name 66.35.62.166-tummy service_description https dependent_host_name 66.35.62.166-tummy - dependent_service_description bodhi, community, pkgdb, elections, smolt, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts + dependent_service_description bodhi, community, pkgdb, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts notification_failure_criteria w,c execution_failure_criteria w,c } @@ -12,7 +12,7 @@ define servicedependency { host_name 209.132.181.16-phx2 service_description https dependent_host_name 209.132.181.16-phx2 - dependent_service_description bodhi, community, pkgdb, elections, smolt, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts + dependent_service_description bodhi, community, pkgdb, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts notification_failure_criteria w,c execution_failure_criteria w,c } @@ -21,7 +21,7 @@ define servicedependency { host_name 152.19.134.146-ibiblio service_description https dependent_host_name 152.19.134.146-ibiblio - dependent_service_description bodhi, community, pkgdb, elections, smolt, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts + dependent_service_description bodhi, community, pkgdb, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts notification_failure_criteria w,c execution_failure_criteria w,c } @@ -30,7 +30,7 @@ define servicedependency { host_name 80.239.156.215-telia service_description https dependent_host_name 80.239.156.215-telia - dependent_service_description bodhi, community, pkgdb, elections, smolt, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts + dependent_service_description bodhi, community, pkgdb, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts notification_failure_criteria w,c execution_failure_criteria w,c } @@ -39,7 +39,7 @@ define servicedependency { host_name 85.236.55.6-internetx service_description https dependent_host_name 85.236.55.6-internetx - dependent_service_description bodhi, community, pkgdb, elections, smolt, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts + dependent_service_description bodhi, community, pkgdb, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts notification_failure_criteria w,c execution_failure_criteria w,c } @@ -48,7 +48,7 @@ define servicedependency { host_name 67.203.2.67-coloamerica service_description https dependent_host_name 67.203.2.67-coloamerica - dependent_service_description bodhi, community, pkgdb, elections, smolt, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts, fedoraproject.org, fedoraproject.org - wiki + dependent_service_description bodhi, community, pkgdb, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts, fedoraproject.org, fedoraproject.org - wiki notification_failure_criteria w,c execution_failure_criteria w,c } diff --git a/modules/nagios/files/nagios-external/services/websites.cfg b/modules/nagios/files/nagios-external/services/websites.cfg index c6a4c49..fcc5fd9 100644 --- a/modules/nagios/files/nagios-external/services/websites.cfg +++ b/modules/nagios/files/nagios-external/services/websites.cfg @@ -38,16 +38,6 @@ define service { } define service { - host_name 66.35.62.166-tummy, 209.132.181.16-phx2, 152.19.134.146-ibiblio, 80.239.156.215-telia, 85.236.55.6-internetx, 67.203.2.67-coloamerica - service_description smolt - check_command check_website!smolts.org!/reports/search_devices!Device - #check_command check_website!smolts.org!/client/show?UUID=pub_c2a3fe3f-5d60-4877-8434-8c48a09c4905!Fedora release - max_check_attempts 8 - retry_check_interval 3 - use websitetemplate -} - -define service { host_name koji-phx2 service_description koji check_command check_website!koji.fedoraproject.org!/koji/buildtargets!rawhide diff --git a/modules/nagios/files/nagios/services/websites.cfg b/modules/nagios/files/nagios/services/websites.cfg index 69b78a8..3ea92b5 100644 --- a/modules/nagios/files/nagios/services/websites.cfg +++ b/modules/nagios/files/nagios/services/websites.cfg @@ -36,38 +36,6 @@ define service { } define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-wildcard, proxy04-wildcard, proxy05-wildcard, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard - service_description smolt-fpo-external - check_command check_website!smolt.fedoraproject.org!/!Smolt - max_check_attempts 8 - retry_check_interval 3 - use websitetemplate -} - -define service { - host_name proxy01-wildcard, proxy02-wildcard, proxy03-wildcard, proxy04-wildcard, proxy05-wildcard, proxy06-wildcard, proxy07-wildcard, proxy08-wildcard - service_description smolts.org-external - check_command check_website!smolts.org!/!Enter your profile UUID - use websitetemplate -} - -define service { - host_name value03, value04 - service_description smolt-internal - check_command check_website!localhost!/smolt!Smolt - max_check_attempts 8 - retry_check_interval 3 - use internalwebsitetemplate -} - -define service { - host_name app01,app02,app03,app04 - service_description smolt-wiki-internal - check_command check_website!localhost!/smolt-wiki/Main_Page!Main Page - use websitetemplate -} - -define service { host_name app01,app02,app03,app04,app05,app06, app08 service_description pkgdb-internal check_command check_website!localhost!/pkgdb/collections/!EPEL