Switch heartbeat support from maatkit to Percona Toolkit.

Bret Martin · Bret Martin · commit 4529f7e53593 · 2012-11-30T09:18:01.000-05:00
diff --git a/mysql-snmp b/mysql-snmp
@@ -735,7 +735,7 @@ sub fetch_mysql_data {
 
                 # Check replication heartbeat, if present.
                 if ( $opt{heartbeat} ne '' ) {
-                    my $row2 = $dbh->selectrow_arrayref("SELECT GREATEST(0, UNIX_TIMESTAMP() - UNIX_TIMESTAMP(ts) - 1) FROM $opt{heartbeat} WHERE id = 1");
+                    my $row2 = $dbh->selectrow_arrayref("SELECT GREATEST(0, UNIX_TIMESTAMP() - UNIX_TIMESTAMP(ts) - 1) FROM $opt{heartbeat} WHERE server_id != \@\@SERVER_ID ORDER BY ts DESC LIMIT 1");
                     $status{'slave_lag'} = $row2->[0];
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,7 @@ sub fetch_mysql_data {`
`735`	`735`
`736`	`736`	`# Check replication heartbeat, if present.`
`737`	`737`	`if ( $opt{heartbeat} ne '' ) {`
`738`		`- my $row2 = $dbh->selectrow_arrayref("SELECT GREATEST(0, UNIX_TIMESTAMP() - UNIX_TIMESTAMP(ts) - 1) FROM $opt{heartbeat} WHERE id = 1");`
	`738`	`+ my $row2 = $dbh->selectrow_arrayref("SELECT GREATEST(0, UNIX_TIMESTAMP() - UNIX_TIMESTAMP(ts) - 1) FROM $opt{heartbeat} WHERE server_id != \@\@SERVER_ID ORDER BY ts DESC LIMIT 1");`
`739`	`739`	`$status{'slave_lag'} = $row2->[0];`
`740`	`740`	`}`
`741`	`741`