Merge branch 'feature/nagios-output'

* feature/nagios-output:
  #3 Wording: db updates -> db migrations
  #3 Improve short output and performance data

Author: cytopia

CHANGELOG.md

@@ -1,6 +1,13 @@
 Version 0.3 (unreleased)
 -----------
 
+- [Fea]		Added performance data: Sec Updates
+- [Fea]		Added performance data: Updates
+- [Fea]		Added performance data: Core errors
+- [Fea]		Added performance data: Core warnings
+- [Fea]		Added performance data: DB migrations
+- [Fea]		Improved short output
+
 
 Version 0.2
 -----------

README.md

@@ -1,5 +1,5 @@
 # check_drupal
-Nagios drupal plugin to monitor the state of a drupal site for security updates, system updates, core errors, core warnings and missing db updates.
+Nagios drupal plugin to monitor the state of a drupal site for security updates, system updates, core errors, core warnings and missing database migrations.
 
 [![Build Status](https://travis-ci.org/cytopia/check_drupal.svg?branch=master)](https://travis-ci.org/cytopia/check_drupal)
  [![Latest Stable Version](https://poser.pugx.org/cytopia/check_drupal/v/stable)](https://packagist.org/packages/cytopia/check_drupal) [![Total Downloads](https://poser.pugx.org/cytopia/check_drupal/downloads)](https://packagist.org/packages/cytopia/check_drupal) [![Latest Unstable Version](https://poser.pugx.org/cytopia/check_drupal/v/unstable)](https://packagist.org/packages/cytopia/check_drupal) [![License](https://poser.pugx.org/cytopia/check_drupal/license)](http://opensource.org/licenses/MIT)
@@ -32,7 +32,7 @@ I would recommend the second option as you do not check each drupal site every 5
 ##### Features
 * Check for Drupal security updates
 * Check for Drupal system updates
-* Check for Drupal required database updates
+* Check for Drupal required database migrations
 * Check for Drupal core errors
 * Check for Drupal core warnings
 * Every check can specify its own nagios severity (Error or Warning)
@@ -59,7 +59,7 @@ OR     check_drupal --version
 
 Nagios plugin that will check drupal sites for errors.
 Errors include the following: available security updates,
-missed database updates and drupal status errors.
+missed database migrations and drupal status errors.
 For each check you can specify the nagios severity (error or warning).
 
   -d <drupal root>       The full path to the drupal document root (usually
@@ -90,7 +90,7 @@ For each check you can specify the nagios severity (error or warning).
                          Warning:  -w w
                          Error:    -w e
 
-  -m <w|e>               [optional] Check for drupal missed database updates
+  -m <w|e>               [optional] Check for drupal missed database migrations
                          and return nagios error or warning. (They can occur
                          when you update core or modules and forget the db).
                          Warning:  -m w
@@ -135,7 +135,7 @@ Also to note: The first line until the `|` represents the actual nagios output.
 **Check for security updates**
 ```bash
 ./check_drupal -d /shared/httpd/sites-drupal/COOL-PROJECT/drupal/ -n COOL-PROJECT -s e
-[ERROR] COOL-PROJECT has errors: Security update(s) | 'OK'=0;;;0;1 'Errors'=1;1;1;0;1 'Warnings'=0;1;;0;1 'Unknown'=0;;;0;1
+[CRITICAL] COOL-PROJECT has errors: 2 Security updates | 'Security Updates'=2;;;; 'Updates'=0;;;; 'Core Errors'=0;;;; 'Core Warnings'=0;;;; 'Database Migrations'=0;;;; 'OK'=0;;;0;1 'Errors'=1;1;1;0;1 'Warnings'=0;1;;0;1 'Unknown'=0;;;0;1
 ==== SECURITY UPDATES ====
 [CRITICAL] drupal 7.40 -> 7.41
 [CRITICAL] jquery_update 7.x-2.6 -> 7.x-2.7
@@ -144,27 +144,29 @@ Also to note: The first line until the `|` represents the actual nagios output.
 **Check for security and normal updates**
 ```bash
 ./check_drupal -d /shared/httpd/sites-drupal/COOL-PROJECT/drupal/ -n COOL-PROJECT -s e -u w
-[ERROR] COOL-PROJECT has errors: Security update(s), Update(s) | 'OK'=0;;;0;2 'Errors'=1;1;1;0;2 'Warnings'=1;1;;0;2 'Unknown'=0;;;0;2
+[CRITICAL] COOL-PROJECT has errors: 3 Security updates, 3 Updates | 'Security Updates'=3;;;; 'Updates'=3;;;; 'Core Errors'=0;;;; 'Core Warnings'=0;;;; 'Database Migrations'=0;;;; 'OK'=0;;;0;2 'Errors'=1;1;1;0;2 'Warnings'=1;1;;0;2 'Unknown'=0;;;0;2
 ==== SECURITY UPDATES ====
 [CRITICAL] drupal 7.40 -> 7.41
+[CRITICAL] block_class 7.x-2.1 -> 7.x-2.3
 [CRITICAL] jquery_update 7.x-2.6 -> 7.x-2.7
 ==== SYSTEM UPDATES ====
 [WARNING] field_collection 7.x-1.0-beta9 -> 7.x-1.0-beta10
 [WARNING] views 7.x-3.11 -> 7.x-3.13
-[WARNING] bootstrap 7.x-3.0 -> 7.x-3.1
+[WARNING] bootstrap 7.x-3.0 -> 7.x-3.4
 ```
 
 **Check for all possible stuff**
 ```bash
 ./check_drupal -d /shared/httpd/sites-drupal/COOL-PROJECT/drupal/ -n COOL-PROJECT -s e -u w -e e -w w -m e
-[ERROR] COOL-PROJECT has errors: Security update(s), Update(s), Core error(s), Core warning(s) | 'OK'=1;;;0;5 'Errors'=2;1;1;0;5 'Warnings'=2;1;;0;5 'Unknown'=0;;;0;5
+[CRITICAL] COOL-PROJECT has errors: 3 Security updates, 3 Updates, 5 Core errors, 1 Core warning | 'Security Updates'=3;;;; 'Updates'=3;;;; 'Core Errors'=5;;;; 'Core Warnings'=1;;;; 'Database Migrations'=0;;;; 'OK'=1;;;0;5 'Errors'=2;1;1;0;5 'Warnings'=2;1;;0;5 'Unknown'=0;;;0;5
 ==== SECURITY UPDATES ====
 [CRITICAL] drupal 7.40 -> 7.41
+[CRITICAL] block_class 7.x-2.1 -> 7.x-2.3
 [CRITICAL] jquery_update 7.x-2.6 -> 7.x-2.7
 ==== SYSTEM UPDATES ====
 [WARNING] field_collection 7.x-1.0-beta9 -> 7.x-1.0-beta10
 [WARNING] views 7.x-3.11 -> 7.x-3.13
-[WARNING] bootstrap 7.x-3.0 -> 7.x-3.1
+[WARNING] bootstrap 7.x-3.0 -> 7.x-3.4
 ==== CORE ERRORS ====
 [CRITICAL] CKeditor
 [CRITICAL] Cron-Wartungsaufgaben
@@ -174,14 +176,14 @@ Also to note: The first line until the `|` represents the actual nagios output.
 ==== CORE WARNINGS ====
 [WARNING] Token
 ==== DB UPDATES ====
-[OK] No database updates required
+[OK] No database migrations required
 ```
 **Check for db updates**
 ```bash
 ./check_drupal -d /shared/httpd/sites-drupal/COOL-PROJECT/drupal/ -n COOL-PROJECT -m e
-[OK] COOL-PROJECT is healthy | 'OK'=1;;;0;1 'Errors'=0;1;1;0;1 'Warnings'=0;1;;0;1 'Unknown'=0;;;0;1
+[OK] COOL-PROJECT is healty | 'Security Updates'=0;;;; 'Updates'=0;;;; 'Core Errors'=0;;;; 'Core Warnings'=0;;;; 'Database Migrations'=0;;;; 'OK'=1;;;0;1 'Errors'=0;1;1;0;1 'Warnings'=0;1;;0;1 'Unknown'=0;;;0;1
 ==== DB UPDATES ====
-[OK] No database updates required
+[OK] No database migrations required
 ```
 
 ## 3. Nagios Configuration
@@ -202,7 +204,7 @@ $ARG1$:        /var/www/cool-drupal-project/drupal/
 $ARG2$:        Cool Drupal Project
 $ARG3$:        -s e -u w -e e -w w -m e
 ```
-The above service defintion will check against security updates (with nagios error), against normal updates (with nagios warning), against core errors (with nagios error), against core warnings (with nagios warning) and finally against missed database updates (with nagios error).
+The above service defintion will check against security updates (with nagios error), against normal updates (with nagios warning), against core errors (with nagios error), against core warnings (with nagios warning) and finally against missed database migrations (with nagios error).
 
 ### 3.2 check_drupal_log
 

bin/check_drupal

@@ -13,9 +13,9 @@
 INFO_NAME="check_drupal"
 INFO_AUTHOR="Patrick Plocke <patrick@plocke.de>"
 INFO_GPGKEY="0x28BF179F"
-INFO_DATE="2015-12-09"
+INFO_DATE="2015-12-19"
 INFO_LICENSE="MIT"
-INFO_VERSION="0.2"
+INFO_VERSION="0.3"
 
 # Get the path
 export PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
@@ -455,7 +455,7 @@ print_help() {
 	# Show help and details
 	printf "Nagios plugin that will check drupal sites for errors.\n"
 	printf "Errors include the following: available security updates,\n"
-	printf "missed database updates and drupal status errors.\n"
+	printf "missed database migrations and drupal status errors.\n"
 	printf "For each check you can specify the nagios severity (error or warning).\n\n"
 
 	printf "  -d <drupal root>       The full path to the drupal document root (usually\n"
@@ -486,7 +486,7 @@ print_help() {
 	printf "                         Warning:  -w w\n"
 	printf "                         Error:    -w e\n\n"
 
-	printf "  -m <w|e>               [optional] Check for drupal missed database updates\n"
+	printf "  -m <w|e>               [optional] Check for drupal missed database migrations\n"
 	printf "                         and return nagios error or warning. (They can occur\n"
 	printf "                         when you update core or modules and forget the db).\n"
 	printf "                         Warning:  -m w\n"
@@ -559,11 +559,11 @@ MSG_CORE_WARNING=""
 MSG_DB_UPDATE=""
 
 # Info for normal Status message if there is an error/warning
-HAS_SECURITY_UPDATE_ERROR=""
-HAS_SYSTEM_UPDATE_ERROR=""
-HAS_CORE_ERR_ERROR=""
-HAS_CORE_WARN_ERROR=""
-HAS_DB_UPDATE_ERROR=""
+CNT_SECURITY_UPDATE_ERROR="0"
+CNT_SYSTEM_UPDATE_ERROR="0"
+CNT_CORE_ERR_ERROR="0"
+CNT_CORE_WARN_ERROR="0"
+CNT_DB_UPDATE_ERROR="0"
 
 # Count warnings and errors for performance data
 CNT_ALL=0
@@ -706,6 +706,9 @@ if [ -n "$CHECK_S" ]; then
 
 	# Merge exit codes
 	if [ "$TMP_EXIT" != "0" ]; then
+		# Count lines as number of issues
+		CNT_SECURITY_UPDATE_ERROR="$(echo "${MSG_SECURITY_UPDATE}" | wc -l | xargs)"
+
 		if [ "$SEVERITY" = "$EXIT_ERR" ]; then
 			CNT_ERROR=$((CNT_ERROR+1))
 			MSG_SECURITY_UPDATE="$(prepend_line "${MSG_SECURITY_UPDATE}" "[CRITICAL] ")"
@@ -717,7 +720,6 @@ if [ -n "$CHECK_S" ]; then
 			MSG_SECURITY_UPDATE="==== SECURITY UPDATES ====\n${MSG_SECURITY_UPDATE}"
 			NAGIOS_EXIT="$(merge_exit_codes "$NAGIOS_EXIT" "1")"
 		fi
-		HAS_SECURITY_UPDATE_ERROR="true"
 	else
 		CNT_OK=$((CNT_OK+1))
 		MSG_SECURITY_UPDATE="==== SECURITY UPDATES ====\n[OK] No Security updates required"
@@ -739,6 +741,9 @@ if [ -n "$CHECK_U" ]; then
 
 	# Merge exit codes
 	if [ "$TMP_EXIT" != "0" ]; then
+		# Count lines as number of issues
+		CNT_SYSTEM_UPDATE_ERROR="$(echo "${MSG_SYSTEM_UPDATE}" | wc -l | xargs)"
+
 		if [ "$SEVERITY" = "$EXIT_ERR" ]; then
 			CNT_ERROR=$((CNT_ERROR+1))
 			MSG_SYSTEM_UPDATE="$(prepend_line "${MSG_SYSTEM_UPDATE}" "[CRITICAL] ")"
@@ -750,7 +755,6 @@ if [ -n "$CHECK_U" ]; then
 			MSG_SYSTEM_UPDATE="==== SYSTEM UPDATES ====\n${MSG_SYSTEM_UPDATE}"
 			NAGIOS_EXIT="$(merge_exit_codes "$NAGIOS_EXIT" "1")"
 		fi
-		HAS_SYSTEM_UPDATE_ERROR="true"
 	else
 		CNT_OK=$((CNT_OK+1))
 		MSG_SYSTEM_UPDATE="==== SYSTEM UPDATES ====\n[OK]\nNo Updates required"
@@ -772,6 +776,9 @@ if [ -n "$CHECK_E" ]; then
 
 	# Merge exit codes
 	if [ "$TMP_EXIT" != "0" ]; then
+		# Count lines as number of issues
+		CNT_CORE_ERR_ERROR="$(echo "${MSG_CORE_ERROR}" | wc -l | xargs)"
+
 		if [ "$SEVERITY" = "$EXIT_ERR" ]; then
 			CNT_ERROR=$((CNT_ERROR+1))
 			MSG_CORE_ERROR="$(prepend_line "${MSG_CORE_ERROR}" "[CRITICAL] ")"
@@ -783,7 +790,6 @@ if [ -n "$CHECK_E" ]; then
 			MSG_CORE_ERROR="==== CORE ERRORS ====\n${MSG_CORE_ERROR}"
 			NAGIOS_EXIT="$(merge_exit_codes "$NAGIOS_EXIT" "1")"
 		fi
-		HAS_CORE_ERR_ERROR="true"
 	else
 		CNT_OK=$((CNT_OK+1))
 		MSG_CORE_ERROR="==== CORE ERRORS ====\n[OK] No core errors"
@@ -805,6 +811,9 @@ if [ -n "$CHECK_W" ]; then
 
 	# Merge exit codes
 	if [ "$TMP_EXIT" != "0" ]; then
+		# Count lines as number of issues
+		CNT_CORE_WARN_ERROR="$(echo "${MSG_CORE_WARNING}" | wc -l | xargs)"
+
 		if [ "$SEVERITY" = "$EXIT_ERR" ]; then
 			CNT_ERROR=$((CNT_ERROR+1))
 			MSG_CORE_WARNING="$(prepend_line "${MSG_CORE_WARNING}" "[CRITICAL] ")"
@@ -816,7 +825,6 @@ if [ -n "$CHECK_W" ]; then
 			MSG_CORE_WARNING="==== CORE WARNINGS ====\n${MSG_CORE_WARNING}"
 			NAGIOS_EXIT="$(merge_exit_codes "$NAGIOS_EXIT" "1")"
 		fi
-		HAS_CORE_WARN_ERROR="true"
 	else
 		CNT_OK=$((CNT_OK+1))
 		MSG_CORE_WARNING="==== CORE WARNINGS ====\n[OK] No core warnings"
@@ -838,6 +846,9 @@ if [ -n "$CHECK_M" ]; then
 
 	# Merge exit codes
 	if [ "$TMP_EXIT" != "0" ]; then
+		# Count lines as number of issues
+		CNT_DB_UPDATE_ERROR="$(echo "${MSG_DB_UPDATE}" | wc -l | xargs)"
+
 		if [ "$SEVERITY" = "$EXIT_ERR" ]; then
 			CNT_ERROR=$((CNT_ERROR+1))
 			MSG_DB_UPDATE="$(prepend_line "${MSG_DB_UPDATE}" "[CRITICAL] ")"
@@ -849,10 +860,9 @@ if [ -n "$CHECK_M" ]; then
 			MSG_DB_UPDATE="==== DB UPDATES ====\n${MSG_DB_UPDATE}"
 			NAGIOS_EXIT="$(merge_exit_codes "$NAGIOS_EXIT" "1")"
 		fi
-		HAS_DB_UPDATE_ERROR="true"
 	else
 		CNT_OK=$((CNT_OK+1))
-		MSG_DB_UPDATE="==== DB UPDATES ====\n[OK] No database updates required"
+		MSG_DB_UPDATE="==== DB UPDATES ====\n[OK] No database migrations required"
 		NAGIOS_EXIT="$(merge_exit_codes "$NAGIOS_EXIT" "0")"
 	fi
 	CNT_ALL=$((CNT_ALL+1))
@@ -866,53 +876,87 @@ fi
 
 #### Build status text
 INFO=""
-if [ "$HAS_SECURITY_UPDATE_ERROR" != "" ]; then
-	INFO="$(merge_text "${INFO}" "Security update(s)" ", ")"
+if [ "$CNT_SECURITY_UPDATE_ERROR" != "0" ]; then
+	if [ "$CNT_SECURITY_UPDATE_ERROR" = "1" ]; then
+		INFO="$(merge_text "${INFO}" "1 Security update" ", ")"
+	else
+		INFO="$(merge_text "${INFO}" "${CNT_SECURITY_UPDATE_ERROR} Security updates" ", ")"
+	fi
 fi
-if [ "$HAS_SYSTEM_UPDATE_ERROR" != "" ]; then
-	INFO="$(merge_text "${INFO}" "Update(s)" ", ")"
+if [ "$CNT_SYSTEM_UPDATE_ERROR" != "0" ]; then
+	if [ "$CNT_SYSTEM_UPDATE_ERROR" = "1" ]; then
+		INFO="$(merge_text "${INFO}" "1 Update" ", ")"
+	else
+		INFO="$(merge_text "${INFO}" "${CNT_SYSTEM_UPDATE_ERROR} Updates" ", ")"
+	fi
 fi
-if [ "$HAS_CORE_ERR_ERROR" != "" ]; then
-	INFO="$(merge_text "${INFO}" "Core error(s)" ", ")"
+if [ "$CNT_CORE_ERR_ERROR" != "0" ]; then
+	if [ "$CNT_CORE_ERR_ERROR" = "1" ]; then
+		INFO="$(merge_text "${INFO}" "1 Core error" ", ")"
+	else
+		INFO="$(merge_text "${INFO}" "${CNT_CORE_ERR_ERROR} Core errors" ", ")"
+	fi
 fi
-if [ "$HAS_CORE_WARN_ERROR" != "" ]; then
-	INFO="$(merge_text "${INFO}" "Core warning(s)" ", ")"
+if [ "$CNT_CORE_WARN_ERROR" != "0" ]; then
+	if [ "$CNT_CORE_WARN_ERROR" = "1" ]; then
+		INFO="$(merge_text "${INFO}" "1 Core warning" ", ")"
+	else
+		INFO="$(merge_text "${INFO}" "${CNT_CORE_WARN_ERROR} Core warnings" ", ")"
+	fi
 fi
-if [ "$HAS_DB_UPDATE_ERROR" != "" ]; then
-	INFO="$(merge_text "${INFO}" "DB update(s)" ", ")"
+if [ "$CNT_DB_UPDATE_ERROR" != "0" ]; then
+	if [ "$CNT_DB_UPDATE_ERROR" = "1" ]; then
+		INFO="$(merge_text "${INFO}" "1 DB migration" ", ")"
+	else
+		INFO="$(merge_text "${INFO}" "${CNT_DB_UPDATE_ERROR} DB migrations" ", ")"
+	fi
 fi
 
-
-#### Performance Data
-# @see http://docs.icinga.org/latest/en/perfdata.html
-# 'label'=value[UOM];[warn];[crit];[min];[max]
-
+#### Short output (std status)
 OUTPUT=""
 if [ "$NAGIOS_EXIT" = "$EXIT_OK" ]; then
-	OUTPUT="$(printf "%s | %s\n" "[OK] ${DRUPAL_NAME} is healthy" "'OK'=${CNT_OK};;;0;${CNT_ALL} 'Errors'=${CNT_ERROR};1;1;0;${CNT_ALL} 'Warnings'=${CNT_WARNING};1;;0;${CNT_ALL} 'Unknown'=0;;;0;${CNT_ALL}")"
+	OUTPUT="$(printf "[OK] %s is healty" "${DRUPAL_NAME}")"
 elif [ "$NAGIOS_EXIT" = "$EXIT_WARN" ]; then
-	OUTPUT="$(printf "%s: %s | %s\n" "[WARN] ${DRUPAL_NAME} has warnings" "${INFO}" "'OK'=${CNT_OK};;;0;${CNT_ALL} 'Errors'=${CNT_ERROR};1;1;0;${CNT_ALL} 'Warnings'=${CNT_WARNING};1;;0;${CNT_ALL} 'Unknown'=0;;;0;${CNT_ALL}")"
+	OUTPUT="$(printf "[WARNING] %s has warnings: %s" "${DRUPAL_NAME}" "${INFO}")"
 elif [ "$NAGIOS_EXIT" = "$EXIT_ERR" ]; then
-	OUTPUT="$(printf "%s: %s | %s\n" "[ERROR] ${DRUPAL_NAME} has errors" "${INFO}" "'OK'=${CNT_OK};;;0;${CNT_ALL} 'Errors'=${CNT_ERROR};1;1;0;${CNT_ALL} 'Warnings'=${CNT_WARNING};1;;0;${CNT_ALL} 'Unknown'=0;;;0;${CNT_ALL}")"
+	OUTPUT="$(printf "[CRITICAL] %s has errors: %s" "${DRUPAL_NAME}" "${INFO}")"
 else
-	OUTPUT="$(printf "%s: %s | %s\n" "[UNKNOWN] ${DRUPAL_NAME} is at unknown state - check extended info." "${INFO}" "OK'=0;;;0;${CNT_ALL} 'Errors'=${CNT_ERROR};1;1;0;${CNT_ALL} 'Warnings'=${CNT_WARNING};1;;0;${CNT_ALL} 'Unknown'=1;;;0;${CNT_ALL}")"
+	OUTPUT="$(printf "[UNKNOWN] %s is at unknown state - check extended info" "${DRUPAL_NAME}")"
 fi
 
+
+#### Performance Data
+# @see http://docs.icinga.org/latest/en/perfdata.html
+# 'label'=value[UOM];[warn];[crit];[min];[max]
+PERF=""
+PERF="$(printf "%s'Security Updates'=%d;;;; "    "${PERF}" "${CNT_SECURITY_UPDATE_ERROR}")"
+PERF="$(printf "%s'Updates'=%d;;;; "             "${PERF}" "${CNT_SYSTEM_UPDATE_ERROR}")"
+PERF="$(printf "%s'Core Errors'=%d;;;; "         "${PERF}" "${CNT_CORE_ERR_ERROR}")"
+PERF="$(printf "%s'Core Warnings'=%d;;;; "       "${PERF}" "${CNT_CORE_WARN_ERROR}")"
+PERF="$(printf "%s'Database Migrations'=%d;;;; " "${PERF}" "${CNT_DB_UPDATE_ERROR}")"
+
+PERF="$(printf "%s'OK'=%d;;;0;%d "        "${PERF}" "${CNT_OK}"      "${CNT_ALL}")"
+PERF="$(printf "%s'Errors'=%d;1;1;0;%d "  "${PERF}" "${CNT_ERROR}"   "${CNT_ALL}")"
+PERF="$(printf "%s'Warnings'=%d;1;;0;%d " "${PERF}" "${CNT_WARNING}" "${CNT_ALL}")"
+PERF="$(printf "%s'Unknown'=0;;;0;%d "    "${PERF}" "${CNT_ALL}")"
+
+
 #### Extended status data
 if [ "$MSG_SECURITY_UPDATE" != "" ]; then E_OUTPUT="$(merge_text "${E_OUTPUT}" "${MSG_SECURITY_UPDATE}" "\n")"; fi
 if [ "$MSG_SYSTEM_UPDATE"   != "" ]; then E_OUTPUT="$(merge_text "${E_OUTPUT}" "${MSG_SYSTEM_UPDATE}" "\n")";   fi
 if [ "$MSG_CORE_ERROR"      != "" ]; then E_OUTPUT="$(merge_text "${E_OUTPUT}" "${MSG_CORE_ERROR}" "\n")";      fi
 if [ "$MSG_CORE_WARNING"    != "" ]; then E_OUTPUT="$(merge_text "${E_OUTPUT}" "${MSG_CORE_WARNING}" "\n")";    fi
 if [ "$MSG_DB_UPDATE"       != "" ]; then E_OUTPUT="$(merge_text "${E_OUTPUT}" "${MSG_DB_UPDATE}" "\n")";       fi
 
+
 #### Log to file?
 if [ -n "$LOGGING" ]; then
-	echo "${OUTPUT}"		 > "$LOGGING"
-	echo "${E_OUTPUT}"		>> "$LOGGING"
-	echo "${NAGIOS_EXIT}"	>> "$LOGGING"
+	echo "${OUTPUT} | ${PERF}"	 > "$LOGGING"
+	echo "${E_OUTPUT}"			>> "$LOGGING"
+	echo "${NAGIOS_EXIT}"		>> "$LOGGING"
 	exit 0
 else
-	echo "${OUTPUT}"
+	echo "${OUTPUT} | ${PERF}"
 	echo "${E_OUTPUT}"
 	exit "$NAGIOS_EXIT"
 fi