Add physical_x86_intel hostgroup

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 90da691..714ceb7 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -166,23 +166,23 @@ servers:
   schumann:
     address: 212.227.126.54
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hassrvfs, pe1950
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hassrvfs, pe1950, physical_x86_intel
   wieck:
     address: 195.20.242.89
     parents: gw-1und1-sec
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula, pe1950
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, stretch, security_mirror, hasvarlogfs, no-bacula, pe1950, physical_x86_intel
   # }}}
   # {{{ gw-accumu
   pettersson:
     address: 130.239.18.123
     parents: gw-accumu
-    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, stretch, autofs, sw-raid
+    hostgroups: computers, hasbootfs, aacraid, nfs-client, service, apache2-hosts, stretch, autofs, sw-raid, physical_x86_intel
     contacts: zobel, tfheen, lfilipoz, zumbi, jcristau, pabs, aurel32, dsa-nsa
     contact_groups: ""
   mirror-accumu:
     address: 130.242.6.199
     parents: gw-accumu2
-    hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts
+    hostgroups: computers, service, stretch, apache2-hosts, hassrvfs, rsyncd-hosts, physical_x86_intel
   # }}}
   # {{{ gw-aql
   eller:
@@ -264,33 +264,33 @@ servers:
   fasolo:
     address: 138.16.160.17
     parents: gw-brown
-    hostgroups: computers, service, apache2-hosts, apache-https, dl380, rsyncd-hosts, stretch, hassrvfs, postgres96-hosts, manyprocesses
+    hostgroups: computers, service, apache2-hosts, apache-https, dl380, rsyncd-hosts, stretch, hassrvfs, postgres96-hosts, manyprocesses, physical_x86_intel
   # }}}
   # {{{ gw-bytemark
   bm-bl1:
     address: 5.153.231.241
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   bm-bl2:
     address: 5.153.231.242
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   bm-bl3:
     address: 5.153.231.243
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   bm-bl4:
     address: 5.153.231.244
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   bm-bl5:
     address: 5.153.231.245
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   bm-bl6:
     address: 5.153.231.246
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   bm-bl7:
     address: 5.153.231.247
     parents: gw-bytemark
@@ -306,7 +306,7 @@ servers:
   bm-bl10:
     address: 5.153.231.250
     parents: gw-bytemark
-    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bm-bl, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   bm-bl11:
     address: 5.153.231.251
     parents: gw-bytemark
@@ -478,7 +478,7 @@ servers:
   casulana:
     address: 5.153.231.41
     parents: gw-bytemark
-    hostgroups: computers, service, stretch, hassrvfs, dl380, manyprocesses, apache2-hosts
+    hostgroups: computers, service, stretch, hassrvfs, dl380, manyprocesses, apache2-hosts, physical_x86_intel
     contacts: zobel, tfheen, lfilipoz, zumbi, jcristau, pabs, aurel32, dsa-nsa
     contact_groups: ""
   # }}}
@@ -486,14 +486,14 @@ servers:
   santoro:
     address: 200.17.202.197
     parents: gw-c3sl
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, hassrvfs, stretch, high-RTT, security_mirror, no-bacula, apache-https
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, hassrvfs, stretch, high-RTT, security_mirror, no-bacula, apache-https, physical_x86_intel
     contacts: faw
   # }}}
   # {{{ gw-cecsit
   mirror-anu:
     address: 150.203.164.39
     parents: gw-cecsit
-    hostgroups: computers, service, apache2-hosts, dl360, hassrvfs, stretch, apache-https
+    hostgroups: computers, service, apache2-hosts, dl360, hassrvfs, stretch, apache-https, physical_x86_intel
   mirror-anu2:
     address: 150.203.164.60
     parents: mirror-anu
@@ -537,7 +537,7 @@ servers:
   schmelzer:
     address: 185.69.161.161
     parents: gw-conova
-    hostgroups: computers, service, stretch, r540, manyprocesses, apache2-hosts, apache-https, systemd-timesyncd
+    hostgroups: computers, service, stretch, r540, manyprocesses, apache2-hosts, apache-https, systemd-timesyncd, physical_x86_intel
   schmelzer-debian:
     address: 217.196.149.232
     hostgroups: secondary-IPs
@@ -559,11 +559,11 @@ servers:
   csail-node01:
     address: 128.31.0.16
     parents: gw-csail
