Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

monitoring: add more wildcard SSL monitoring #3836

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 41 additions & 1 deletion modules/monitoring/templates/ssl.conf.erb
Expand Up @@ -8,6 +8,46 @@ apply Service "wc.miraheze.org" {
assign where "sslchecks" in host.groups
}

apply Service "wc.orain.org" {
import "generic-service"
check_command = "check_ssl_expire"
notes_url = "https://meta.miraheze.org/wiki/Tech:Icinga/MediaWiki_Monitoring#SSL_Validity_Checks"
vars.host = "orain.org"
vars.time = "30"

assign where "sslchecks" in host.groups
}

apply Service "wc.wiki.surf" {
import "generic-service"
check_command = "check_ssl_expire"
notes_url = "https://meta.miraheze.org/wiki/Tech:Icinga/MediaWiki_Monitoring#SSL_Validity_Checks"
vars.host = "wiki.surf"
vars.time = "30"

assign where "sslchecks" in host.groups
}

apply Service "wc.wikitide.net" {
import "generic-service"
check_command = "check_ssl_expire"
notes_url = "https://meta.miraheze.org/wiki/Tech:Icinga/MediaWiki_Monitoring#SSL_Validity_Checks"
vars.host = "wikitide.net"
vars.time = "30"

assign where "sslchecks" in host.groups
}

apply Service "wc.wikitide.org" {
import "generic-service"
check_command = "check_ssl_expire"
notes_url = "https://meta.miraheze.org/wiki/Tech:Icinga/MediaWiki_Monitoring#SSL_Validity_Checks"
vars.host = "wikitide.org"
vars.time = "30"

assign where "sslchecks" in host.groups
}

apply Service "m.miraheze.org - LetsEncrypt" {
import "generic-service"
check_command = "check_ssl_expire"
Expand Down Expand Up @@ -37,7 +77,7 @@ apply Service "<%= property['url'] %> - reverse DNS" {
check_interval = 30m
notes_url = "https://meta.miraheze.org/wiki/Tech:Icinga/MediaWiki_Monitoring#Reverse_DNS_Checks"
vars.hostname = "<%= property['url'] %>"
vars.regex = "^(test|cp)[0-9]+\\.(miraheze\\.org|wikitide\\.net)$$"
vars.regex = "^(test|cp)[0-9]+\\.wikitide\\.net$$"
assign where "sslchecks" in host.groups
}
<% end -%>