From 435095958d42adb6dc812efc4641ae2894143ead Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Thu, 21 May 2020 15:47:19 -0400 Subject: [PATCH] move more service groups to static files and use servicegroup definitions in services --- .../files/nagios/servicegroups/bodhi.cfg.j2 | 4 ++++ .../files/nagios/servicegroups/fas.cfg.j2 | 5 +++++ .../files/nagios/servicegroups/fp-wiki.cfg | 11 +++++++++++ .../files/nagios/servicegroups/mirrorlist.cfg.j2 | 6 ++++++ .../nagios_server/files/nagios/services/pgsql.cfg | 8 +------- roles/nagios_server/tasks/main.yml | 4 ---- .../templates/nagios/servicegroups/bodhi.cfg.j2 | 6 ------ .../templates/nagios/servicegroups/fas.cfg.j2 | 6 ------ .../templates/nagios/servicegroups/fp-wiki.cfg.j2 | 14 -------------- .../nagios/servicegroups/mirrorlist.cfg.j2 | 7 ------- .../templates/nagios/services/websites.cfg.j2 | 5 +++++ 11 files changed, 32 insertions(+), 44 deletions(-) create mode 100644 roles/nagios_server/files/nagios/servicegroups/bodhi.cfg.j2 create mode 100644 roles/nagios_server/files/nagios/servicegroups/fas.cfg.j2 create mode 100644 roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg create mode 100644 roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 delete mode 100644 roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 diff --git a/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg.j2 b/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg.j2 new file mode 100644 index 0000000000..f6e999751c --- /dev/null +++ b/roles/nagios_server/files/nagios/servicegroups/bodhi.cfg.j2 @@ -0,0 +1,4 @@ +define servicegroup { + servicegroup_name bodhi + alias Bodhi +} diff --git a/roles/nagios_server/files/nagios/servicegroups/fas.cfg.j2 b/roles/nagios_server/files/nagios/servicegroups/fas.cfg.j2 new file mode 100644 index 0000000000..aa6b9dbce2 --- /dev/null +++ b/roles/nagios_server/files/nagios/servicegroups/fas.cfg.j2 @@ -0,0 +1,5 @@ +define servicegroup { + servicegroup_name fas + alias Fedora Account System + +} diff --git a/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg b/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg new file mode 100644 index 0000000000..4bb48bcd6b --- /dev/null +++ b/roles/nagios_server/files/nagios/servicegroups/fp-wiki.cfg @@ -0,0 +1,11 @@ +define servicegroup { + servicegroup_name fp-wiki + alias Fedora Project Wiki +} + +define servicegroup { + servicegroup_name fp-wiki-non-cached + alias Fedora Project Wiki + +} + diff --git a/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg.j2 b/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg.j2 new file mode 100644 index 0000000000..3e6a67a027 --- /dev/null +++ b/roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg.j2 @@ -0,0 +1,6 @@ +define servicegroup { + servicegroup_name mirrorlist + alias Mirrorlist + +} + diff --git a/roles/nagios_server/files/nagios/services/pgsql.cfg b/roles/nagios_server/files/nagios/services/pgsql.cfg index d51225845f..c2b2b7cafb 100644 --- a/roles/nagios_server/files/nagios/services/pgsql.cfg +++ b/roles/nagios_server/files/nagios/services/pgsql.cfg @@ -5,16 +5,10 @@ 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 db-fas01.phx2.fedoraproject.org service_description Check FAS DB check_command check_pgsql!fas2 use criticaltemplate + servicegroups fas } diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml index 7b4828a858..661bae3939 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios_server/tasks/main.yml @@ -434,12 +434,8 @@ - name: Build out nagios servicegroup templates template: src=nagios/servicegroups/{{item}}.j2 dest=/etc/nagios/servicegroups/{{item}} mode=0644 owner=root group=root with_items: - - bodhi.cfg - mgmt-https.cfg - - fas.cfg - - fp-wiki.cfg - mgmt-http.cfg - - mirrorlist.cfg when: nagios_location == "internal" tags: - nagios_server diff --git a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 deleted file mode 100644 index d8bf1e395f..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 +++ /dev/null @@ -1,6 +0,0 @@ -define servicegroup { - servicegroup_name bodhi - alias Bodhi - members {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-bodhi2{% if not loop.last %}, {% endif %}{% endif %} {% endfor %} - -} diff --git a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 deleted file mode 100644 index 363d117d25..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 +++ /dev/null @@ -1,6 +0,0 @@ -define servicegroup { - servicegroup_name fas - alias Fedora Account System - members {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-accounts, {% endif %}{% endfor %}{% for host in groups['fas'] %}{{host}}, http-accounts, {% endfor %} db-fas01.phx2.fedoraproject.org,Check FAS DB - -} diff --git a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 deleted file mode 100644 index fa211d0acc..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 +++ /dev/null @@ -1,14 +0,0 @@ -define servicegroup { - servicegroup_name fp-wiki - alias Fedora Project Wiki - members {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-fedoraproject.org-wiki{% if not loop.last %}, {% endif %}{% endif %}{% endfor %} - -} - -define servicegroup { - servicegroup_name fp-wiki-non-cached - alias Fedora Project Wiki - members {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-fedoraproject.org-wiki-non-cached{% if not loop.last %}, {% endif %}{% endif %}{% endfor %} - -} - diff --git a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 deleted file mode 100644 index e1dc818110..0000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 +++ /dev/null @@ -1,7 +0,0 @@ -define servicegroup { - servicegroup_name mirrorlist - alias Mirrorlist - members {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-mirrors.fedoraproject.org-mirrorlist{% if not loop.last %} , {% endif %}{% 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 8861194dc0..8ca94a7641 100644 --- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 +++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2 @@ -25,6 +25,7 @@ define service { check_command check_website_ssl!fedoraproject.org!/wiki/Fedora_Project_Wiki!Looking for help max_check_attempts 10 use websitetemplate + servicegroups fp-wiki } define service { @@ -33,6 +34,7 @@ define service { check_command check_website_ssl!fedoraproject.org!/wiki/Special:Version!MediaWiki is free software max_check_attempts 10 use websitetemplate + servicegroups fp-wiki-non-cached } define service { @@ -55,6 +57,7 @@ define service { service_description http-accounts check_command check_website_ssl!admin.fedoraproject.org!/accounts/help/get_help/user_telephone!emergency use websitetemplate + servicegroups fas } define service { @@ -63,6 +66,7 @@ define service { check_command check_website_ssl!bodhi.fedoraproject.org!/!Fedora max_check_attempts 8 use websitetemplate + servicegroups bodhi } define service { @@ -202,6 +206,7 @@ define service { service_description http-accounts check_command check_website!localhost!/accounts/help/get_help/user_telephone!emergency use internalwebsitetemplate + servicegroups fas } define service {