Yuvipanda has submitted this change and it was merged.
Change subject: shinken: Make betalabs http checks specify address explicitly
......................................................................
shinken: Make betalabs http checks specify address explicitly
It's not really a 'host' as such, so using $HOSTADDRESS$ is weird,
and causes problems (such as mobile check failing because it is
hitting desktop warnish)
Change-Id: I6c4500e1d95b56afbee59e5a4020ef33b72ef003
---
M modules/beta/files/shinken.cfg
M modules/nagios_common/files/checkcommands.cfg
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/beta/files/shinken.cfg b/modules/beta/files/shinken.cfg
index 7c0c4e3..0cf284d 100644
--- a/modules/beta/files/shinken.cfg
+++ b/modules/beta/files/shinken.cfg
@@ -9,14 +9,14 @@
define service {
service_description English Wikipedia Main page
host_name beta-cluster
- check_command
check_http_url_for_string!en.wikipedia.beta.wmflabs.org!/wiki/Main_Page?debug=true!Wikipedia
+ check_command
check_http_url_at_address_for_string!en.wikipedia.beta.wmflabs.org!/wiki/Main_Page?debug=true!Wikipedia
use generic-service
}
define service {
service_description English Wikipedia Mobile Main page
host_name beta-cluster
- check_command
check_http_url_for_string!en.m.wikipedia.beta.wmflabs.org!/wiki/Main_Page?debug=true!Wikipedia
+ check_command
check_http_url_at_address_for_string!en.m.wikipedia.beta.wmflabs.org!/wiki/Main_Page?debug=true!Wikipedia
use generic-service
}
diff --git a/modules/nagios_common/files/checkcommands.cfg
b/modules/nagios_common/files/checkcommands.cfg
index 195145d..2943e8f 100644
--- a/modules/nagios_common/files/checkcommands.cfg
+++ b/modules/nagios_common/files/checkcommands.cfg
@@ -248,6 +248,11 @@
}
define command{
+ command_name check_http_url_at_address_for_string
+ command_line $USER1$/check_http -H $ARG1$ -I $ARG1$ -u $ARG2$ -s $ARG3$
+ }
+
+define command{
command_name check_http_url_for_string
command_line $USER1$/check_http -H $ARG1$ -I $HOSTADDRESS$ -u $ARG2$ -s
$ARG3$
}
--
To view, visit https://gerrit.wikimedia.org/r/183779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c4500e1d95b56afbee59e5a4020ef33b72ef003
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Hashar <[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
