===================================================================
RCS file: /cvs/nagios/check_openbgpd/check_openbgpd,v
retrieving revision 1.3
retrieving revision 1.13
diff -u -r1.3 -r1.13
--- nagios/check_openbgpd/check_openbgpd	2009/11/19 19:52:51	1.3
+++ nagios/check_openbgpd/check_openbgpd	2024/06/10 00:09:20	1.13
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# $RedRiver: check_openbgpd,v 1.2 2009/11/13 22:23:24 andrew Exp $
+# $AFresh1: check_openbgpd,v 1.12 2024/06/09 23:02:37 afresh1 Exp $
 ########################################################################
 # check_openbgpd *** A nagios check for OpenBSD bgpd
 #
@@ -9,13 +9,14 @@
 use warnings;
 
 use 5.010;
+use if $] >= 5.016, experimental => 'switch';
 
 local %ENV = ();
 
 my $NAGIOS_OUTPUT = 1;
 
 my $LICENSE = <<'EOL';
-Copyright (c) 2009 Andrew Fresh <andrew@afresh1.com>
+Copyright (c) 2009-2024 Andrew Fresh <andrew@afresh1.com>
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
 copyright notice and this permission notice appear in all copies.
@@ -56,7 +57,7 @@
     exit $ERRORS{'OK'};
 }
 
-my @STATUS = read_status();
+my @STATUS = read_status( $CHECKS{_SOCKET} );
 my %STATES = check_status( \@STATUS, \%CHECKS );
 
 my $have_results = 0;
