From e1f0910ec716657213ff012d6e70fa600983afc3 Mon Sep 17 00:00:00 2001
From: root <root@s-mon>
Date: Wed, 27 Jan 2021 11:55:29 +0100
Subject: [PATCH] Ajout des machines s-mess et s-lb

---
 roles/icinga/files/cfg/hostgroups_icinga.cfg |  9 +--
 roles/icinga/files/{ => cfg}/s-lb.cfg        |  0
 roles/icinga/files/{ => cfg}/s-mess.cfg      |  0
 roles/icinga/files/hostgroups_icinga.cfg     | 75 --------------------
 4 files changed, 5 insertions(+), 79 deletions(-)
 rename roles/icinga/files/{ => cfg}/s-lb.cfg (100%)
 rename roles/icinga/files/{ => cfg}/s-mess.cfg (100%)
 delete mode 100644 roles/icinga/files/hostgroups_icinga.cfg

diff --git a/roles/icinga/files/cfg/hostgroups_icinga.cfg b/roles/icinga/files/cfg/hostgroups_icinga.cfg
index 2603b32..c202b20 100644
--- a/roles/icinga/files/cfg/hostgroups_icinga.cfg
+++ b/roles/icinga/files/cfg/hostgroups_icinga.cfg
@@ -15,13 +15,13 @@ define hostgroup {
 define hostgroup { 
 	hostgroup_name debian-servers 
 	alias		Serveurs distant
-	members        s-infra, s-proxy, r-int, r-ext, s-adm, s-itil
+	members        s-infra, s-proxy, r-int, r-ext, s-adm, s-itil, s-mess
 } 
 
 define hostgroup { 
 	hostgroup_name ssh-servers 
 	alias 		acces SSH 
-	members		s-adm, s-infra, s-proxy, r-int, r-ext, localhost, gwsio2, s-itil	 
+	members		s-adm, s-infra, s-proxy, r-int, r-ext, localhost, gwsio2, s-itil, s-mess, s-lb
 }
 
 define hostgroup { 
@@ -39,7 +39,7 @@ define hostgroup { 
 define hostgroup {
         hostgroup_name  http-servers
 		alias           serveurs-web
-		members         localhost, s-itil 
+		members         localhost, s-itil, s-adm
         }
 
 #define hostgroup {
@@ -69,6 +69,7 @@ define hostgroup{
 define hostgroup{
 	hostgroup_name	uptimegrp
 	alias		uptimegrp
-	members		s-infra, s-proxy, r-int, r-ext, s-adm, s-itil
+	members		s-infra, s-proxy, r-int, r-ext, s-adm, s-itil, s-mess, s-lb
 }
 
+
diff --git a/roles/icinga/files/s-lb.cfg b/roles/icinga/files/cfg/s-lb.cfg
similarity index 100%
rename from roles/icinga/files/s-lb.cfg
rename to roles/icinga/files/cfg/s-lb.cfg
diff --git a/roles/icinga/files/s-mess.cfg b/roles/icinga/files/cfg/s-mess.cfg
similarity index 100%
rename from roles/icinga/files/s-mess.cfg
rename to roles/icinga/files/cfg/s-mess.cfg
diff --git a/roles/icinga/files/hostgroups_icinga.cfg b/roles/icinga/files/hostgroups_icinga.cfg
deleted file mode 100644
index c202b20..0000000
--- a/roles/icinga/files/hostgroups_icinga.cfg
+++ /dev/null
@@ -1,75 +0,0 @@
-# Some generic hostgroup definitions
-
-define hostgroup {
-        hostgroup_name  all
-		alias           All Servers
-		members         *
-        }
-
-define hostgroup {
-        hostgroup_name 	       localhost
-		alias          Debian GNU/Linux Servers
-		members        localhost  
-        }
-
-define hostgroup { 
-	hostgroup_name debian-servers 
-	alias		Serveurs distant
-	members        s-infra, s-proxy, r-int, r-ext, s-adm, s-itil, s-mess
-} 
-
-define hostgroup { 
-	hostgroup_name ssh-servers 
-	alias 		acces SSH 
-	members		s-adm, s-infra, s-proxy, r-int, r-ext, localhost, gwsio2, s-itil, s-mess, s-lb
-}
-
-define hostgroup { 
-	hostgroup_name dns-servers
-	alias serveurs-dns 
-	members s-infra, srv-2012 
-} 
-
-define hostgroup { 
-	hostgroup_name dhcp-servers
-	alias serveurs-dhcp 
-	members r-int, srv-2012 
-} 
-
-define hostgroup {
-        hostgroup_name  http-servers
-		alias           serveurs-web
-		members         localhost, s-itil, s-adm
-        }
-
-#define hostgroup {
-#        hostgroup_name  email-servers
-#		alias           serveurs-email
-#		members         s-mess
-#       }
-
-define hostgroup { 
-	hostgroup_name proxy-servers
-	alias 		serveurs-proxy 
-	members 	s-proxy 
-}
-
-define hostgroup{
-	hostgroup_name	windows-servers
-	alias		windows-servers
-	members		srv-2012
-}
-
-#define hostgroup{
-#	hostgroup_name	switch
-#	alias		switch
-#	members		netgear
-#}
-
-define hostgroup{
-	hostgroup_name	uptimegrp
-	alias		uptimegrp
-	members		s-infra, s-proxy, r-int, r-ext, s-adm, s-itil, s-mess, s-lb
-}
-
-