debian/monitoring-plugins-cyconet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unneeded patches

Browse source
This commit is contained in:
Jan Wagner 2013-11-18 11:48:02 +01:00
parent 299ab37f5c
commit 4d4bab03e1
31 changed files with 0 additions and 671 deletions
Download patch file Download diff file Expand all files Collapse all files

79
debian/patches/check_ajp/return_critical_on_failed_connection vendored
View file

@ -1,79 +0,0 @@
--- a/check_ajp/check_ajp
+++ b/check_ajp/check_ajp
@@ -7,6 +7,7 @@
#
# check_ajp - nagios plugin for jboss monitoring
# Copyright (C) 2010 Michel Rode <rmichel@devnu11.net>
+# Copyright (C) 2013 Bernd Zeimetz <b.zeimetz@conova.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -30,6 +31,8 @@ use strict;
use Getopt::Long;
use Socket;
use Time::HiRes 'time';
+use IO::Socket;
+
my $app = '';
my $port = '8009';
@@ -37,9 +40,14 @@ my $warntime = '1.5';
my $crittime = '3';
my $timeout = '10';
-my ($iaddr, $paddr, $proto, $sock, $time1, $time2);
+my ($sock, $time1, $time2);
my $pong = 'null';
+sub conndie{
+ my $msg = shift;
+ print "CRITICAL : $msg\n";
+ exit 2;
+}
sub xdie{
my $msg = shift;
printf STDERR "Usage: check_ajp --app ip.of.the.app [--port 8009 --warn 1 --crit 2 --timeout 5]\n\n";
@@ -49,6 +57,10 @@ sub xdie{
GetOptions("app=s" => \$app, "port=s" => \$port, "warn=f" => \$warntime, "crit=f" => \$crittime, "timeout=f" => \$timeout);
+if ($app eq '') {
+ xdie('--app not given')
+}
+
my $ping = pack 'C5' # Format template.
, 0x12, 0x34 # Magic number for server->container packets.
, 0x00, 0x01 # 2 byte int length of payload.
@@ -61,24 +73,23 @@ my $expected = pack 'C5' # Format tem
, 0x09 # Type of packet. 9 = CPong reply.
;
-$iaddr = inet_aton($app) || xdie("No host given !");
-$paddr = sockaddr_in($port, $iaddr) || xdie("Wrong port !");
-$proto = getprotobyname 'tcp';
-
$time1 = time();
eval {
local $SIG{ALRM} = sub { die "alarm\n" };
alarm($timeout);
- socket $sock, PF_INET, SOCK_STREAM, $proto || xdie("socket !");
- connect $sock, $paddr || xdie("connect !");
- syswrite $sock, $ping || xdie("syswrite !");
- sysread $sock, $pong, 5 || xdie("sysread !");
+ $sock = IO::Socket::INET->new(Proto => "tcp",
+ PeerAddr => $app,
+ PeerPort => $port) || conndie($@);
+ $sock->autoflush(1);
+ print $sock $ping;
+ $sock->recv($pong,5);
+ close $sock;
alarm(0);
};
if ($@) {
- die unless $@ eq "alarm\n";
+ conndie($@) unless $@ eq "alarm\n";
$time2 = (time() - $time1);
printf "CRITICAL - AJP - Timeout after %1.0fs\n",$time2;
exit 2;

11
debian/patches/check_backuppc/use_nagios_plugins vendored
View file

@ -1,11 +0,0 @@
--- a/check_backuppc/src/check_backuppc
+++ b/check_backuppc/src/check_backuppc
@@ -32,7 +32,7 @@ no utf8;
# Nagios
use lib "NAGIOS_LIB";
-use utils qw(%ERRORS $TIMEOUT);
+use Nagios::Plugin qw(%ERRORS);
use POSIX qw(strftime difftime);
use Getopt::Long;
Getopt::Long::Configure('bundling');

73
debian/patches/check_clamav/clamav_locations vendored
View file

@ -1,73 +0,0 @@
--- a/check_clamav/check_clamav
+++ b/check_clamav/check_clamav
@@ -16,18 +16,18 @@
#
################################################################################
# This script is used to compare the version and signature level of the
-# currently running clamd daemon with the latest available versions listed in
+# currently running clamscan daemon with the latest available versions listed in
# the TXT record for current.cvd.clamav.net.
#
# In order to use this script, you might need to make the following adjustments:
# - Set the "use lib" path correctly (where utils.pm is located.)
-# - Set the path to your clamd binary in $clamd_cmd.
+# - Set the path to your clamscan binary in $clamscan_cmd.
#
# This plugin requires the Net::DNS Perl module.
################################################################################
# Plugin directory / home of utils.pm.
-use lib "/usr/local/libexec/nagios";
+use lib "/usr/lib/nagios/plugins";
use utils qw(%ERRORS &print_revision &support &usage);
use Getopt::Long qw(:config no_ignore_case bundling);
use File::Basename;
@@ -35,8 +35,8 @@ use Net::DNS;
use strict;
-# Path to installed clamd binary.
-my $clamd_cmd = "/usr/local/sbin/clamd";
+# Path to installed clamscan binary.
+my $clamscan_cmd = "/usr/bin/clamscan";
# Leave the rest of this alone:
my $prog_name = basename $0;
@@ -153,28 +153,28 @@ if ($vers_val != 0) {
}
# Make sure the binary exists.
-if (-x $clamd_cmd) {
- &print_debug("Found clamd at $clamd_cmd");
+if (-x $clamscan_cmd) {
+ &print_debug("Found clamscan at $clamscan_cmd");
} else {
- &print_debug("Can't execute clamd at $clamd_cmd");
- die("FATAL: Unable to execute $clamd_cmd");
+ &print_debug("Can't execute clamscan at $clamscan_cmd");
+ die("FATAL: Unable to execute $clamscan_cmd");
}
&print_debug("Threshhold values: warning=$warn_val, critical=$crit_val");
# Should return something like: ClamAV 0.87.1/1205/Wed Dec 7 07:00:48 2005
-chomp(my $clamd_ver = `$clamd_cmd -V`);
+chomp(my $clamscan_ver = `$clamscan_cmd -V`);
# Should return something like: 0.87.1:34:1206:1134072033:1
chomp(my $dnstxt_ver = &lookup_current());
-# Parse what we get from clamd -V and our DNS query
-my @clamdresults = split(/\//,$clamd_ver);
+# Parse what we get from clamscan -V and our DNS query
+my @clamscanresults = split(/\//,$clamscan_ver);
my @txtresults = split(/:/,$dnstxt_ver);
# Get the currently running ClamAV sig level and cvd date out of this
-my $local_latest_daily = $clamdresults[1];
-my $local_latest_date = $clamdresults[2];
+my $local_latest_daily = $clamscanresults[1];
+my $local_latest_date = $clamscanresults[2];
&print_debug("Local daily.cvd dated $local_latest_date");
&print_debug("Local daily.cvd version = $local_latest_daily");

8
debian/patches/check_cups/epn vendored
View file

@ -1,8 +0,0 @@
--- a/check_cups/check_cups
+++ b/check_cups/check_cups
@@ -1,4 +1,5 @@
#!/usr/bin/perl
+# nagios: -epn
=head1 NAME

45
debian/patches/check_email_delivery/epn vendored
View file

@ -1,45 +0,0 @@
--- a/check_email_delivery/src/check_email_delivery
+++ b/check_email_delivery/src/check_email_delivery
@@ -1,4 +1,6 @@
#!/usr/bin/perl
+# nagios: -epn
+
use strict;
my $VERSION = '0.7.1';
my $COPYRIGHT = 'Copyright (C) 2005-2011 Jonathan Buhacoff <jonathan@buhacoff.net>';
--- a/check_email_delivery/src/check_imap_quota
+++ b/check_email_delivery/src/check_imap_quota
@@ -1,4 +1,6 @@
#!/usr/bin/perl
+# nagios: -epn
+
use strict;
my $VERSION = '0.2';
my $COPYRIGHT = 'Copyright (C) 2005-2011 Jonathan Buhacoff <jonathan@buhacoff.net>';
--- a/check_email_delivery/src/check_imap_receive
+++ b/check_email_delivery/src/check_imap_receive
@@ -1,4 +1,6 @@
#!/usr/bin/perl
+# nagios: -epn
+
use strict;
my $VERSION = '0.7.5';
my $COPYRIGHT = 'Copyright (C) 2005-2011 Jonathan Buhacoff <jonathan@buhacoff.net>';
--- a/check_email_delivery/src/check_smtp_send
+++ b/check_email_delivery/src/check_smtp_send
@@ -1,4 +1,6 @@
#!/usr/bin/perl
+# nagios: -epn
+
use strict;
use POSIX qw(strftime);
my $VERSION = '0.7.3';
--- a/check_email_delivery/src/imap_ssl_cert
+++ b/check_email_delivery/src/imap_ssl_cert
@@ -1,4 +1,6 @@
#!/usr/bin/perl
+# nagios: -epn
+
use strict;
my $VERSION = '0.1';
my $COPYRIGHT = 'Copyright (C) 2005-2011 Jonathan Buhacoff <jonathan@buhacoff.net>';

27
debian/patches/check_email_delivery/paths vendored
View file

@ -1,27 +0,0 @@
Author: Tom Jampen <tom@cryptography.ch>
Description:
Patches check_email_delivery and check_email_delivery_epn to use debian
specific paths.
--- a/check_email_delivery/src/check_email_delivery
+++ b/check_email_delivery/src/check_email_delivery
@@ -63,7 +63,7 @@ my $default_warn = 15;
my $default_wait = 5;
my $default_timeout = 60;
my $time_hires = "";
-my $libexec = "/usr/local/nagios/libexec";
+my $libexec = "/usr/lib/nagios/plugins";
my $ok;
$ok = Getopt::Long::GetOptions(
"V|version"=>\$show_version,
--- a/check_email_delivery/src/check_email_delivery_epn
+++ b/check_email_delivery/src/check_email_delivery_epn
@@ -61,7 +61,7 @@ my $default_warn = 15;
my $default_wait = 5;
my $default_timeout = 60;
my $time_hires = "";
-my $libexec = "/usr/local/nagios/libexec";
+my $libexec = "/usr/lib/nagios/plugins";
my $ok;
$ok = Getopt::Long::GetOptions(
"V|version"=>\$show_version,

8
debian/patches/check_haproxy/epn vendored
View file

@ -1,8 +0,0 @@
--- a/check_haproxy/check_haproxy
+++ b/check_haproxy/check_haproxy
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
#
# Copyright (c) 2010 Stéphane Urbanovski <stephane.urbanovski@ac-nancy-metz.fr>
#

9
debian/patches/check_httpd_status/epn vendored
View file

@ -1,9 +0,0 @@
--- a/check_httpd_status/check_httpd_status
+++ b/check_httpd_status/check_httpd_status
@@ -1,4 +1,6 @@
#!/usr/bin/perl -w
+# nagios: -epn
+#
####################### check_apachestatus_auto.pl #######################
# Version : 1.3
# Date : 06 Aug 2010

11
debian/patches/check_libs/config_location vendored
View file

@ -1,11 +0,0 @@
--- a/check_libs/nagios-check-libs
+++ b/check_libs/nagios-check-libs
@@ -71,7 +71,7 @@ if ($params->{'version'}) {
};
if (! defined $params->{'config'}) {
- $params->{'config'} = '/etc/nagios-plugins/check-libs.conf';
+ $params->{'config'} = '/etc/nagios/check-libs.conf';
} elsif (! -e $params->{'config'}) {
dief("Config file $params->{'config'} does not exist.\n");
}

11
debian/patches/check_libs/config_path vendored
View file

@ -1,11 +0,0 @@
--- a/check_libs/nagios-check-libs
+++ b/check_libs/nagios-check-libs
@@ -71,7 +71,7 @@ if ($params->{'version'}) {
};
if (! defined $params->{'config'}) {
- $params->{'config'} = '/etc/nagios/check-libs.conf';
+ $params->{'config'} = '/etc/nagios-plugins/check-libs.conf';
} elsif (! -e $params->{'config'}) {
dief("Config file $params->{'config'} does not exist.\n");
}

8
debian/patches/check_lm_sensors/interpreter vendored
View file

@ -1,8 +0,0 @@
--- a/check_lm_sensors/src/check_lm_sensors
+++ b/check_lm_sensors/src/check_lm_sensors
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/perl
# check_lm_sensors is a Nagios plugin to monitor the values of on board sensors and hard
# disk temperatures on Linux systems

12
debian/patches/check_lm_sensors/manpage_whatis_fix vendored
View file

@ -1,12 +0,0 @@
--- a/check_lm_sensors/src/check_lm_sensors.pod
+++ b/check_lm_sensors/src/check_lm_sensors.pod
@@ -2,8 +2,7 @@
=head1 NAME
-C<check_lm_sensors> is a Nagios plugin to monitor the values of on
-board sensors and hard disk temperatures on Linux systems
+C<check_lm_sensors> - Nagios plugin to monitor hardware sensors and disk temperatures
=head1 DESCRIPTION

11
debian/patches/check_lm_sensors/spelling_errors vendored
View file

@ -1,11 +0,0 @@
--- a/check_lm_sensors/src/check_lm_sensors.pod
+++ b/check_lm_sensors/src/check_lm_sensors.pod
@@ -49,7 +49,7 @@ verbosity.
=head1 EXIT STATUS
0 if OK, 1 in case of a warning, 2 in case of a critical status and 3
-in case of an unkown problem
+in case of an unknown problem
=head1 DEPENDENCIES

20
debian/patches/check_nfsmounts/nfs_write_location vendored
View file

@ -1,20 +0,0 @@
--- a/check_nfsmounts/check_nfsmounts
+++ b/check_nfsmounts/check_nfsmounts
@@ -23,6 +23,7 @@
use Nagios::Plugin qw(%ERRORS);
use Time::HiRes qw{time alarm};
+use Sys::Hostname;
use Getopt::Long;
use strict;
@@ -107,7 +108,8 @@ foreach $dir (@dirs) {
if($pid==0) {
chdir $dir or &bad_mount($dir,$!);
if($writemode and exists($mountmodes{$dir}->{"rw"})) {
- open X,"> $dir/.nfscheck" or exit $?;
+ my $check_filename="$dir/.nfscheck_" . hostname;
+ open X,"> $check_filename" or exit $?;
print X $ENV{HOSTNAME}."\n".localtime()."\n"; # XXX Full disk may fail..
close X or exit $?;
}

19
debian/patches/check_nfsmounts/perl_module vendored
View file

@ -1,19 +0,0 @@
--- a/check_nfsmounts/check_nfsmounts
+++ b/check_nfsmounts/check_nfsmounts
@@ -21,14 +21,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-use utils qw{$TIMEOUT %ERRORS};
+use Nagios::Plugin qw(%ERRORS);
use Time::HiRes qw{time alarm};
use Getopt::Long;
use strict;
my $version="1.0";
-my $nfs_timeout=$TIMEOUT;
+my $nfs_timeout=15;
my $nfs_warn=-1;
my $writemode=0;
my $help=0;

35
debian/patches/check_printer/debian_bts vendored
View file

@ -1,35 +0,0 @@
--- a/check_printer/check_printer
+++ b/check_printer/check_printer
@@ -35,10 +35,6 @@ use warnings;
use Nagios::Plugin qw(%ERRORS);
-'$Revision$' =~ m/Revision: (\d+)/;
-my $revision = $1;
-'$HeadURL$' =~ m/HeadURL: ([\w\:\/\-\.\_]+) /;
-my $src_url = $1;
my $usage = "
Usage: $0 host_addr community warn% crit%
@@ -52,7 +48,6 @@ my $debug = 0;
if ($ARGV[4]){
use Data::Dumper;
$debug = 1;
- print "check_printer Revision $revision\n$src_url\n\n";
}
die $usage unless ($#ARGV >= 3);
my $base_oid = ".1.3.6.1.2.1.43.11.1.1";
@@ -235,10 +230,9 @@ while (my($key, $value) = each(%status))
if ($debug){
print Dumper(\%status);
print "\n\n############ ATTENTION ############\n";
- print "You have debug enabled. If asked to enable debug by the developer,\n";
- print "please send all of the output, including your command line to\n";
- print "ecrist\@secure-computing.net with the subject line 'check_printer DEBUG' along\n";
- print "with a description of the problem you're experiencing.\n###################################\n";
+ print "You have debug enabled. If asked to enable debug by the Debian Maintainer,\n";
+ print "please send all of the output to the Debian Bug Tracking System, either by \n";
+ print "replying to an existing bug or by opening a new bug.\n";
}
if ($is_crit){
print "$err_str CRITICAL. See http://$ARGV[0] | $perf_str";

18
debian/patches/check_printer/use_data_dumper_if_needed vendored
View file

@ -1,18 +0,0 @@
--- a/check_printer/check_printer
+++ b/check_printer/check_printer
@@ -41,7 +41,6 @@ if ($OS =~ m/^\wBSD/){
}
use utils qw(%ERRORS);
-use Data::Dumper;
'$Revision$' =~ m/Revision: (\d+)/;
my $revision = $1;
@@ -58,6 +57,7 @@ found for toner and drum.
## set to 1 if you want debug output for development
my $debug = 0;
if ($ARGV[4]){
+ use Data::Dumper;
$debug = 1;
print "check_printer Revision $revision\n$src_url\n\n";
}

18
debian/patches/check_printer/use_nagios_plugin vendored
View file

@ -1,18 +0,0 @@
--- a/check_printer/check_printer
+++ b/check_printer/check_printer
@@ -33,14 +33,7 @@
use strict;
use warnings;
-my $OS = `uname`;
-if ($OS =~ m/^\wBSD/){
- use lib "/usr/local/libexec/nagios";
-} elsif ($OS =~ m/Linux/){
- use lib "/usr/local/nagios/libexec";
-}
-
-use utils qw(%ERRORS);
+use Nagios::Plugin qw(%ERRORS);
'$Revision$' =~ m/Revision: (\d+)/;
my $revision = $1;

15
debian/patches/check_raid/prefer_cciss_vol_status_over_hpacucli vendored
View file

@ -1,15 +0,0 @@
--- a/check_raid/check_raid
+++ b/check_raid/check_raid
@@ -2728,8 +2728,10 @@ sub check {
package hpacucli;
use base 'plugin';
-# register
-push(@utils::plugins, __PACKAGE__);
+# register if cciss_vol_status is not available
+if (! utils::which('cciss_vol_status')) {
+ push(@utils::plugins, __PACKAGE__);
+}
sub program_names {
__PACKAGE__;

11
debian/patches/check_rbl/disable_solid.net vendored
View file

@ -1,11 +0,0 @@
--- a/check_rbl/src/check_rbl.ini
+++ b/check_rbl/src/check_rbl.ini
@@ -36,7 +36,7 @@
server=blacklist.sci.kun.nl
server=bl.technovision.dk
server=dnsbl.kempt.net
-server=dnsbl.solid.net
+;server=dnsbl.solid.net ; domain offline
server=dul.ru
server=forbidden.icm.edu.pl
server=hil.habeas.com

8
debian/patches/check_rbl/interpreter vendored
View file

@ -1,8 +0,0 @@
--- a/check_rbl/src/check_rbl
+++ b/check_rbl/src/check_rbl
@@ -1,4 +1,4 @@
-#!perl
+#!/usr/bin/perl
package main;

11
debian/patches/check_rbl/pod_encoding_fix vendored
View file

@ -1,11 +0,0 @@
--- a/check_rbl/src/check_rbl.pod
+++ b/check_rbl/src/check_rbl.pod
@@ -6,6 +6,8 @@
=pod
+=encoding utf8
+
=head1 NAME
C<check_rbl> - a Nagios plugin to check if an SMTP server is blacklisted

11
debian/patches/check_rbl/spelling_errors vendored
View file

@ -1,11 +0,0 @@
--- a/check_rbl/src/check_rbl.pod
+++ b/check_rbl/src/check_rbl.pod
@@ -58,7 +58,7 @@ the querying mechanism.
=head1 EXIT STATUS
0 if OK, 1 in case of a warning, 2 in case of a critical status and 3
-in case of an unkown problem
+in case of an unknown problem
=head1 DEPENDENCIES

8
debian/patches/check_snmp_time/epn vendored
View file

@ -1,8 +0,0 @@
--- a/check_snmp_time/check_snmp_time
+++ b/check_snmp_time/check_snmp_time
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_time.pl #################
my $Version='1.1';
# Date : Dec 08 2010

9
debian/patches/check_webinject/epn vendored
View file

@ -1,9 +0,0 @@
--- a/check_webinject/check_webinject
+++ b/check_webinject/check_webinject
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# nagios: +epn
+# nagios: -epn
package Webinject;

13
debian/patches/dsa/check_packages-inifile vendored
View file

@ -1,13 +0,0 @@
--- a/dsa/checks/dsa-check-packages
+++ b/dsa/checks/dsa-check-packages
@@ -37,8 +37,8 @@ use strict;
use warnings;
use English;
-my $IGNORE = "/etc/nagios/obsolete-packages-ignore";
-my $IGNORED = "/etc/nagios/obsolete-packages-ignore.d";
+my $IGNORE = "/etc/nagios-plugins/obsolete-packages-ignore";
+my $IGNORED = "/etc/nagios-plugins/obsolete-packages-ignore.d";
my %CODE = (
'OK' => 0,

11
debian/patches/dsa/check_packages_location vendored
View file

@ -1,11 +0,0 @@
--- a/dsa/sbin/dsa-update-apt-status
+++ b/dsa/sbin/dsa-update-apt-status
@@ -78,7 +78,7 @@ fi
tmp=`tempfile`
trap "rm -f '$tmp'" exit
#/usr/share/dsa/apt-status-check --noupdate --timeout=600 > "$tmp"
-/usr/lib/nagios/plugins/dsa-check-packages > "$tmp"
+/usr/lib/nagios/plugins/check_packages > "$tmp"
result="$?"
case "$result" in
0)

8
debian/patches/dsa/epn vendored
View file

@ -1,8 +0,0 @@
--- a/dsa/checks/dsa-check-packages
+++ b/dsa/checks/dsa-check-packages
@@ -1,4 +1,5 @@
#!/usr/bin/perl
+# nagios: -epn
# dsa-check-packages

73
debian/patches/dsa/security_updates_critical vendored
View file

@ -1,73 +0,0 @@
--- a/dsa/checks/dsa-check-packages
+++ b/dsa/checks/dsa-check-packages
@@ -94,6 +94,7 @@ sub get_packages {
chomp(@lines);
my $pkgname = undef;
+ my $candidate_found = 0;
while (defined($line = shift @lines)) {
if ($line =~ /^([^ ]*):$/) {
# when we have multi-arch capable fu, we require that
@@ -132,8 +133,19 @@ sub get_packages {
} elsif ($line =~ /^ +Installed: (.*)$/) {
# etch dpkg -l does not print epochs, so use this info, it's better
$installed->{$pkgname}{'installed'} = $1;
+ # initialize security-update
+ $installed->{$pkgname}{'security-update'} = 0;
} elsif ($line =~ /^ +Candidate: (.*)$/) {
$installed->{$pkgname}{'candidate'} = $1;
+ } elsif ($line =~ / ([^ ]+) [0-9]+/) {
+ # check if the next lines show the sources of our candidate
+ if ($1 eq $installed->{$pkgname}{'candidate'}) {
+ $candidate_found = 1;
+ } else {
+ $candidate_found = 0;
+ }
+ } elsif (($line =~ / +[0-9]+ [^ ]+\/(security\.([^ ]+\.)?debian\.org|debian-security).*\/updates\//) && $candidate_found ) {
+ $installed->{$pkgname}{'security-update'} = 1;
} elsif ($line =~ /^ +\*\*\*/) {
$line = shift @lines;
my @l = split(/ +/, $line);
@@ -141,7 +153,7 @@ sub get_packages {
}
}
- my (%current, %obsolete, %outofdate);
+ my (%current, %obsolete, %outofdate, %security_outofdate);
for my $pkgname (keys %$installed) {
my $pkg = $installed->{$pkgname};
@@ -151,7 +163,11 @@ sub get_packages {
}
if ($pkg->{'candidate'} ne $pkg->{'installed'}) {
- $outofdate{$pkgname} = $pkg;
+ if ($pkg->{'security-update'}) {
+ $security_outofdate{$pkgname} = $pkg;
+ } else {
+ $outofdate{$pkgname} = $pkg;
+ }
next;
};
if ($pkg->{'origin'} eq '/var/lib/dpkg/status') {
@@ -163,6 +179,7 @@ sub get_packages {
$pkgs{'current'} = \%current;
$pkgs{'outofdate'} = \%outofdate;
+ $pkgs{'security_outofdate'} = \%security_outofdate;
$pkgs{'obsolete'} = \%obsolete;
return \%pkgs;
}
@@ -298,6 +315,12 @@ my @reportform = (
'short' => "%d pc",
'perf' => "prg_conf=%d;1;;0",
'status' => 'WARNING' },
+ { 'key' => 'security_outofdate',
+ 'listpackages' => 1,
+ 'long' => "%d packages with outstanding security updates: %s",
+ 'short' => "%d security-updates",
+ 'perf' => "security_outdated=%d;;1;0",
+ 'status' => 'CRITICAL' },
);
my @longout;

40
debian/patches/dsa/status_directory vendored
View file

@ -1,40 +0,0 @@
--- a/dsa/sbin/dsa-update-apt-status
+++ b/dsa/sbin/dsa-update-apt-status
@@ -22,7 +22,8 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
UPDATE_RUNS=3
-STATUS=/var/cache/dsa/nagios/apt
+STATUSDIR=/var/cache/nagios_status
+STATUS=${STATUSDIR}/apt
SLEEP_MAX=$(( 15 * 60 ))
MAX_AGE=$(( 23 * 60 * 60 ))
@@ -50,6 +51,10 @@ run_required() {
return $norun
}
+if [ ! -d ${STATUSDIR} ]; then
+ mkdir -p ${STATUSDIR}
+fi
+
# do stuff only when required, or when asked to
if [ "${1:-""}" != "-f" ] ; then
run_required || exit 0
--- a/dsa/sbin/dsa-update-unowned-file-status
+++ b/dsa/sbin/dsa-update-unowned-file-status
@@ -22,7 +22,13 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
CUTOFF=40
-STATUS=/var/cache/dsa/nagios/nouser
+STATUSDIR=/var/cache/nagios_status
+STATUS=${STATUSDIR}/nouser
+
+
+if [ ! -d ${STATUSDIR} ]; then
+ mkdir -p ${STATUSDIR}
+fi
tmp=`tempfile`
trap "rm -f '$tmp'" exit

30
debian/patches/series vendored
View file

@ -1,30 +0,0 @@
check_rbl/pod_encoding_fix
check_ajp/return_critical_on_failed_connection
check_raid/prefer_cciss_vol_status_over_hpacucli
check_clamav/clamav_locations
check_nfsmounts/perl_module
check_nfsmounts/nfs_write_location
dsa/security_updates_critical
dsa/check_packages_location
check_libs/config_location
check_libs/config_path
dsa/status_directory
dsa/check_packages-inifile
check_email_delivery/epn
check_email_delivery/paths
check_printer/use_data_dumper_if_needed
check_printer/use_nagios_plugin
check_printer/debian_bts
check_lm_sensors/manpage_whatis_fix
check_lm_sensors/spelling_errors
check_lm_sensors/interpreter
check_rbl/interpreter
check_rbl/spelling_errors
check_rbl/disable_solid.net
check_haproxy/epn
check_httpd_status/epn
check_backuppc/use_nagios_plugins
dsa/epn
check_cups/epn
check_webinject/epn
check_snmp_time/epn