From a6236e99e295ec17c7d8d0700dd6b39ff878e256 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 9 Jan 2017 16:39:34 +0000 Subject: [PATCH] we need to be careful about spacing --- .../templates/nagios/servicegroups/fas.cfg.j2 | 1 + .../templates/nagios/servicegroups/fp-wiki.cfg.j2 | 1 + .../templates/nagios/servicegroups/kvmHosts.cfg.j2 | 8 +------- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 index 2a1ce48149..8b1a5dd26d 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/fas.cfg.j2 @@ -2,4 +2,5 @@ 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, + } 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 1b9c5798a4..5dbec1292e 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 @@ -2,5 +2,6 @@ define servicegroup { servicegroup_name fp-wiki alias Fedora Project Wiki members {% for host in groups['proxies'] %}{{host}}, fedoraproject.org - wiki - non-cached, {% endfor %}{% for host in groups['proxies'] %}{{host}}, fedoraproject.org - wiki, {% endfor %} + } diff --git a/roles/nagios_server/templates/nagios/servicegroups/kvmHosts.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/kvmHosts.cfg.j2 index cbd760737d..21b4dc03a2 100644 --- a/roles/nagios_server/templates/nagios/servicegroups/kvmHosts.cfg.j2 +++ b/roles/nagios_server/templates/nagios/servicegroups/kvmHosts.cfg.j2 @@ -5,13 +5,7 @@ define hostgroup { hostgroup_name phx-virt alias PHX Virtual ServiceGroup - members {% for host in groups['virtservers'] %}{{host}}{{host}}, Disk space /,{{host}},Total Processes,{{host}}, Check Raid, {{host}}, Swap, {{host}}, SSH, {% endfor %} + members {% for host in groups['virtservers'] %} {{host}}, Disk space /, {{host}}, Total Processes, {{host}}, Check Raid, {{host}}, Swap, {{host}}, SSH, {% endfor %} } -define hostgroup { - hostgroup_name colo-virt - alias Colocation Virtual ServiceGroup - members {% for host in groups['colo-virt'] %}{{host}}{{host}}, Disk space /,{{host}},Total Processes,{{host}}, Check Raid, {{host}}, Swap, {{host}}, SSH, {% endfor %} - -}