Marostegui has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/326124 )
Change subject: check_mariadb.pl: Fix small display issue
......................................................................
check_mariadb.pl: Fix small display issue
The current regular expression was showing the following on Icinga:
CRITICAL slave_sql_state Slave_SQL_Running: No, Errno: 1062, Errmsg:
Error 'Duplicate entry 'MANUALLY REMOVED' for key 'PRIMARY'' on query. Default
database: 'commonswiki'. Query: [snipped]2
The value "2" wasn't being filtered.
This commit has been tested on dbstore1001 (which is having that issue)
and it displays the following instead:
CRITICAL slave_sql_state Slave_SQL_Running: No, Errno: 1062, Errmsg:
Error 'Duplicate entry 'MANUALLY REMOVED' for key 'PRIMARY'' on query. Default
database: 'commonswiki'. [Query snipped]
The new script can be tested at dbstore1001:/home/marostegui
Bug: T152766
Change-Id: Ie14d1f963bae7d70b642cc6e9278836c2c330cd5
---
M modules/icinga/files/check_mariadb.pl
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Marostegui: Looks good to me, approved
jenkins-bot: Verified
Jcrespo: Looks good to me, but someone else must approve
diff --git a/modules/icinga/files/check_mariadb.pl
b/modules/icinga/files/check_mariadb.pl
index 489347a..2f5766d 100755
--- a/modules/icinga/files/check_mariadb.pl
+++ b/modules/icinga/files/check_mariadb.pl
@@ -153,7 +153,7 @@
exit($EOK);
}
# sanitize the query for icinga:
- $status->{Last_SQL_Error} =~ s/Query:\s+'(.*)'/Query: [snipped]/;
+ $status->{Last_SQL_Error} =~ s/Query.*$/[Query snipped]/;
# Both SQL and IO threads running? OK
if ($status->{Slave_SQL_Running} eq "Yes") {
--
To view, visit https://gerrit.wikimedia.org/r/326124
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie14d1f963bae7d70b642cc6e9278836c2c330cd5
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui <maroste...@wikimedia.org>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Marostegui <maroste...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