@@ -89,12 +90,17 @@
 exit $ERRORS{$state};
 
 sub read_status {
-    my ($status) = @_;
+    my ($socket) = @_;
     my @S;
 
-    #open my $fh, '<', 'output'    # XXX
-    open my $fh, '-|', $BGPCTL, 'show', 'summary'
-        or die "Couldn't open bgpctl: $!\n";
+    my @cmd = ($BGPCTL);
+    if ($socket) {
+        push @cmd, '-s', $socket;
+    }
+    push @cmd, 'show', 'summary';
+
+    #open my $fh, '<', 'output' or die $!; # XXX
+    open my $fh, '-|', @cmd or die "Couldn't open bgpctl: $!\n";
     while (<$fh>) {
         chomp;
         push @S, parse_line($_);
@@ -128,7 +134,11 @@
 sub parse_check {
     my $check = shift;
 
-    return { match => [] } unless $check;
+    unless ($check) {
+        print_help();
+        exit $ERRORS{'OK'}
+    }
+
     my @values = split /,\s*/xms, $check;
 
     my %c = ( match => [] );
@@ -157,14 +167,14 @@
     my ( $S, $C ) = @_;
 
     my %states;
-    my %neighbors;
+    my %neighbors = map { $_ => $C->{$_} } qw( _SOCKET _UNKNOWN );
 STATE: foreach my $s ( @{$S} ) {
         my $n = $s->{neighbor};
         $neighbors{$n} = $s;
 
         my $result;
 
-        if ( my $c = $C->{$n} ) {
+        if ( my $c = $C->{$n} || $C->{_UNKNOWN} ) {
         CODE: foreach my $code ( 'CRITICAL', 'WARNING' ) {
                 next CODE if ( ref $c->{$code} ne 'HASH' );
                 my $data = $s->{state};
@@ -215,7 +225,7 @@
             return 'State (' . $d . ') is not numeric';
         }
 
-    DIRECTION: foreach my $dir qw( low high ) {
+    DIRECTION: foreach my $dir (qw( low high )) {
             if ( !$c->{$dir} ) { next DIRECTION; }
 
             my $check = $c->{$dir};
@@ -258,23 +268,33 @@
         state( $w, $c );
 
         my $opt = shift @argv;
-        given ($opt) {
-            when ( '-V' || '--version' ) {
-                print_revision( $PROGNAME, '$Revision: 1.3 $ ' );
+        for ($opt) {
+            if ( $_ eq '-V' || $_ eq '--version' ) {
+                print_revision( $PROGNAME, '$Revision: 1.13 $ ' );
                 exit $ERRORS{'OK'}
             }
-            when (/^-?-h(?:elp)?/xms)     { print_help(); exit $ERRORS{'OK'} }
-            when (/^-?-w(?:arning)?/xms)  { $w = parse_check( shift @argv ) }
-            when (/^-?-c(?:ritical)?/xms) { $c = parse_check( shift @argv ) }
-            when (/^-?-n(?:eighbor)?/xms) {
+            elsif (/^-?-h(?:elp)?\Z/xms) { print_help(); exit $ERRORS{'OK'} }
+            elsif (/^-?-s(?:ocket)?\Z/xms) {
+                $checks{_SOCKET} = shift @argv
+                    || do { print_help(); exit $ERRORS{'OK'} }
+            }
+            elsif (/^-?-w(?:arning)?\Z/xms)  { $w = parse_check( shift @argv ) }
+            elsif (/^-?-c(?:ritical)?\Z/xms) { $c = parse_check( shift @argv ) }
+            elsif (/^-?-u(?:nknown)?\Z/xms) {
+                $checks{_UNKNOWN} = {
+                    WARNING  => $w,
+                    CRITICAL => $c,
+                };
+            }
+            elsif (/^-?-n(?:eighbor)?\Z/xms) {
                 while ( @argv && $argv[0] !~ /^-/xms ) {
                     $checks{ shift @argv } = {
-                        WARNING      => $w,
-                            CRITICAL => $c
-                    }
+                        WARNING  => $w,
+                        CRITICAL => $c,
+                    };
                 }
             }
-            default { print_help(); exit $ERRORS{'UNKNOWN'} }
+            else { print_help(); exit $ERRORS{'UNKNOWN'} }
         }
     }
     return %checks;
@@ -283,15 +303,22 @@
 sub print_help {
     print <<"EOL";
 $PROGNAME - checks status of OpenBGPd peers
-    $PROGNAME [ -w ENTRY ][ -c ENTRY ][ -n NEIGHBOR [ NEIGHBOR2 ] ]
+    $PROGNAME [ -s SOCKET ][ -w ENTRY ][ -c ENTRY ]( -u | -n NEIGHBOR )
 
 Usage:
+    -s, --socket SOCKET
+        Path to bgpd socket to use. See -r in bgpd(8).
     -w, --warning RANGE or single ENTRY
         Exit with WARNING status if outside of RANGE or if != ENTRY
+        May be entered multiple times.
     -c, --critical RANGE or single ENTRY
         Exit with CRITICAL status if outside of RANGE or if != ENTRY
+        May be entered multiple times.
     -n, --neighbor NEIGHBOR
-        The name of the Neighbor
+        The name of the Neighbor, can be a space separated list of neighbors.
+        May be entered multiple times.
+    -u, --unknown
+        As if you specified -n for all unknown neighbors
 
 ENTRY is a comma separated list of items to match against.  Each item can be
 a RANGE or it will just be matched against the status.
@@ -312,18 +339,10 @@
 the output causes a CRITICAL result.
 
 Any time a NEIGHBOR that is NOT specified on the command line shows up in the
-output causes a CRITICAL result.
+output causes a CRITICAL result.  If -u is specified, it treats NEIGHBOR as if
+it were specified at that position.
 
 
-$PROGNAME -w 10:300 -c 10:500 -n P1 P2 -n P3
-
-CRITICAL 
-    If any of P1, P2, P3 are below 10, above 500 or any non-numeric value.
-
-WARNING
-    If any of P1, P2, P3 are above 300.
-
-
 $PROGNAME -c Idle -n P1 -c 1:1 -n P2 -w 200:300 -c Active,10: -n P3
 
 CRITICAL
@@ -335,20 +354,30 @@
     If P3 is above 10 and below 200 or above 300.
 
 
-$PROGNAME -n P1 -w 50%:70% -c 10%:90% -n P2 P3
+$PROGNAME -u -w 50%:70% -c 10%:90% -n P2 P3
 
-No checks on P1
+No checks of unknown neighbors.
 
 CRITICAL
     If P2 or P3 do not have max-prefix set or if they do but learned prefixes
-    are below 10% or above 90% of max-prefix.
+    are below 10% or above 90% of max-prefix or any non-numeric value.
 
 WARNING
-    If P2 or P3 have learned prefixes below 50% or above 90% of max-prefix.
+    If P2 or P3 have learned prefixes below 50% or above 70% of max-prefix.
 
+
+$PROGNAME -w 50%:70% -c 10%:90% -u
+
+CRITICAL
+    If any neighbor does not have max-prefix set or if they do but learned
+    prefixes are below 10% or above 90% of max-prefix or any non-numeric value.
+
+WARNING
+    If any neighbor have learned prefixes below 50% or above 70% of max-prefix.
+
 EOL
 
-    print_revision( $PROGNAME, '$Revision: 1.3 $' );
+    print_revision( $PROGNAME, '$Revision: 1.13 $' );
 
     print $LICENSE;