diff options
11 files changed, 9 insertions, 16 deletions
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml index b078afeef..2e4bc2abd 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios_server/tasks/main.yml @@ -288,7 +288,6 @@ template: src=nagios/servicegroups/{{item}}.j2 dest=/etc/nagios/servicegroups/{{item}} mode=0644 owner=root group=root with_items: - bodhi.cfg - - fedorahosted.org.cfg - freemedia.cfg - mgmt-https.cfg - pkgdb.cfg diff --git a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 index d1376fa84..680fb3b99 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name bodhi alias Bodhi - members {% for host in groups['bodhi2'] %}{{host}}, bodhi, {% endfor %}{% for host in groups['proxies'] %}{{host}}, bodhi {{ "," if not loop.last }} {% endfor %} + members {% for host in groups['bodhi2'] %}{{host}}, bodhi, {% endfor %}{% for host in groups['proxies'] %}{{host}}, bodhi {% if not loop.last %} , {% endif %} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 index 8b1a5dd26..f2fd79068 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name fas alias Fedora Account System - members {% for host in groups['proxies'] %}{{host}}, accounts, {% endfor %}{% for host in groups['fas'] %}{{host}}, accounts, {% endfor %} db-fas01.phx2.fedoraproject.org,Check FAS DB, + members {% for host in groups['proxies'] %}{{host}}, accounts, {% endfor %}{% for host in groups['fas'] %}{{host}}, accounts, {% endfor %} db-fas01.phx2.fedoraproject.org,Check FAS DB {% if not loop.last %} , {% endif %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg.j2 deleted file mode 100644 index 7b1ac6333..000000000 --- a/roles/nagios_server/templates/nagios/servicegroups/fedorahosted.org.cfg.j2 +++ /dev/null @@ -1,6 +0,0 @@ -#define servicegroup { -# servicegroup_name fedorahosted -# alias Fedora Hosted -# members {% for host in groups['hosted'] %}{{host}}, BZR, {{host}}, GIT, {{host}}, bzr.fedorahosted.org, {{host}}, git.fedoraproject.org, {{host}}, hg.fedorahosted.org, {{host}}, svn.fedorahosted.org, {% endfor %} -# -#} diff --git a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 index 48ea942ae..ae5baeb32 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name fp-wiki alias Fedora Project Wiki - members {% for host in groups['proxies'] %}{{host}}, http-fedoraproject.org-wiki , {% endfor %}{% for host in groups['proxies'] %}{{host}}, http-fedoraproject.org-wiki-non-cached {{ "," if not loop.last }} {% endfor %} + members {% for host in groups['proxies'] %}{{host}}, http-fedoraproject.org-wiki , {% endfor %}{% for host in groups['proxies'] %}{{host}}, http-fedoraproject.org-wiki-non-cached {% if not loop.last %} , {% endif %} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 index b80bd2d65..66edb0f67 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name freemedia alias FreeMedia - members {% for host in groups['sundries'] %}{{host}}, freemedia-internal {{ "," if not loop.last }} {% endfor %} + members {% for host in groups['sundries'] %}{{host}}, freemedia-internal {% if not loop.last %} , {% endif %} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 index c7616dcff..e2098f25d 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name ipa alias IPA Servers - members {% for host in groups['ipa'] %}{{host}}, IPA Replication Status {{ "," if not loop.last }} {% endfor %} + members {% for host in groups['ipa'] %}{{host}}, IPA Replication Status {% if not loop.last %} , {% endif %} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 index 52c026adc..5afb2ea36 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/mgmt-http.cfg.j2 @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name mgmt-http alias mgmt interfaces on http - members {% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-http {{ "," if not loop.last }}{% endfor %} + members {% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-http {% if not loop.last %} , {% endif %}{% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 index 90546a112..b4120058a 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/mgmt-https.cfg.j2 @@ -1,6 +1,6 @@ define servicegroup { servicegroup_name mgmt-https alias mgmt interfaces on https - members {% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-https {{ "," if not loop.last }}{% endfor %} + members {% for host in vars['phx2_management_hosts'] %}{{ host }},{{ host }}-https {% if not loop.last %} , {% endif %}{% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 index aa643a062..bd78bd7e4 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/mirrorlist.cfg.j2 @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name mirrorlist alias Mirrorlist - members {% for host in groups['proxies'] %}{{host}}, http-mirrors.fedoraproject.org-mirrorlist {{ "," if not loop.last }} {% endfor %} + members {% for host in groups['proxies'] %}{{host}}, http-mirrors.fedoraproject.org-mirrorlist {% if not loop.last %} , {% endif %} {% endfor %} } diff --git a/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 index bb0f9f379..e306cef30 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/pkgdb.cfg.j2 @@ -1,7 +1,7 @@ define servicegroup { servicegroup_name pkgdb alias Package Database - members {% for host in groups['pkgdb'] %}{{host}}, pkgdb-external,{{host}}, pkgdb-internal {{ "," if not loop.last }} {% endfor %} + members {% for host in groups['pkgdb'] %}{{host}}, pkgdb-external,{{host}}, pkgdb-internal {% if not loop.last %} , {% endif %} {% endfor %} } |