Rush has submitted this change and it was merged.
Change subject: collapse icinga monitoring for tools
......................................................................
collapse icinga monitoring for tools
to make 287723 viable
Change-Id: Ie87926715906b7538502402c522fea35a6bdf617
---
M manifests/role/icinga.pp
M manifests/site.pp
M modules/icinga/manifests/monitor/certs.pp
D modules/icinga/manifests/monitor/paws.pp
R modules/icinga/manifests/monitor/toollabs.pp
5 files changed, 24 insertions(+), 27 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/icinga.pp b/manifests/role/icinga.pp
index bfe3a7f..d500b4f 100644
--- a/manifests/role/icinga.pp
+++ b/manifests/role/icinga.pp
@@ -17,7 +17,7 @@
include icinga::nsca::daemon
include icinga::monitor::wikidata
include icinga::monitor::ores
- include icinga::monitor::paws
+ include icinga::monitor::toollabs
include icinga::monitor::stream
include icinga::monitor::ripeatlas
include icinga::monitor::legal
diff --git a/manifests/site.pp b/manifests/site.pp
index 44cc1fd..919b52b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1426,9 +1426,6 @@
include base::firewall
include standard
include ldap::role::client::labs
-
- # Monitoring checks for toollabs that page
- include toollabs::monitoring::icinga
}
# labcontrol1002 is a hot spare for 1001. Switching it on
diff --git a/modules/icinga/manifests/monitor/certs.pp
b/modules/icinga/manifests/monitor/certs.pp
index 2ccf990..36a4756 100644
--- a/modules/icinga/manifests/monitor/certs.pp
+++ b/modules/icinga/manifests/monitor/certs.pp
@@ -34,10 +34,6 @@
host => 'eventdonations.wikimedia.org',
}
- # toolserver.org (redirect page to Tool Labs)
- @monitoring::host { 'www.toolserver.org':
- host_fqdn => 'www.toolserver.org'
- }
monitoring::service { 'https_toolserver':
description => 'HTTPS-toolserver',
check_command => 'check_ssl_http!www.toolserver.org',
@@ -55,9 +51,6 @@
}
# *.wmflabs.org (labs wildcard cert, testing tools.wmflabs.org)
- @monitoring::host { 'tools.wmflabs.org':
- host_fqdn => 'tools.wmflabs.org'
- }
monitoring::service { 'https_wmflabs':
description => 'HTTPS-wmflabs',
check_command => 'check_ssl_http!tools.wmflabs.org',
diff --git a/modules/icinga/manifests/monitor/paws.pp
b/modules/icinga/manifests/monitor/paws.pp
deleted file mode 100644
index b1954e4..0000000
--- a/modules/icinga/manifests/monitor/paws.pp
+++ /dev/null
@@ -1,15 +0,0 @@
-# monitoring of https://meta.wikimedia.org/wiki/PAWS
-class icinga::monitor::paws {
-
- @monitoring::host { 'paws.wmflabs.org':
- host_fqdn => 'paws.wmflabs.org',
- }
-
- monitoring::service { 'paws_main_page':
- description => 'PAWS Main page',
- check_command => 'check_http_url!paws.wmflabs.org!/paws/hub/login',
- host => 'paws.wmflabs.org',
- contact_group => 'team-paws',
- }
-
-}
diff --git a/modules/toollabs/manifests/monitoring/icinga.pp
b/modules/icinga/manifests/monitor/toollabs.pp
similarity index 82%
rename from modules/toollabs/manifests/monitoring/icinga.pp
rename to modules/icinga/manifests/monitor/toollabs.pp
index e1bcb95..4252b27 100644
--- a/modules/toollabs/manifests/monitoring/icinga.pp
+++ b/modules/icinga/manifests/monitor/toollabs.pp
@@ -1,4 +1,26 @@
-class toollabs::monitoring::icinga {
+# Tool Labs end points worth production monitoring
+#
+# * relevant cert expirary is monitored in
+# icinga::monitor::certs
+
+class icinga::monitor::toollabs {
+
+ # toolserver.org (redirect page to Tool Labs)
+ @monitoring::host { 'www.toolserver.org':
+ host_fqdn => 'www.toolserver.org'
+ }
+
+ # monitoring of https://meta.wikimedia.org/wiki/PAWS
+ @monitoring::host { 'paws.wmflabs.org':
+ host_fqdn => 'paws.wmflabs.org',
+ }
+
+ monitoring::service { 'paws_main_page':
+ description => 'PAWS Main page',
+ check_command => 'check_http_url!paws.wmflabs.org!/paws/hub/login',
+ host => 'paws.wmflabs.org',
+ contact_group => 'team-paws',
+ }
# this homepage is served by a tool running within tools
# itself. on a bastion 'become admin' to see source and
--
To view, visit https://gerrit.wikimedia.org/r/288011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie87926715906b7538502402c522fea35a6bdf617
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
