Dzahn has submitted this change and it was merged.
Change subject: cassandra: add instance ssl monitoring
......................................................................
cassandra: add instance ssl monitoring
Bug: T120662
Change-Id: I93d2e34c059ba0155b48a68c8e6127df8ca32a21
---
M modules/cassandra/manifests/instance/monitoring.pp
M modules/nagios_common/files/check_commands/check_ssl.cfg
2 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/cassandra/manifests/instance/monitoring.pp
b/modules/cassandra/manifests/instance/monitoring.pp
index df48a05..1013cae 100644
--- a/modules/cassandra/manifests/instance/monitoring.pp
+++ b/modules/cassandra/manifests/instance/monitoring.pp
@@ -34,4 +34,11 @@
check_command => "check_tcp_ip!${listen_address}!9042",
contact_group => $contact_group,
}
+
+ # SSL cert expiration monitoring (T120662)
+ monitoring::service { "${service_name}-ssl":
+ description => "${service_name} SSL ${listen_address}:7001",
+ check_command =>
"check_ssl_http_on_host_port!${::hostname}-${instance_name}!${listen_address}!7001",
+ contact_group => $contact_group,
+ }
}
diff --git a/modules/nagios_common/files/check_commands/check_ssl.cfg
b/modules/nagios_common/files/check_commands/check_ssl.cfg
index 32dbebd..519a97e 100644
--- a/modules/nagios_common/files/check_commands/check_ssl.cfg
+++ b/modules/nagios_common/files/check_commands/check_ssl.cfg
@@ -9,6 +9,11 @@
command_line $USER1$/check_ssl --warning 60 --critical 30 -H
$HOSTADDRESS$ --cn $ARG1$ -p $ARG2$
}
+define command{
+ command_name check_ssl_http_on_host_port
+ command_line $USER1$/check_ssl --warning 60 --critical 30 --cn $ARG1$
-H $ARG2$ -p $ARG3$
+}
+
# check SSL certs on LDAP servers
define command{
command_name check_ssl_ldap
--
To view, visit https://gerrit.wikimedia.org/r/305633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I93d2e34c059ba0155b48a68c8e6127df8ca32a21
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Eevans <eev...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
