From 5149f16b739f1f229e7993e9cc1f09b9b5b1e339 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 20 Jul 2018 04:54:23 +0000 Subject: [PATCH] kill pkgdb from nagios server --- .../files/nagios/servicedeps/nrpe.cfg | 54 +++++++++---------- .../files/nagios/servicedeps/websitedeps.cfg | 12 ++--- .../files/nagios/services/nrpe.cfg | 2 +- .../files/nagios/services/pgsql.cfg | 12 ++--- roles/nagios_server/files/nrpe/nrpe.cfg | 2 +- roles/nagios_server/tasks/main.yml | 1 - .../nagios/servicegroups/pkgdb.cfg.j2 | 14 ----- .../templates/nagios/services/websites.cfg.j2 | 12 ++--- 8 files changed, 47 insertions(+), 62 deletions(-) delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 diff --git a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg index 1c5269db18..603245396c 100644 --- a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg +++ b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg @@ -15,33 +15,33 @@ # notification_failure_criteria w,c # execution_failure_criteria w,c #} - -define servicedependency { - host_name pkgdb01 - service_description nrpe - dependent_host_name pkgdb01 - dependent_service_description Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes - notification_failure_criteria w,c - execution_failure_criteria w,c -} - -define servicedependency { - host_name pkgdb02 - service_description nrpe - dependent_host_name pkgdb02 - dependent_service_description Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes - notification_failure_criteria w,c - execution_failure_criteria w,c -} - -define servicedependency { - host_name pkgdb01.stg - service_description nrpe - dependent_host_name pkgdb01.stg - dependent_service_description Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes - notification_failure_criteria w,c - execution_failure_criteria w,c -} +# +#define servicedependency { +# host_name pkgdb01 +# service_description nrpe +# dependent_host_name pkgdb01 +# dependent_service_description Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes +# notification_failure_criteria w,c +# execution_failure_criteria w,c +#} +# +#define servicedependency { +# host_name pkgdb02 +# service_description nrpe +# dependent_host_name pkgdb02 +# dependent_service_description Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes +# notification_failure_criteria w,c +# execution_failure_criteria w,c +#} +# +#define servicedependency { +# host_name pkgdb01.stg +# service_description nrpe +# dependent_host_name pkgdb01.stg +# dependent_service_description Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes +# notification_failure_criteria w,c +# execution_failure_criteria w,c +#} #define servicedependency { # host_name bapp02 diff --git a/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg b/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg index a526b17710..20f3ecdec2 100644 --- a/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg +++ b/roles/nagios_server/files/nagios/servicedeps/websitedeps.cfg @@ -3,7 +3,7 @@ define servicedependency { host_name proxy03.fedoraproject.org service_description https dependent_host_name proxy03.fedoraproject.org - dependent_service_description bodhi, pkgdb, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org + dependent_service_description bodhi, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org 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, pkgdb, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts, fedoraproject.org, fedoraproject.org - wiki + dependent_service_description bodhi, 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 } @@ -21,7 +21,7 @@ define servicedependency { host_name 152.19.134.142-ibiblio service_description https dependent_host_name 152.19.134.142-ibiblio - dependent_service_description bodhi, pkgdb, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org + dependent_service_description bodhi, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org notification_failure_criteria w,c execution_failure_criteria w,c } @@ -30,7 +30,7 @@ define servicedependency { host_name 152.19.134.198-ibiblio service_description https dependent_host_name 152.19.134.198-ibiblio - dependent_service_description bodhi, pkgdb, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org + dependent_service_description bodhi, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org 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, pkgdb, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org + dependent_service_description bodhi, elections, accounts, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, docs.fedoraproject.org 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, pkgdb, elections, docs.fedoraproject.org, mirrors.fedoraproject.org - mirrorlist, mirrors.fedoraproject.org - publiclist, start.fedoraproject.org, accounts, fedoraproject.org, fedoraproject.org - wiki + dependent_service_description bodhi, 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/roles/nagios_server/files/nagios/services/nrpe.cfg b/roles/nagios_server/files/nagios/services/nrpe.cfg index bdf6c845ce..2d292d1a60 100644 --- a/roles/nagios_server/files/nagios/services/nrpe.cfg +++ b/roles/nagios_server/files/nagios/services/nrpe.cfg @@ -1,5 +1,5 @@ define service { - host_name bastion02.phx2.fedoraproject.org, bastion01.phx2.fedoraproject.org, sundries01.phx2.fedoraproject.org, sundries01.stg.phx2.fedoraproject.org, sundries02.phx2.fedoraproject.org, wiki01.phx2.fedoraproject.org, wiki01.stg.phx2.fedoraproject.org, wiki02.phx2.fedoraproject.org, pkgdb01.phx2.fedoraproject.org, pkgdb02.phx2.fedoraproject.org, pkgdb01.stg.phx2.fedoraproject.org, magazine2.fedorainfracloud.org, copr-be.cloud.fedoraproject.org, copr-fe.cloud.fedoraproject.org + host_name bastion02.phx2.fedoraproject.org, bastion01.phx2.fedoraproject.org, sundries01.phx2.fedoraproject.org, sundries01.stg.phx2.fedoraproject.org, sundries02.phx2.fedoraproject.org, wiki01.phx2.fedoraproject.org, wiki01.stg.phx2.fedoraproject.org, wiki02.phx2.fedoraproject.org, magazine2.fedorainfracloud.org, copr-be.cloud.fedoraproject.org, copr-fe.cloud.fedoraproject.org service_description nrpe check_command test_nrpe max_check_attempts 2 diff --git a/roles/nagios_server/files/nagios/services/pgsql.cfg b/roles/nagios_server/files/nagios/services/pgsql.cfg index b6baeedf25..d51225845f 100644 --- a/roles/nagios_server/files/nagios/services/pgsql.cfg +++ b/roles/nagios_server/files/nagios/services/pgsql.cfg @@ -5,12 +5,12 @@ define service { use criticaltemplate } -define service { - host_name db01.phx2.fedoraproject.org - service_description Check PackageDB DB - check_command check_pgsql!pkgdb - use criticaltemplate -} +#define service { +# host_name db01.phx2.fedoraproject.org +# service_description Check PackageDB DB +# check_command check_pgsql!pkgdb +# use criticaltemplate +#} define service { host_name db-fas01.phx2.fedoraproject.org diff --git a/roles/nagios_server/files/nrpe/nrpe.cfg b/roles/nagios_server/files/nrpe/nrpe.cfg index b650b86b1e..cda38910c6 100644 --- a/roles/nagios_server/files/nrpe/nrpe.cfg +++ b/roles/nagios_server/files/nrpe/nrpe.cfg @@ -366,7 +366,7 @@ command[check_datanommer_wiki]=/usr/lib64/nagios/plugins/check_datanommer_timesi command[check_datanommer_compose]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py compose 259200 1814400 command[check_datanommer_meetbot]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py meetbot 604800 2628000 command[check_datanommer_fas]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py fas 1814400 2628000 -command[check_datanommer_pkgdb]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py pkgdb 1814400 2628000 +#command[check_datanommer_pkgdb]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py pkgdb 1814400 2628000 command[check_datanommer_fedoratagger]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py fedoratagger 2628000 7884000 command[check_datanommer_planet]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py planet 2628000 7884000 command[check_datanommer_copr]=/usr/lib64/nagios/plugins/check_datanommer_timesince.py copr 21600 86400 diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml index fd220a0c14..fc25dc0511 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios_server/tasks/main.yml @@ -431,7 +431,6 @@ - bodhi.cfg - freemedia.cfg - mgmt-https.cfg - - pkgdb.cfg - fas.cfg - fp-wiki.cfg - ipa.cfg diff --git a/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 deleted file mode 100644 index 99ba710554..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define servicegroup { - servicegroup_name pkgdb-internal - alias Package Database - members {% for host in groups['pkgdb'] %} {{host}}, http-pkgdb-internal {% if not loop.last %} , {% endif %} {% endfor %} - -} - -# define servicegroup { -# servicegroup_name pkgdb-external -# alias Package Database -# members {% for host in groups['pkgdb'] %} {{host}}, http-pkgdb-external {% if not loop.last %} , {% endif %} {% endfor %} - -# } - diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 index c0989b426e..7c1c47b063 100644 --- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 @@ -35,12 +35,12 @@ define service { use websitetemplate } -define service { - hostgroup_name proxies - service_description http-pkgdb-external - check_command check_website_ssl!admin.fedoraproject.org!/pkgdb/api/collections!allow_retire - use websitetemplate -} +#define service { +# hostgroup_name proxies +# service_description http-pkgdb-external +# check_command check_website_ssl!admin.fedoraproject.org!/pkgdb/api/collections!allow_retire +# use websitetemplate +#} define service { hostgroup_name proxies