-    hostgroups: computers, service, dl360, stretch, drbd-hosts
+    hostgroups: computers, service, dl360, stretch, drbd-hosts, physical_x86_intel
   csail-node02:
     address: 128.31.0.46
     parents: gw-csail
-    hostgroups: computers, service, dl360, stretch, drbd-hosts
+    hostgroups: computers, service, dl360, stretch, drbd-hosts, physical_x86_intel
   ganeti-csail:
     address: 128.31.0.49
     parents: gw-csail
@@ -598,13 +598,13 @@ servers:
   storace:
     address: 93.94.130.161
     parents: gw-dgi
-    hostgroups: computers, stretch, dl380, nfs-client, hassrvfs
+    hostgroups: computers, stretch, dl380, nfs-client, hassrvfs, physical_x86_intel
   # }}}
   # {{{ gw-gatech
   sechter:
     address: 128.61.240.73
     parents: gw-gatech
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, hasbootfs, hassrvfs, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, sw-raid, hasbootfs, hassrvfs, stretch, security_mirror, physical_x86_intel
   # }}}
   # {{{ gw-grnet
   ganeti-grnet:
@@ -614,11 +614,11 @@ servers:
   grnet-node01:
     address: 194.177.211.195
     parents: gw-grnet
-    hostgroups: computers, service, dl380, stretch, drbd-hosts
+    hostgroups: computers, service, dl380, stretch, drbd-hosts, physical_x86_intel
   grnet-node02:
     address: 194.177.211.196
     parents: gw-grnet
-    hostgroups: computers, service, dl380, stretch, drbd-hosts
+    hostgroups: computers, service, dl380, stretch, drbd-hosts, physical_x86_intel
   loghost-grnet-01:
     address: 194.177.211.200
     parents: gw-grnet
@@ -660,7 +660,7 @@ servers:
   mirror-isc:
     address: 149.20.4.13
     parents: gw-isc
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, xinetd-hosts, stretch, physical_x86_intel
   mirror-isc2:
     address: 149.20.4.14
     parents: mirror-isc
@@ -678,23 +678,23 @@ servers:
   lw01:
     address: 185.17.185.177
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
   lw02:
     address: 185.17.185.178
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
   lw03:
     address: 185.17.185.179
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
   lw04:
     address: 185.17.185.180
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-server, rsyncd-hosts, physical_x86_intel
   lw07:
     address: 185.17.185.187
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-client, autofs, hassrvfs, postgres96-hosts, apache2-hosts, haproxy-hosts, haproxy-https-host, varnish-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-client, autofs, hassrvfs, postgres96-hosts, apache2-hosts, haproxy-hosts, haproxy-https-host, varnish-hosts, physical_x86_intel
   lw07-2:
     address: 185.17.185.185
     parents: lw07
@@ -703,33 +703,33 @@ servers:
   lw08:
     address: 185.17.185.189
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180, nfs-client, autofs, hassrvfs, apache2-hosts
+    hostgroups: computers, service, stretch, dl180, nfs-client, autofs, hassrvfs, apache2-hosts, physical_x86_intel
   lw09:
     address: 185.17.185.181
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180
+    hostgroups: computers, service, stretch, dl180, physical_x86_intel
   lw10:
     address: 185.17.185.182
     parents: gw-leaseweb
-    hostgroups: computers, service, stretch, dl180
+    hostgroups: computers, service, stretch, dl180, physical_x86_intel
   # }}}
   # {{{ gw-manda
   czerny:
     address: 82.195.75.109
     parents: gw-manda
-    hostgroups: computers, service, dl380, acpid-hosts, stretch, manyprocesses
+    hostgroups: computers, service, dl380, acpid-hosts, stretch, manyprocesses, physical_x86_intel
   clementi:
     address: 82.195.75.103
     parents: gw-manda
-    hostgroups: computers, service, dl380, acpid-hosts, stretch, manyprocesses
+    hostgroups: computers, service, dl380, acpid-hosts, stretch, manyprocesses, physical_x86_intel
   manda-node03:
     address: 82.195.75.69
     parents: gw-manda
-    hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses
+    hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses, physical_x86_intel
   manda-node04:
     address: 82.195.75.70
     parents: gw-manda
-    hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses
+    hostgroups: computers, service, stretch, r540, drbd-hosts, manyprocesses, physical_x86_intel
   bendel:
     address: 82.195.75.100
     parents: ganeti-manda
