move more service groups to static files and use servicegroup definitions in services

roles/nagios_server/files/nagios/servicegroups/bodhi.cfg.j2

@@ -0,0 +1,4 @@
+define servicegroup {
+    servicegroup_name   bodhi
+    alias               Bodhi
+}

roles/nagios_server/files/nagios/servicegroups/fas.cfg.j2

@@ -0,0 +1,5 @@
+define servicegroup {
+    servicegroup_name   fas
+    alias               Fedora Account System
+
+}

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
+
+}
+

roles/nagios_server/files/nagios/servicegroups/mirrorlist.cfg.j2

@@ -0,0 +1,6 @@
+define servicegroup {
+    servicegroup_name   mirrorlist
+    alias               Mirrorlist
+
+}
+

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
 }

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

roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2

@@ -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 %}
-
-}

roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2

@@ -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
-
-}

roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2

@@ -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 %}
-
-}
-

roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2

@@ -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 %}
-
-}
-

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 {