Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  ries no longer in uploadqueue
  spot the typo
  stab at new arrayprobe for franck
  Update check-hpacucli to deal with dual domain and 6GBPS SAS
  more franck fixups
  um, it works better with the right ip
  start monitoring franck
  morricone now on pg8.4

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 975b753..a765a70 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -292,7 +292,12 @@ servers:
   ries:
     address: 128.148.34.103
     parents: gw-brown.edu
-    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl385, rsyncd-hosts, postgres83-hosts, spamd, heavy-exim, acpid-hosts, xinetd-hosts
+
+  franck:
+    address: 128.148.34.3
+    parents: gw-brown.edu
+    hostgroups: computers, service, apache2-hosts, bind9-hosts, dl380, rsyncd-hosts, postgres84-hosts, spamd, heavy-exim, acpid-hosts, uploadqueue, xinetd-hosts, ulogd-hosts
 
   mayer:
     address: 140.211.166.78
@@ -521,7 +526,7 @@ servers:
   morricone:
     address: 206.12.19.9
     parents: tchaikovsky
-    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres83-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
+    hostgroups: computers, hasbootfs, hassrvfs, aacraid, postgres84-hosts, ftpd-hosts, rsyncd-hosts, heavy-exim, xinetd-hosts, apache2-hosts
   stabile:
     address: 206.12.19.13
     parents: gw-ubc
@@ -1612,6 +1617,12 @@ services:
     servicegroups: raid
     nrpe: "sudo /usr/bin/arrayprobe"
     hostgroups: dl385, dl380, dl360, bl460
+    excludehosts: franck
+  -
+    name: RAID - arrayprobe
+    servicegroups: raid
+    nrpe: "sudo /usr/bin/arrayprobe -f /dev/cciss/c1d0"
+    hosts: franck
   -
     name: HW - hpacucli status
     servicegroups: raid
@@ -1793,7 +1804,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: ries, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg
+    hosts: ries, franck, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1807,7 +1818,7 @@ services:
     # merkel2          nm.debian.org
     # liszt            lists.debian.org
     # grieg            buildd.debian.org
-    hosts: ries, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg
+    hosts: ries, franck, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg
     depends: network service - https
     normal_check_interval: 60
 
@@ -1894,6 +1905,7 @@ 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'"
     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'"
@@ -1909,11 +1921,11 @@ services:
   -
     name: process - postresql84 - dak 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 -D /var/lib/postgresql/8.4/dak -c config_file=/etc/postgresql/8.4/dak/postgresql.conf'"
-    hosts: ries
+    hosts: franck, ries
   -
     name: process - postresql84 - dak-dev 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 -D /var/lib/postgresql/8.4/dak-dev -c config_file=/etc/postgresql/8.4/dak-dev/postgresql.conf'"
-    hosts: ries
+    hosts: franck, ries
  # backups
   -
     name: postgresql backups

diff --git a/dsa-nagios-checks/checks/dsa-check-hpacucli b/dsa-nagios-checks/checks/dsa-check-hpacucli
index 06c6fad..ef79db8 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-hpacucli
+++ b/dsa-nagios-checks/checks/dsa-check-hpacucli
@@ -126,6 +126,8 @@ for my $slot (sort @controllers) {
                        $type = 'SCSI';
                } elsif ($drive =~ /^[0-9]+[EI]:[0-9]+:[0-9]+$/) { # SAS
                        $type = 'SAS';
+               } elsif ($drive =~ /^[0-9]+[C]:[0-9]+:[0-9]+$/) { # New 6GBPS SAS
+                       $type = 'SAS+';
                } else {
                        # I'm not going to run pass arguments of unknown form to the shell..
                        warn ("Unknown diskdrive ID $drive\n");
@@ -164,10 +166,21 @@ for my $slot (sort @controllers) {
                } elsif ($type eq 'SAS') {
                        $key = 'PHY Transfer Rate';
                        if ($value{'PHY Count'} eq '2') {
-                               $expected = '3.0GBPS, Unknown';
+                               if (defined($value{'Redundant Path(s)'})) {
+                                       $expected = '3.0GBPS, 3.0GBPS';
+                               } else {
+                                       $expected = '3.0GBPS, Unknown';
+                               }
                        } else {
                                $expected = '3.0GBPS';
                        }
+               } elsif ($type eq 'SAS+') {
+                       $key = 'PHY Transfer Rate';
+                       if ($value{'PHY Count'} eq '2') {
+                               $expected = '6.0GBPS, Unknown';
+                       } else {
+                               $expected = '6.0GBPS';
+                       }
                } else {
                        warn "Should not be here.  Do not know what to do with type '$type'\n";
                        next;

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index f7d4c7b..50a8da5 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -16,7 +16,10 @@ dsa-nagios-checks (8X) unstable; urgency=low
   * dsa-check-zone-rrsig-expiration-many: also allow checking of geozones.
   * dsa-check-dnssec-delegation: allow multiple dirs to be checked.
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 26 Jun 2010 12:11:51 +0200
+  [ Stephen Gran ]
+  * Update check-hpacucli to deal with dual domain and 6GBPS SAS
+
+ -- Stephen Gran <sgran@debian.org>  Sat, 03 Jul 2010 16:23:58 +0100
 
 dsa-nagios-checks (86) unstable; urgency=low