Merge lp:~revin/percona-monitoring-plugins/zabbix-running-slave into lp:percona-monitoring-plugins

[Jervin R]

By default the Zabbix wrapper get_mysql_stats_wrapper.sh checks a slave blindly even if a node is not supposed to be a slave. You can workaround this by stacking the templates from Zabbix and disabling the slave checks for non-slaves, however this does not work for HA like PRM where solave roles can move. I've added support for indicating node role into a file /etc/zabbix_agentd.conf.d/PERCONA_NODE_TYPE (master|prm|or empty/no file). For 'prm' it will consult crm_mon, for master, it will simply return a successful value.

Unmerged revisions

181. By Jervin R on 2014-10-12

Changed return to 0 when crm_mon fails

180. By Jervin R on 2014-10-12

Better slave-running monitoring with known node types

=== modified file 'zabbix/scripts/get_mysql_stats_wrapper.sh'
--- zabbix/scripts/get_mysql_stats_wrapper.sh	2014-07-11 12:26:49 +0000
+++ zabbix/scripts/get_mysql_stats_wrapper.sh	2014-10-12 06:36:14 +0000
@@ -6,16 +6,39 @@
 # This program is part of $PROJECT_NAME$
 # License: GPL License (see COPYING)
 # Copyright: $CURRENT_YEAR$ Percona
-# Authors: Roman Vynar
+# Authors: Roman Vynar, Jervin Real
 
 ITEM=$1
 HOST=localhost
 DIR=`dirname $0`
 CMD="/usr/bin/php -q $DIR/ss_get_mysql_stats.php --host $HOST --items gg"
 CACHEFILE="/tmp/$HOST-mysql_cacti_stats.txt"
+ME=$(uname -n)
+NODE_TYPE_FILE=/etc/zabbix_agentd.conf.d/PERCONA_NODE_TYPE
 
 if [ "$ITEM" = "running-slave" ]; then
     # Check for running slave
+    if [ -f $NODE_TYPE_FILE ]; then
+        TYPE=$(cat $NODE_TYPE_FILE)
+        if [ "$TYPE" == "prm" ]; then
+            # We check the command first and see if
+            # it has no issues, if there's an error
+            # we return 0 since cannot check
+            /usr/sbin/crm_mon -A1 > /dev/null 2>&1
+            if [ "$?" -ne "0" ]; then echo 0; exit; fi
+            # Then we check if our node is a slave
+            # If its not marked as slave, we return 1
+            /usr/sbin/crm_mon -A1 | egrep "Slave.*${ME}" > /dev/null 2>&1
+            if [ "$?" -ne "0" ]; then 
+                echo 1
+                exit 
+            fi
+        elif [ "$TYPE" == "master" ]; then
+            echo 1
+            exit
+        fi
+    fi
+
     RES=`HOME=~zabbix mysql -e 'SHOW SLAVE STATUS\G' | egrep '(Slave_IO_Running|Slave_SQL_Running):' | awk -F: '{print $2}' | tr '\n' ','`
     if [ "$RES" = " Yes, Yes," ]; then
         echo 1