Jcrespo has submitted this change and it was merged.
Change subject: Small formatting fixes for replication lag check
......................................................................
Small formatting fixes for replication lag check
* Restrict output to 2 decimals
* Check if lag is "" in addition to NULL (e.g. due to permission
denied)
Bug: T114752
Change-Id: I3b088833807be8b2ca095ee67d6934e358672a49
---
M files/icinga/check_mariadb.pl
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jcrespo: Looks good to me, approved
Volans: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/files/icinga/check_mariadb.pl b/files/icinga/check_mariadb.pl
index 84b0612..f3c2a53 100755
--- a/files/icinga/check_mariadb.pl
+++ b/files/icinga/check_mariadb.pl
@@ -195,7 +195,7 @@
my $lag =
$heartbeat->{lag}?$heartbeat->{lag}/1000000:$status->{Seconds_Behind_Master};
- if ($lag eq "NULL") {
+ if ($lag eq "NULL" or $lag eq "") {
# Either IO or SQL threads stopped? WARN
if ($status->{Slave_IO_Running} ne "Yes" ||
$status->{Slave_SQL_Running} ne "Yes") {
if ($warn_stopped == 1) {
@@ -214,19 +214,19 @@
}
# Small lag? OK
if ($lag < $sql_lag_warn) {
- printf("%s %s Replication lag: %s seconds\n",
+ printf("%s %s Replication lag: %.2f seconds\n",
$OK, $check, $lag);
exit($EOK);
}
# Medium lag? WARN
if ($lag < $sql_lag_crit) {
- printf("%s %s Replication lag: %s seconds\n",
+ printf("%s %s Replication lag: %.2f seconds\n",
$WARN, $check, $lag);
exit($EWARN);
}
- printf("%s %s Replication lag: %s seconds\n",
+ printf("%s %s Replication lag: %.2f seconds\n",
$CRIT, $check, $lag);
exit($ECRIT);
}
--
To view, visit https://gerrit.wikimedia.org/r/271815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b088833807be8b2ca095ee67d6934e358672a49
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo <[email protected]>
Gerrit-Reviewer: Jcrespo <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
