Yuvipanda has submitted this change and it was merged.
Change subject: nagios_common: Rename check_http_generic appropriately
......................................................................
nagios_common: Rename check_http_generic appropriately
Was. Not. Very. Generic.
Change-Id: I77104a53b58794f518d47a6eb19f485488f48407
---
M modules/nagios_common/files/checkcommands.cfg
M modules/varnish/manifests/instance.pp
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/nagios_common/files/checkcommands.cfg
b/modules/nagios_common/files/checkcommands.cfg
index 2c8b791..88f092e 100644
--- a/modules/nagios_common/files/checkcommands.cfg
+++ b/modules/nagios_common/files/checkcommands.cfg
@@ -225,9 +225,9 @@
command_line $USER1$/check_http -H bits.wikimedia.org -I $HOSTADDRESS$
-u /skins/common/images/poweredby_mediawiki_88x31.png
}
-# 'check_http_generic' command definition
+# 'check_http_varnish' command definition
define command{
- command_name check_http_generic
+ command_name check_http_varnish
command_line $USER1$/check_http -H $ARG1$ -p $ARG2$ -I $HOSTADDRESS$ -u
/wikimedia-monitoring-test
}
diff --git a/modules/varnish/manifests/instance.pp
b/modules/varnish/manifests/instance.pp
index bbdf54e..ed77ba7 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -119,6 +119,6 @@
monitoring::service { "varnish http ${title}":
description => "Varnish HTTP ${title}",
- check_command => "check_http_generic!varnishcheck!${port}"
+ check_command => "check_http_varnish!varnishcheck!${port}"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/177719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77104a53b58794f518d47a6eb19f485488f48407
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Dzahn <[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
