Dzahn has submitted this change and it was merged. Change subject: add monitoring for search.wm (Apple dict bridge) ......................................................................
add monitoring for search.wm (Apple dict bridge) see RT #6128 for the request for this to be added adds the check to a mediawiki role, not to search module, because search.wikmedia.org is the Apple dict bridge and the Apache site for it is configured in mw module and unrelated to elastic then uses the role class on terbium, so that we just get a single monitoring check, we don't want one per appserver. so gotta put it somewhere and terbium is mwdeploy obviously not creating the virtual monitoring host anymore as in PS1, just using terbium we are checking this URL: https://search.wikimedia.org/?lang=en&site=wikipedia&search=Wikimedia_Foundation&limit=1 for the string "Wikimedia_Foundation" Change-Id: I69537a84ba225b51900ae1078cce88ec25d3b514 RT: 6128 --- M manifests/role/mediawiki.pp M manifests/site.pp M modules/nagios_common/files/checkcommands.cfg 3 files changed, 19 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp index 41c8682..762b826 100644 --- a/manifests/role/mediawiki.pp +++ b/manifests/role/mediawiki.pp @@ -125,3 +125,15 @@ runners_gwt => 1, } } + +# monitor the Apple dictionary bridge (RT #6128) +class role::mediawiki::searchmonitor { + + # https://search.wikimedia.org/?lang=en&site=wikipedia&search=Wikimedia_Foundation&limit=1 + monitor_service { 'mediawiki-dict-bridge': + description => 'Mediawiki Apple Dictionary Bridge', + check_command => 'check_https_dictbridge', + } + +} + diff --git a/manifests/site.pp b/manifests/site.pp index 0a29a63..7786ed8 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2610,6 +2610,7 @@ include generic::wikidev-umask include misc::deployment::common_scripts include role::noc + include role::mediawiki::searchmonitor $domain_search = [ 'wikimedia.org', diff --git a/modules/nagios_common/files/checkcommands.cfg b/modules/nagios_common/files/checkcommands.cfg index cb633bb..2c8b791 100644 --- a/modules/nagios_common/files/checkcommands.cfg +++ b/modules/nagios_common/files/checkcommands.cfg @@ -462,3 +462,9 @@ command_name check_https_phabricator command_line /usr/lib/nagios/plugins/check_http -S -H 'phabricator.wikimedia.org' -I misc-web-lb.eqiad.wikimedia.org -u 'https://phabricator.wikimedia.org/' -s 'Wikimedia and MediaWiki' } + +# check the Apple dictionary bridge on search.wm.org +define command{ + command_name check_https_dictbridge + command_line /usr/lib/nagios/plugins/check_http -S -H 'search.wikimedia.org' -u 'https://search.wikimedia.org/?lang=en&site=wikipedia&search=Wikimedia_Foundation&limit=1' -s 'Wikimedia_Foundation' + } -- To view, visit https://gerrit.wikimedia.org/r/171193 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I69537a84ba225b51900ae1078cce88ec25d3b514 Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> Gerrit-Reviewer: Chad <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: JanZerebecki <[email protected]> Gerrit-Reviewer: John F. Lewis <[email protected]> Gerrit-Reviewer: Matanya <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: Yuvipanda <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
