From 0b6423f9c99d9edf8c96fefd0f6c453859395aa1 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Mon, 30 Sep 2013 00:03:24 +0200 Subject: Import Nagios Plugins site Import the Nagios Plugins web site, Cronjobs, infrastructure scripts, and configuration files. --- web/attachments/127602-check_ntp.diff | 138 ++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 web/attachments/127602-check_ntp.diff (limited to 'web/attachments/127602-check_ntp.diff') diff --git a/web/attachments/127602-check_ntp.diff b/web/attachments/127602-check_ntp.diff new file mode 100644 index 0000000..9c585d0 --- /dev/null +++ b/web/attachments/127602-check_ntp.diff @@ -0,0 +1,138 @@ +Index: plugins-scripts/check_ntp.pl +=================================================================== +--- plugins-scripts/check_ntp.pl (revision 18) ++++ plugins-scripts/check_ntp.pl (working copy) +@@ -270,11 +270,11 @@ + if (/^(\*|\+|\#|o])/) { + ++$candidate; + push (@candidates, $_); +- print "Candiate count= $candidate\n" if ($verbose); ++ print "Candidate count= $candidate\n" if ($verbose); + } + + # match sys.peer or pps.peer +- if (/^(\*|o)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) { ++ if (/^(\*|o)([-0-9.]+)\s+(\S+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) { + $syspeer = $2; + $stratum = $4; + $jitter = $11; +@@ -283,11 +283,14 @@ + print "Jitter_crit = $11 :$jcrit\n" if ($verbose); + $jitter_error = $ERRORS{'CRITICAL'}; + } elsif ($jitter > $jwarn ) { +- print "Jitter_warn = $11 :$jwarn \n" if ($verbose); ++ print "Jitter_warn = $11 :$jwarn\n" if ($verbose); + $jitter_error = $ERRORS{'WARNING'}; + } else { + $jitter_error = $ERRORS{'OK'}; + } ++ } else { ++ print "No match!\n" if $verbose; ++ $jitter = '(not parsed)'; + } + + } +@@ -324,53 +327,53 @@ + if ($ntpdate_error != $ERRORS{'OK'}) { + $state = $ntpdate_error; + if ($ntpdate_error == $ERRORS{'WARNING'} ) { +- $answer = $msg . "\n"; ++ $answer = $msg; + } + else { +- $answer = $msg . "Server for ntp probably down\n"; ++ $answer = $msg . "Server for ntp probably down"; + } + + if (defined($offset) && abs($offset) > $ocrit) { + $state = $ERRORS{'CRITICAL'}; +- $answer = "Server Error and offset $offset sec > +/- $ocrit sec\n"; ++ $answer = "Server Error and offset $offset sec > +/- $ocrit sec"; + } elsif (defined($offset) && abs($offset) > $owarn) { +- $answer = "Server error and offset $offset sec > +/- $owarn sec\n"; ++ $answer = "Server error and offset $offset sec > +/- $owarn sec"; + } elsif (defined($jitter) && abs($jitter) > $jcrit) { +- $answer = "Server error and jitter $jitter msec > +/- $jcrit msec\n"; ++ $answer = "Server error and jitter $jitter msec > +/- $jcrit msec"; + } elsif (defined($jitter) && abs($jitter) > $jwarn) { +- $answer = "Server error and jitter $jitter msec > +/- $jwarn msec\n"; ++ $answer = "Server error and jitter $jitter msec > +/- $jwarn msec"; + } + + } elsif ($have_ntpq && $jitter_error != $ERRORS{'OK'}) { + $state = $jitter_error; +- $answer = "Jitter $jitter too high\n"; ++ $answer = "Jitter $jitter too high"; + if (defined($offset) && abs($offset) > $ocrit) { + $state = $ERRORS{'CRITICAL'}; +- $answer = "Jitter error and offset $offset sec > +/- $ocrit sec\n"; ++ $answer = "Jitter error and offset $offset sec > +/- $ocrit sec"; + } elsif (defined($offset) && abs($offset) > $owarn) { +- $answer = "Jitter error and offset $offset sec > +/- $owarn sec\n"; ++ $answer = "Jitter error and offset $offset sec > +/- $owarn sec"; + } elsif (defined($jitter) && abs($jitter) > $jcrit) { +- $answer = "Jitter error and jitter $jitter msec > +/- $jcrit msec\n"; ++ $answer = "Jitter error and jitter $jitter msec > +/- $jcrit msec"; + } elsif (defined($jitter) && abs($jitter) > $jwarn) { +- $answer = "Jitter error and jitter $jitter msec > +/- $jwarn msec\n"; ++ $answer = "Jitter error and jitter $jitter msec > +/- $jwarn msec"; + } + + } elsif( !$have_ntpq ) { # no errors from ntpdate and no ntpq or ntpq timed out + if (abs($offset) > $ocrit) { + $state = $ERRORS{'CRITICAL'}; +- $answer = "Offset $offset sec > +/- $ocrit sec\n"; ++ $answer = "Offset $offset sec > +/- $ocrit sec"; + } elsif (abs($offset) > $owarn) { + $state = $ERRORS{'WARNING'}; +- $answer = "Offset $offset sec > +/- $owarn sec\n"; ++ $answer = "Offset $offset sec > +/- $owarn sec"; + } elsif (( abs($offset) > $owarn) && $def_jitter ) { + $state = $ERRORS{'WARNING'}; +- $answer = "Offset $offset sec > +/- $owarn sec, ntpq timed out\n"; ++ $answer = "Offset $offset sec > +/- $owarn sec, ntpq timed out"; + } elsif ( $def_jitter ) { + $state = $ERRORS{'WARNING'}; +- $answer = "Offset $offset secs, ntpq timed out\n"; ++ $answer = "Offset $offset secs, ntpq timed out"; + } else{ + $state = $ERRORS{'OK'}; +- $answer = "Offset $offset secs \n"; ++ $answer = "Offset $offset secs "; + } + + +@@ -378,27 +381,27 @@ + } else { # no errors from ntpdate or ntpq + if (abs($offset) > $ocrit) { + $state = $ERRORS{'CRITICAL'}; +- $answer = "Offset $offset sec > +/- $ocrit sec, jitter $jitter msec\n"; ++ $answer = "Offset $offset sec > +/- $ocrit sec, jitter $jitter msec"; + } elsif (abs($jitter) > $jcrit ) { + $state = $ERRORS{'CRITICAL'}; +- $answer = "Jitter $jitter msec> +/- $jcrit msec, offset $offset sec \n"; ++ $answer = "Jitter $jitter msec> +/- $jcrit msec, offset $offset sec"; + } elsif (abs($offset) > $owarn) { + $state = $ERRORS{'WARNING'}; +- $answer = "Offset $offset sec > +/- $owarn sec, jitter $jitter msec\n"; ++ $answer = "Offset $offset sec > +/- $owarn sec, jitter $jitter msec"; + } elsif (abs($jitter) > $jwarn ) { + $state = $ERRORS{'WARNING'}; +- $answer = "Jitter $jitter msec> +/- $jwarn msec, offset $offset sec \n"; ++ $answer = "Jitter $jitter msec> +/- $jwarn msec, offset $offset sec"; + + } else { + $state = $ERRORS{'OK'}; +- $answer = "Offset $offset secs, jitter $jitter msec, peer is stratum $stratum\n"; ++ $answer = "Offset $offset secs, jitter $jitter msec, peer is stratum $stratum"; + } + + } + + foreach my $key (keys %ERRORS) { + if ($state==$ERRORS{$key}) { +- print ("NTP $key: $answer"); ++ print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 . "\n"); + last; + } + } -- cgit v1.2.3-74-g34f1