From e78212cf65e8e8b5531dec573b3477e1745d1c79 Mon Sep 17 00:00:00 2001
From: Cyberes <cyberes@evulid.cc>
Date: Sat, 6 Apr 2024 00:05:11 -0600
Subject: [PATCH] check_curl: change print check_mysql_slave: fix exit code

---
 check_curl.sh        | 12 ++++++------
 check_mysql_slave.py |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/check_curl.sh b/check_curl.sh
index 0195e13..93d33e5 100755
--- a/check_curl.sh
+++ b/check_curl.sh
@@ -386,11 +386,11 @@ if [ $CURL_EXIT -ne 0 ]; then
     msg="CRITICAL - An internal call to poll() or select() returned error that is not recoverable"
     ;;
   *)
-    echo "UNKNOWN - $CURL_EXIT -> $URL"
+    echo "UNKNOWN - $CURL_EXIT"
     exit 3
     ;;
   esac
-  echo "$msg -> $URL"
+  echo "$msg"
   exit 2
 fi
 
@@ -400,20 +400,20 @@ perfdata="response_time=${RESPONSE_TIME_MS}ms;${WARN_TIME};${CRIT_TIME};0;"
 # Check HTTP code
 if [ -n "$EXPECTED_STATUS_CODE" ]; then
   if [ "$HTTP_CODE" -ne "$EXPECTED_STATUS_CODE" ]; then
-    echo "CRITICAL - server returned HTTP code $HTTP_CODE, expected $EXPECTED_STATUS_CODE -> $URL"
+    echo "CRITICAL - server returned HTTP code $HTTP_CODE, expected $EXPECTED_STATUS_CODE"
     exit 2
   fi
 elif [ "$IGNORE_STATUS" != "yes" ] && [ "$HTTP_CODE" -ne 200 ]; then
-  echo "CRITICAL - server returned HTTP code $HTTP_CODE -> $URL"
+  echo "CRITICAL - server returned HTTP code $HTTP_CODE"
   exit 2
 fi
 
 # Check response time
 if [ $(echo "$RESPONSE_TIME_MS > $CRIT_TIME" | bc) -eq 1 ]; then
-  echo "CRITICAL - Response time $RESPONSE_TIME seconds -> $URL | $perfdata"
+  echo "CRITICAL - Response time $RESPONSE_TIME seconds | $perfdata"
   exit 2
 elif [ $(echo "$RESPONSE_TIME_MS > $WARN_TIME" | bc) -eq 1 ]; then
-  echo "WARNING - response time $RESPONSE_TIME seconds -> $URL | $perfdata"
+  echo "WARNING - response time $RESPONSE_TIME seconds | $perfdata"
   exit 1
 fi
 
diff --git a/check_mysql_slave.py b/check_mysql_slave.py
index ce90b91..1e7f96b 100755
--- a/check_mysql_slave.py
+++ b/check_mysql_slave.py
@@ -85,13 +85,13 @@ def main(args):
                 if replication_delay <= crit_deviation_min:
                     exit_code = nagios.STATE_CRIT
                     exit_msg.append('Replication is delayed!')
-                if replication_delay >= crit_deviation_max:
+                elif replication_delay >= crit_deviation_max:
                     exit_code = nagios.STATE_CRIT
                     exit_msg.append('Replication is ahead???')
-                if replication_delay <= warn_deviation_min:
+                elif replication_delay <= warn_deviation_min:
                     exit_code = nagios.STATE_WARN
                     exit_msg.append('Replication is delayed!')
-                if replication_delay >= warn_deviation_max:
+                elif replication_delay >= warn_deviation_max:
                     exit_code = nagios.STATE_WARN
                     exit_msg.append('Replication is ahead???')