Dzahn has submitted this change and it was merged.
Change subject: icinga: ssl cert checks for external services,pt.2
......................................................................
icinga: ssl cert checks for external services,pt.2
Can't just use one virtual host for all these service checks,
need one for each of them to get proper results and not stuff
like "failed to verify blog.wikimedia.org against icinga.wikimedia.org".
follow-up for T114059 for external services.
Change-Id: I33bd4bb382b524c16bd6ef514ccadacade614899
---
M modules/icinga/manifests/monitor/certs.pp
1 file changed, 9 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/icinga/manifests/monitor/certs.pp
b/modules/icinga/manifests/monitor/certs.pp
index c20f174..a4a39aa 100644
--- a/modules/icinga/manifests/monitor/certs.pp
+++ b/modules/icinga/manifests/monitor/certs.pp
@@ -4,22 +4,25 @@
# external or live on a cluster.
class icinga::monitor::certs {
- @monitoring::host { 'virtual-ssl-host':
- host_fqdn => 'icinga.wikimedia.org'
+ # blog.wikimedia.org (external, Wordpress/Automattic)
+ @monitoring::host { 'blog.wikimedia.org':
+ host_fqdn => 'blog.wikimedia.org'
}
- # blog.wikimedia.org (external, Wordpress/Automattic)
monitoring::service { 'https_blog':
description => 'HTTPS-blog',
check_command => 'check_ssl_http!blog.wikimedia.org',
- host => 'virtual-ssl-host',
+ host => 'blog.wikimedia.org',
}
# policy.wikimedia.org (external, Wordpress/Automattic)
+ @monitoring::host { 'policy.wikimedia.org':
+ host_fqdn => 'policy.wikimedia.org'
+ }
+
monitoring::service { 'https_policy':
description => 'HTTPS-policy',
check_command => 'check_ssl_http!policy.wikimedia.org',
- host => 'virtual-ssl-host',
+ host => 'policy.wikimedia.org',
}
-
}
--
To view, visit https://gerrit.wikimedia.org/r/247919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33bd4bb382b524c16bd6ef514ccadacade614899
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[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
