From 46b8f4d1814a73bd50b8c3dc6c5c2b428830fae9 Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Mon, 9 Jan 2017 00:35:45 +0000 Subject: [PATCH] and boy did I miss a couple --- roles/nagios_server/files/nagios/services/websites.cfg | 8 ++++---- .../templates/nagios/hostgroups/autosign.cfg.j2 | 10 +++++----- .../templates/nagios/hostgroups/buildarm.cfg.j2 | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/roles/nagios_server/files/nagios/services/websites.cfg b/roles/nagios_server/files/nagios/services/websites.cfg index 0c83a8b924..26f7091fc7 100644 --- a/roles/nagios_server/files/nagios/services/websites.cfg +++ b/roles/nagios_server/files/nagios/services/websites.cfg @@ -281,7 +281,7 @@ define service { } define service { - host_name value + hostgroup_name value service_description Check møte process check_command check_website!localhost!/!møte use websitetemplate @@ -293,9 +293,9 @@ define service { ## Individual hosts define service { - host_name ppc-hub - service_description ppc-koji-frontend - check_command check_website_ppc!ppc.koji.fedoraproject.org!/koji/!Recent + hostgroup_name koji + service_description koji-frontend + check_command check_website_ppc!localhost!/koji/!Recent use ppc-secondarytemplate } diff --git a/roles/nagios_server/templates/nagios/hostgroups/autosign.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/autosign.cfg.j2 index 19bbf3c1a1..36f78e8b03 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/autosign.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/autosign.cfg.j2 @@ -1,9 +1,9 @@ -define hostgroup { - hostgroup_name autosign - alias AUTOSIGN servers - members {% for host in groups['autosign'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} +# define hostgroup { +# hostgroup_name autosign +# alias AUTOSIGN servers +# members {% for host in groups['autosign'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} -} +# } define hostgroup { hostgroup_name autosign-stg diff --git a/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 index d76f45d635..467627f1db 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/buildarm.cfg.j2 @@ -27,12 +27,12 @@ define hostgroup { } -define hostgroup { - hostgroup_name arm03 - alias ARM 03 builders - members {% for host in groups['arm03'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} +# define hostgroup { +# hostgroup_name arm03 +# alias ARM 03 builders +# members {% for host in groups['arm03'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %} -} +# } define hostgroup { hostgroup_name arm04