Merge lp:~fraserbn/percona-monitoring-plugins/fix-1040528-pmp-mysql-delay-if-seconds-behind-master-is-zero into lp:percona-monitoring-plugins/1.0

[Brian Fraser]

[Brian Fraser (fraserbn)]

review: Approve

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'nagios/bin/pmp-check-mysql-replication-delay'
--- nagios/bin/pmp-check-mysql-replication-delay	2012-06-11 10:54:55 +0000
+++ nagios/bin/pmp-check-mysql-replication-delay	2012-08-23 15:44:29 +0000
@@ -81,7 +81,9 @@
    # Test whether the delay is too long.
    if [ "$MYSQL_CONN" = 0 ]; then
       NOTE="${LEVEL:-0} seconds of replication delay"
-      if [ "${LEVEL:-0}" -gt "${OPT_CRIT}" ]; then
+      if [ "${LEVEL:-""}" = "NULL" ]; then
+         NOTE="UNK replica is stopped"
+      elif [ "${LEVEL:-0}" -gt "${OPT_CRIT}" ]; then
          NOTE="CRIT $NOTE"
       elif [ "${LEVEL:-0}" -gt "${OPT_WARN}" ]; then
          NOTE="WARN $NOTE"

=== modified file 't/nagios/pmp-check-mysql-replication-delay/check-functions.sh'
--- t/nagios/pmp-check-mysql-replication-delay/check-functions.sh	2012-02-20 02:50:12 +0000
+++ t/nagios/pmp-check-mysql-replication-delay/check-functions.sh	2012-08-23 15:44:29 +0000
@@ -10,3 +10,11 @@
 
 echo "should print CRIT 10 seconds of replication delay"
 main -c 9 samples/show-slave-status-001.txt 
+
+echo "should print UNK if the slave is not running"
+out=`main samples/show-slave-status-002.txt`
+if [ "${out:-""}" = "UNK replica is stopped" ]; then
+   echo "ok"
+else
+   echo "not ok"
+fi

=== added file 't/nagios/pmp-check-mysql-replication-delay/samples/show-slave-status-002.txt'
--- t/nagios/pmp-check-mysql-replication-delay/samples/show-slave-status-002.txt	1970-01-01 00:00:00 +0000
+++ t/nagios/pmp-check-mysql-replication-delay/samples/show-slave-status-002.txt	2012-08-23 15:44:29 +0000
@@ -0,0 +1,39 @@
+*************************** 1. row ***************************
+               Slave_IO_State: Waiting for master to send event
+                  Master_Host: master.db
+                  Master_User: replication
+                  Master_Port: 3306
+                Connect_Retry: 60
+              Master_Log_File: mysql-bin.000545
+          Read_Master_Log_Pos: 521709851
+               Relay_Log_File: mysql-relay.001273
+                Relay_Log_Pos: 4871334
+        Relay_Master_Log_File: mysql-bin.000545
+             Slave_IO_Running: Yes
+            Slave_SQL_Running: Yes
+              Replicate_Do_DB: 
+          Replicate_Ignore_DB: 
+           Replicate_Do_Table: 
+       Replicate_Ignore_Table: 
+      Replicate_Wild_Do_Table: 
+  Replicate_Wild_Ignore_Table: 
+                   Last_Errno: 0
+                   Last_Error: 
+                 Skip_Counter: 0
+          Exec_Master_Log_Pos: 521709851
+              Relay_Log_Space: 4871528
+              Until_Condition: None
+               Until_Log_File: 
+                Until_Log_Pos: 0
+           Master_SSL_Allowed: Yes
+           Master_SSL_CA_File: /mnt/data-store/mysql/ca-cert.pem
+           Master_SSL_CA_Path: 
+              Master_SSL_Cert: /mnt/data-store/mysql/client-cert.pem
+            Master_SSL_Cipher: 
+               Master_SSL_Key: /mnt/data-store/mysql/client-key.pem
+        Seconds_Behind_Master: NULL
+Master_SSL_Verify_Server_Cert: No
+                Last_IO_Errno: 0
+                Last_IO_Error: 
+               Last_SQL_Errno: 0
+               Last_SQL_Error: