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

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  englund has apache now
  and xinetd on sibelius
  Make the check work with Ubuntu's kernel names (Alexander Reichle-Schmehl)
  (c) years
  Fix --ignore-transfer-speed logic
  Group ../debian/changelog better
  sibelius is now an rsyncd host
  Do not do cpqarrayd checks on squeeze
  Do not require the set of excludes to be a subset of the included hosts
  Do apt checks on squeeze now
  update hostgroups for raff
  Change disk usage thresholds for /vicepa from 80/90 to 90/95

diff --git a/config/build-nagios b/config/build-nagios
index 545e4fd..acbf339 100755 (executable)
--- a/config/build-nagios
+++ b/config/build-nagios
@@ -241,7 +241,7 @@ def find_hosts(service, servers, hostgroups)
 
        excludehosts.uniq.each{ |host|
                if hosts.delete(host) == nil
-                       throw "Cannot remove host #{host} from service #{service['service_description']}: it's not included anyway."
+                       puts "info: [service #{service['service_description']}] not excluding host #{host} - it's not included anyway."
                end
        }
 

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 284e518..b23986b 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -190,7 +190,7 @@ servers:
   raff:
     address: 192.25.206.59
     parents: gw-HP-ftc
-    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, dl380, no-udev, hassrvfs, acpid-hosts, xinetd-hosts
+    hostgroups: computers, service, dl380, hassrvfs, acpid-hosts, squeeze
   merkel:
     address: 192.25.206.16
     parents: gw-HP-ftc
@@ -417,7 +417,7 @@ servers:
   sibelius:
     address: 193.62.202.28
     parents: gw-sanger
-    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze
+    hostgroups: computers, acpid-hosts, postgres90-hosts, service, apache2-hosts, sw-raid, squeeze, rsyncd-hosts, xinetd-hosts
     contacts: tjrc1, dave
   smetana:
     address: 193.62.202.29
@@ -753,7 +753,7 @@ servers:
   englund:
     address: 86.59.118.148
     parents: gw-sil
-    hostgroups: computers, acpid-hosts, service
+    hostgroups: computers, acpid-hosts, service, apache2-hosts
     # which raid?
   lindberg:
     address: 86.59.118.149
@@ -1195,7 +1195,7 @@ services:
   -
     name: disk usage on /vicepa
     servicegroups: diskspace
-    nrpe: "/usr/lib/nagios/plugins/check_disk 80 90 /vicepa"
+    nrpe: "/usr/lib/nagios/plugins/check_disk 90 95 /vicepa"
     hostgroups: hasvicepa
 
  ############ All Computers ############
@@ -1205,7 +1205,6 @@ services:
     servicegroups: apt
     nrpe: "/usr/lib/nagios/plugins/dsa-check-statusfile /var/cache/dsa/nagios/apt"
     hostgroups: computers
-    excludehostgroups: squeeze
     normal_check_interval:  60
     retry_check_interval: 15
  ####
@@ -1772,6 +1771,7 @@ services:
     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, dl585
+    excludehostgroups: squeeze
   -
     name: RAID - arrayprobe
     servicegroups: raid

diff --git a/dsa-nagios-checks/checks/dsa-check-hpacucli b/dsa-nagios-checks/checks/dsa-check-hpacucli
index 7aff0c3..ea8b012 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-hpacucli
+++ b/dsa-nagios-checks/checks/dsa-check-hpacucli
@@ -5,7 +5,7 @@
 #
 # does _not_ check raid status.  use arrayprobe for that.
 
-# Copyright (c) 2008,2009 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2008,2009,2010,2011 Peter Palfrader <peter@palfrader.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -200,8 +200,8 @@ for my $slot (sort @controllers) {
                if ($params->{'ignore-transfer-speed'}) {
                        if (grep { $drive eq $_ } @{$params->{'ignore-transfer-speed'}}) {
                                push @{$status{'ignored transfer speed'}}, $drive."(".$value{$key}.")";
+                               next;
                        };
-                       next;
                };
                if (!defined $value{$key}) {
                        record('WARNING');

diff --git a/dsa-nagios-checks/checks/dsa-check-running-kernel b/dsa-nagios-checks/checks/dsa-check-running-kernel
index 452c8c1..cb5168b 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-running-kernel
+++ b/dsa-nagios-checks/checks/dsa-check-running-kernel
@@ -6,6 +6,7 @@
 # Copyright 2008,2009 Peter Palfrader
 # Copyright 2009 Stephen Gran
 # Copyright 2010 Uli Martens
+# Copyright 2011 Alexander Reichle-Schmehl
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -165,6 +166,12 @@ for on_disk in \
                fi
                if [ "${on_disk/vmlinu}" != "$on_disk" ]; then
                        on_disk_version="`get_image_linux "$on_disk" | strings | grep 'Linux version' | head -n1`"
+                       if [ -x /usr/bin/lsb_release ] ; then
+                               vendor=$(lsb_release -i -s)
+                               if [ -n "$vendor" ] && [ "xDebian" != "x$vendor" ] ; then
+                                       on_disk_version=$( echo $on_disk_version|sed -e "s/ ($vendor [[:alnum:]\.-]\+ [[:alnum:]\.]\+)//")
+                               fi
+                       fi
                        [ -z "$on_disk_version" ] || break
                        on_disk_version="`cat "$on_disk" | strings | grep 'Linux version' | head -n1`"
                        [ -z "$on_disk_version" ] || break

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 5cb29c8..c0c55f9 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -1,17 +1,20 @@
 dsa-nagios-checks (8x) xnstable; urgency=low
 
-  * dsa-check-hpacucli: Also accept 'Unknown, 3.0GBPS' as a valid
-    transfer speed in addition to '3.0GBPS, Unknown'.
-  * dsa-check-hpacucli add --ignore-transfer-speed option.
+  * dsa-check-hpacucli
+    - Also accept 'Unknown, 3.0GBPS' as a valid transfer speed in addition
+      to '3.0GBPS, Unknown'.
+    - accept 6.0Gbps for SAS disks.
+    - add --ignore-transfer-speed option.
+    - ignore the line for unassigned disks (patch by Emmanuel Lacour).
   * Add dsa-check-ups.
   * Add dsa-check-hpacucli-enclosure.
-  * dsa-check-running-kernel: check if 'strings' is installed and
-    complain nicely if it isn't instead of falling over. [Uli Martens]
+  * dsa-check-running-kernel:
+    - check if 'strings' is installed and complain nicely if it isn't instead
+      of falling over. [Uli Martens]
+    - Make the check work with Ubuntu's kernel names (Alexander
+      Reichle-Schmehl).
   * dsa-check-afs-*: add checks from Russ Allbery for monitoring our AFS
   * Add dsa-check-port-closed.
-  * dsa-check-hpacucli: ignore the line for unassigned disks (patch by
-    Emmanuel Lacour).
-  * dsa-check-hpacucli: accept 6.0Gbps for SAS disks.
   * dsa-check-hpasm: Incorporate patch from Jan Wagner to ignore "N/A" DIMM
     status.
   * dsa-check-hpasm: Incorporate patch from Jan Wagner to ignore fan lines
@@ -19,7 +22,7 @@ dsa-nagios-checks (8x) xnstable; urgency=low
   * dsa-check-udldap-freshness: Also check age of /var/lib/misc/passwd.db
     in addition to /var/lib/misc/thishost/passwd.tdb.
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 08 Dec 2010 15:39:33 +0100
+ -- Peter Palfrader <weasel@debian.org>  Mon, 24 Jan 2011 16:26:44 +0100
 
 dsa-nagios-checks (87) unstable; urgency=low