From c14b70251300cb7e4186f8b87791ffa833c80d77 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Wed, 22 May 2019 17:12:23 +0200
Subject: [PATCH] Continue fixing nagios group names

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
---
 roles/nagios_server/files/nagios/services/ping.cfg   |  4 ++--
 .../templates/nagios/services/websites.cfg.j2        | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/nagios_server/files/nagios/services/ping.cfg b/roles/nagios_server/files/nagios/services/ping.cfg
index dabfe8c439..525ff6310c 100644
--- a/roles/nagios_server/files/nagios/services/ping.cfg
+++ b/roles/nagios_server/files/nagios/services/ping.cfg
@@ -1,12 +1,12 @@
 define service {
-  hostgroup_name		*, !buildvm-armv7, !buildvm-s390x, !buildvm-s390x-stg
+  hostgroup_name		*, !buildvm_armv7, !buildvm_s390x, !buildvm_s390x_stg
   service_description		ICMP-Ping4
   check_command			check_ping4!350.0,20%!500.0,60%
   use				criticaltemplate
 }
 
 define service {
-  hostgroup_name		buildvm-armv7, buildvm-s390x, buildvm-s390x-stg
+  hostgroup_name		buildvm_armv7, buildvm_s390x, buildvm-s390x_stg
   service_description		ICMP-Ping4-vm-builders
   check_command			check_ping4!1500.0,20%!2500.0,80%
   use				criticaltemplate
diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
index 566a515195..3feaedc26b 100644
--- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2
+++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
@@ -172,7 +172,7 @@ define service {
 ## Other Frontend Websites 
 
 define service {
-  hostgroup_name        autocloud-web
+  hostgroup_name        autocloud_web
   service_description   http-autocloud-internal
   check_command         check_website!localhost!/autocloud/jobs/!Output
   max_check_attempts    8
@@ -180,7 +180,7 @@ define service {
 }
 
 define service {
-  hostgroup_name        badges-web
+  hostgroup_name        badges_web
   service_description   http-badges.fedoraproject.org-tahrir
   check_command         check_website!localhost!/!Tahrir
   use                   websitetemplate
@@ -203,7 +203,7 @@ define service {
 }
 
 define service {
-  hostgroup_name        moby-registry
+  hostgroup_name        moby_registry
   service_description   http-moby-registry
   check_command         check_website!localhost:5000!/v2/!{}
   max_check_attempts    8
@@ -236,7 +236,7 @@ define service {
 }
 
 define service {
-  hostgroup_name        koschei-web
+  hostgroup_name        koschei_web
   service_description   http-koschei-internal
   check_command         check_website!localhost!/koschei/!Package summary
   max_check_attempts    8
@@ -251,7 +251,7 @@ define service {
 }
 
 define service {
-  hostgroup_name        mm-frontend
+  hostgroup_name        mm_frontend
   service_description   http-mm-publiclist-internal
   check_command         check_website_publiclist!localhost!/mirrormanager/api/mirroradmins/?name=dl.fedoraproject.org
   use                   internalwebsitetemplate
@@ -259,7 +259,7 @@ define service {
 }
 
 define service {
-  hostgroup_name        notifs-web
+  hostgroup_name        notifs_web
   service_description   http-apps.fedoraproject.org-notifications-fmn.web
   check_command         check_website!localhost!/notifications!Notifications
   use                   websitetemplate