BBlack has submitted this change and it was merged.
Change subject: fix piwiki and grafana-admin HTTP checks for 401
......................................................................
fix piwiki and grafana-admin HTTP checks for 401
Change-Id: I5195859f36a0bc93491372ff4a7481d917e219c1
---
M manifests/role/grafana.pp
M modules/nagios_common/files/checkcommands.cfg
M modules/role/manifests/piwik/server.pp
3 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/manifests/role/grafana.pp b/manifests/role/grafana.pp
index 9c347f8..8a57789 100644
--- a/manifests/role/grafana.pp
+++ b/manifests/role/grafana.pp
@@ -175,7 +175,7 @@
monitoring::service { 'grafana':
description => 'grafana.wikimedia.org',
- check_command => 'check_http_url!grafana.wikimedia.org!/',
+ check_command => 'check_http_unauthorized!grafana.wikimedia.org!/',
}
apache::site { 'grafana-admin.wikimedia.org':
diff --git a/modules/nagios_common/files/checkcommands.cfg
b/modules/nagios_common/files/checkcommands.cfg
index 482b62d..7f9a574 100644
--- a/modules/nagios_common/files/checkcommands.cfg
+++ b/modules/nagios_common/files/checkcommands.cfg
@@ -102,6 +102,11 @@
command_line $USER1$/check_http -S -H $HOSTADDRESS$ -p $ARG1$ -e $ARG2$
}
+define command {
+ command_name check_http_unauthorized
+ command_line $USER1$/check_http -I $HOSTADDRESS$ -h $ARG1$ -u $ARG2$ -e
"HTTP/1.1 401 "
+ }
+
# 'check_local_disk' command definition
define command {
command_name check_local_disk
diff --git a/modules/role/manifests/piwik/server.pp
b/modules/role/manifests/piwik/server.pp
index c8361c3..c6fd73a 100644
--- a/modules/role/manifests/piwik/server.pp
+++ b/modules/role/manifests/piwik/server.pp
@@ -62,7 +62,7 @@
monitoring::service { 'piwik':
description => 'piwik.wikimedia.org',
- check_command => 'check_http_url!piwik.wikimedia.org!/',
+ check_command => 'check_http_unauthorized!piwik.wikimedia.org!/',
}
file_line { 'enable_php_opcache':
--
To view, visit https://gerrit.wikimedia.org/r/292959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5195859f36a0bc93491372ff4a7481d917e219c1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
