From ef75eb41872dfd009550486d4a18dfbbee2ab11a Mon Sep 17 00:00:00 2001
From: Peter Newman <peternewman@users.noreply.github.com>
Date: Wed, 17 Nov 2021 13:55:20 +0000
Subject: [PATCH 1/2] Whitespace tidy and fix some typos in
 check_nagios_latency

---
 plugins/check_nagios_latency | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugins/check_nagios_latency b/plugins/check_nagios_latency
index bd0b915..9a75e9f 100755
--- a/plugins/check_nagios_latency
+++ b/plugins/check_nagios_latency
@@ -24,14 +24,14 @@ function print_help() {
 }
 
 function test_integer() {
-  LABEL=$1 
+  LABEL=$1
   VALUE=$2
-  
+
   if ! echo $VALUE | grep -qE '^[0-9]+(\.[0-9]+)?$' ; then
      OUTPUT="$LABEL has no integer value ($VALUE)! Please correct this parameter"
      EXITCODE=3
   fi
-  
+
 }
 
 #defaults
@@ -39,8 +39,8 @@ EXITCODE=0
 WARNING=120 # Warning at 2 minutes
 CRITICAL=180 # Critical at 3 minutes
 
-if [ ! -x $NAGIOSTATS ]; then
-  OUTPUT="Please correct path to nagiostats ($NAGIOSTATS)"
+if [ ! -x $NAGIOSSTATS ]; then
+  OUTPUT="Please correct path to nagiostats ($NAGIOSSTATS)"
   EXITCODE=3
 fi
 
@@ -60,7 +60,7 @@ test_integer "-c" $CRITICAL
 test_integer "-w" $WARNING
 
 if [ $EXITCODE -eq 0 ]; then
-  LATENCY=`$NAGIOSTATS  | awk '/Active Service Latency/ {print $8}' `
+  LATENCY=`$NAGIOSSTATS  | awk '/Active Service Latency/ {print $8}' `
   LATENCY_INT=`echo $LATENCY | cut -f1 -d"." `
   if [ $LATENCY_INT -ge $CRITICAL ]; then
     OUTPUT="CRITICAL: Latency at $LATENCY seconds! | latency=$LATENCY;$WARNING;$CRITICAL"
@@ -70,9 +70,8 @@ if [ $EXITCODE -eq 0 ]; then
     EXITCODE=1
   else
     OUTPUT="OK: Latency at $LATENCY seconds. | latency=$LATENCY;$WARNING;$CRITICAL"
-  fi fi 
+  fi fi
 fi
 
 echo $OUTPUT
 exit $EXITCODE
-

From 29d3396638713abb19957f184c79c30ec0172857 Mon Sep 17 00:00:00 2001
From: Peter Newman <peternewman@users.noreply.github.com>
Date: Wed, 17 Nov 2021 13:58:01 +0000
Subject: [PATCH 2/2] Handle Nagios 4 in check_nagios_latency

---
 plugins/check_nagios_latency | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/check_nagios_latency b/plugins/check_nagios_latency
index 9a75e9f..aaf017b 100755
--- a/plugins/check_nagios_latency
+++ b/plugins/check_nagios_latency
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# Path to nagiostats
-NAGIOSTATS="/usr/sbin/nagios3stats"
-
 PROGNAME=`basename $0`
 
 #functions
@@ -39,8 +36,16 @@ EXITCODE=0
 WARNING=120 # Warning at 2 minutes
 CRITICAL=180 # Critical at 3 minutes
 
+# Path to nagiosstats
+NAGIOSSTATS3="/usr/sbin/nagios3stats"
+NAGIOSSTATS4="/usr/sbin/nagios4stats"
+NAGIOSSTATS=$NAGIOSSTATS3
+if [ -x $NAGIOSSTATS4 ]; then
+  NAGIOSSTATS=$NAGIOSSTATS4
+fi
+
 if [ ! -x $NAGIOSSTATS ]; then
-  OUTPUT="Please correct path to nagiostats ($NAGIOSSTATS)"
+  OUTPUT="Please correct path to nagiosstats ($NAGIOSSTATS)"
   EXITCODE=3
 fi