@@ -817,7 +817,7 @@ servers:
   byrd:
     address: 140.211.166.200
     parents: gw-osuosl
-    hostgroups: computers, service, dl380, stretch
+    hostgroups: computers, service, dl380, stretch, physical_x86_intel
   beach:
     address: 140.211.166.201
     parents: byrd
@@ -845,7 +845,7 @@ servers:
   sallinen:
     address: 193.62.202.26
     parents: gw-sanger
-    hostgroups: computers, service, stretch, dl380, nfs-client, autofs, postgres96-hosts, apache2-hosts, haproxy-hosts, haproxy-https-host, varnish-hosts
+    hostgroups: computers, service, stretch, dl380, nfs-client, autofs, postgres96-hosts, apache2-hosts, haproxy-hosts, haproxy-https-host, varnish-hosts, physical_x86_intel
   sallinen-2:
     address: 193.62.202.27
     parents: sallinen
@@ -860,11 +860,11 @@ servers:
   lobos:
     address: 212.211.132.250
     parents: gw-scanplus-lobos
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl380, hassrvfs, stretch, security_mirror, physical_x86_intel
   villa:
     address: 212.211.132.32
     parents: gw-scanplus-villa
-    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, stretch, security_mirror
+    hostgroups: computers, service, apache2-hosts, rsyncd-hosts, dl360, hassrvfs, stretch, security_mirror, physical_x86_intel
   # }}}
   # {{{ gw-sil
   eberlin:
@@ -884,25 +884,25 @@ servers:
   mirror-skroutz:
     address: 154.57.0.251
     parents: gw-skroutz1, gw-skroutz2
-    hostgroups: computers, stretch, service, sw-raid, hassrvfs, apache2-hosts
+    hostgroups: computers, stretch, service, sw-raid, hassrvfs, apache2-hosts, physical_x86_intel
   # }}}
   # {{{ ubc-gateway
   ubc-enc2bl01:
     address: 209.87.16.1
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   ubc-enc2bl02:
     address: 209.87.16.2
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   ubc-enc2bl09:
     address: 209.87.16.9
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
   ubc-enc2bl10:
     address: 209.87.16.10
     parents: ubc-gateway
-    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses
+    hostgroups: computers, bl460g8, service, stretch, multipath-hosts, manyprocesses, physical_x86_intel
 
   rachmaninoff:
     address: 209.87.16.20
@@ -1014,7 +1014,7 @@ servers:
   mirror-umn:
     address: 128.101.240.212
     parents: gw-umn
-    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch
+    hostgroups: computers, service, apache2-hosts, apache-https, dl360, hassrvfs, stretch, physical_x86_intel
   mirror-umn2:
     address: 128.101.240.215
     parents: mirror-umn
@@ -1046,7 +1046,7 @@ servers:
   klecker:
     address: 130.89.148.10
     parents: gw-utwente
-    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, stretch, incomingmailrelayed2025, hassrvfs
+    hostgroups: computers, service, apache2-hosts, apache-https, rsyncd-hosts, dl380, stretch, incomingmailrelayed2025, hassrvfs, physical_x86_intel
   klecker-ftp:
     address: 130.89.148.12
     parents: klecker
@@ -1062,7 +1062,7 @@ servers:
   smit:
     address: 130.89.148.78
     parents: gw-utwente
-    hostgroups: computers, service, stretch, r540, manyprocesses, incomingmailrelayed2025
+    hostgroups: computers, service, stretch, r540, manyprocesses, incomingmailrelayed2025, physical_x86_intel
   # }}}
   # {{{ gw-ynic
   henze:
@@ -1092,7 +1092,7 @@ servers:
   setoguchi:
     address: 133.242.99.74
     parents: gw-sakura
-    hostgroups: computers, service, stretch, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, security_mirror
+    hostgroups: computers, service, stretch, no-bacula, hassrvfs, apache2-hosts, rsyncd-hosts, security_mirror, physical_x86_intel
   # }}}
 
 # {{{ ############################# host groups #############################
@@ -1154,6 +1154,10 @@ hostgroups:
     alias: Dell PowerEdge R540 hosts
     private: 1
 
+  physical_x86_intel:
+    alias: Physical machines with Intel CPUs
+    private: 1
+
   jessie:
     alias: Hosts running jessie
   stretch: