projects / mirror / dsa-nagios.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
no more etch
[mirror/dsa-nagios.git] / config / nagios-master.cfg
diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index dff176f..845bb08 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -77,7 +77,7 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-sanger:
-    address: 193.62.202.18
+    address: 193.62.202.20
     parents: gw-ubc
     hostgroups: routing-infrastructure
     contacts: tjrc1
@@ -173,7 +173,8 @@ servers:
     parents: gw-ubc
     hostgroups: routing-infrastructure
   gw-ynic:
-    address: 144.32.168.65
+    # really janet, because ynic is stupid about firewalling
+    address: 146.97.42.26
     parents: gw-ubc
     hostgroups: routing-infrastructure
 
@@ -282,10 +283,10 @@ servers:
     address: 82.195.75.70
     parents: gw-man-da
     hostgroups: computers, buildd, no-udev, hasbootfs, ntpsuckers
-  purcell:
-    address: 82.195.75.69
+  kokkonen:
+    address: 82.195.75.97
     parents: gw-man-da
-    hostgroups: computers, buildd
+    hostgroups: computers, service, acpid-hosts, postgres84-hosts
 
   master:
     address: 70.103.162.29
@@ -311,10 +312,10 @@ servers:
     address: 140.211.166.78
     parents: gw-osuosl
     hostgroups: computers, buildd, hasbootfs
-  mayr:
-    address: 140.211.166.58
-    parents: gw-osuosl
-    hostgroups: computers, buildd, hasbootfs
+#  mayr:
+#    address: 140.211.166.58
+#    parents: gw-osuosl
+#    hostgroups: computers, buildd, hasbootfs
   rietz:
     address: 140.211.166.43
     parents: gw-osuosl
@@ -408,7 +409,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, megaraid
+    hostgroups: computers, acpid-hosts, megaraid, postgres84-hosts
     contacts: tjrc1
   smetana:
     address: 193.62.202.29
@@ -506,6 +507,7 @@ servers:
     hostgroups: computers, bl460, acpid-hosts
   tchaikovsky:
     address: 206.12.19.118
+    address6: 2607:f8f0:610:4000:216:36ff:fe40:3809
     hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains
   wolkenstein:
     address: 206.12.19.116
@@ -583,6 +585,18 @@ servers:
     address: 206.12.19.15
     parents: tchaikovsky
     hostgroups: computers, buildd
+  rossini:
+    address: 206.12.19.19
+    parents: tchaikovsky
+    hostgroups: computers, dl585, acpid-hosts
+  salieri:
+    address: 206.12.19.20
+    parents: tchaikovsky
+    hostgroups: computers, dl585, acpid-hosts
+  traetta:
+    address: 206.12.19.21
+    parents: tchaikovsky
+    hostgroups: computers, dl585, acpid-hosts
 
   lebrun:
     address: 193.198.184.10
@@ -674,11 +688,11 @@ servers:
   vitry:
     address: 194.177.211.206
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid
+    hostgroups: computers, acpid-hosts, mptraid, buildd
   krenek:
     address: 194.177.211.207
     parents: gw-grnet
-    hostgroups: computers, acpid-hosts, mptraid
+    hostgroups: computers, acpid-hosts, mptraid, buildd
   scelsi:
     address: 194.177.211.208
     parents: gw-grnet
@@ -719,23 +733,23 @@ servers:
   abel:
     address: 217.140.96.56
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, porterbox
   arnold:
     address: 217.140.96.57
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
   alain:
     address: 217.140.96.58
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
   alwyn:
     address: 217.140.96.59
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
   antheil:
     address: 217.140.96.60
     parents: gw-arm
-    hostgroups: computers, hasbootfs, hassrvfs
+    hostgroups: computers, hasbootfs, hassrvfs, buildd
   arne:
     address: 217.140.96.61
     parents: gw-arm
@@ -744,12 +758,11 @@ servers:
   poulenc:
     address: 144.32.168.77
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid
-
+    hostgroups: computers, buildd, sw-raid, hassrvfs
   porpora:
     address: 144.32.168.78
     parents: gw-ynic
-    hostgroups: computers, buildd, sw-raid
+    hostgroups: computers, buildd, sw-raid, hassrvfs
 
 #############################
 # host groups
@@ -810,6 +823,9 @@ hostgroups:
   bl460:
     alias: HP BL460 blades
     private: 1
+  dl585:
+    alias: HP DL385 hosts
+    private: 1
   sw-raid:
     alias: Hosts with Linux software raid
     private: 1
@@ -823,9 +839,6 @@ hostgroups:
     alias: Hosts with LSI Logic Fusion-MPT
     private: 1
 
-  etch:
-    alias: Hosts running etch
-    private: 1
   squeeze:
     alias: Hosts running squeeze
     private: 1
@@ -1180,6 +1193,11 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/ferm.conf"
     hostgroups: computers
     excludehostgroups: freebsd
+  -
+    name: puppetized firewall
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-file -w -f /etc/ferm/conf.d/defs.conf"
+    hostgroups: computers
+    excludehostgroups: freebsd
 
  ####
   -
@@ -1668,12 +1686,12 @@ services:
     name: process - cpqarrayd
     servicegroups: raid
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 -u root -C cpqarrayd -a '/usr/sbin/cpqarrayd'"
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl585
   -
     name: RAID - arrayprobe
     servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl585
     excludehosts: franck
   -
     name: RAID - arrayprobe
@@ -1686,12 +1704,18 @@ services:
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli"
     normal_check_interval: 120
     hostgroups: dl385, dl380, dl360, bl460
+  -
+    name: HW - hpacucli status
+    servicegroups: raid
+    nrpe: "/usr/lib/nagios/plugins/dsa-check-hpacucli --ignore-transfer-speed=1I:1:1 --ignore-transfer-speed=1I:1:2"
+    normal_check_interval: 120
+    hostgroups: dl585
  ###
   -
     name: HW - hpasmcli status
     nrpe: "/usr/lib/nagios/plugins/dsa-check-hpasm"
     normal_check_interval: 120
-    hostgroups: dl385, dl380, dl360, bl460
+    hostgroups: dl385, dl380, dl360, bl460, dl585
     excludehosts: villa, lobos, liszt, senfl, schein, rore
   -
     name: HW - hpasmcli status
@@ -1962,9 +1986,8 @@ services:
  ####
   -
     name: process - postresql84 - master
-    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'"
+    nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:4 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.4/bin/postgres'"
     hostgroups: postgres84-hosts
-    excludehosts: franck
   -
     name: process - postresql83 - master
     nrpe: "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1: -u postgres -C postgres -a '/usr/lib/postgresql/8.3/bin/postgres -D /var/lib/postgresql/8.3/main -c config_file=/etc/postgresql/8.3/main/postgresql.conf'"
Unnamed repository; edit this file 'description' to name the repository.