Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333010 )
Change subject: nagios: fix check_ssl_http_on_port misnomer
......................................................................
nagios: fix check_ssl_http_on_port misnomer
check_ssl isn't HTTP(S)-specific at all. We have an check_ssl_http
definition which passes port 443, so that name makes sense, but on the
other hand the check_ssl_on_port and check_ssl_on_host_port names don't
make any sense at all and could even mislead into thinking that this
actually does some kind of HTTP-level check.
s/http_// on these to disambiguate.
Change-Id: Id7c9acf4eaa3afdab4fadc595161846e36cee1cf
---
M modules/cassandra/manifests/instance/monitoring.pp
M modules/elasticsearch/manifests/https.pp
M modules/nagios_common/files/check_commands/check_ssl.cfg
3 files changed, 6 insertions(+), 6 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 14806a1..68f098f 100644
--- a/modules/cassandra/manifests/instance/monitoring.pp
+++ b/modules/cassandra/manifests/instance/monitoring.pp
@@ -39,7 +39,7 @@
if hiera('cassandra::tls_cluster_name', '') {
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",
+ check_command =>
"check_ssl_on_host_port!${::hostname}-${instance_name}!${listen_address}!7001",
contact_group => $contact_group,
}
}
diff --git a/modules/elasticsearch/manifests/https.pp
b/modules/elasticsearch/manifests/https.pp
index 1186d5b..27c32f6 100644
--- a/modules/elasticsearch/manifests/https.pp
+++ b/modules/elasticsearch/manifests/https.pp
@@ -47,7 +47,7 @@
} -> ::monitoring::service { 'elasticsearch-https':
ensure => $ensure,
description => 'Elasticsearch HTTPS',
- check_command => "check_ssl_http_on_port!${certificate_name}!9243",
+ check_command => "check_ssl_on_port!${certificate_name}!9243",
}
::ferm::service { 'elastic-https':
diff --git a/modules/nagios_common/files/check_commands/check_ssl.cfg
b/modules/nagios_common/files/check_commands/check_ssl.cfg
index b7471cc..dde125d 100644
--- a/modules/nagios_common/files/check_commands/check_ssl.cfg
+++ b/modules/nagios_common/files/check_commands/check_ssl.cfg
@@ -9,20 +9,20 @@
}
define command{
- command_name check_ssl_http_on_port
+ command_name check_ssl_on_port
command_line $USER1$/check_ssl --warning 60 --critical 30 -H
$HOSTADDRESS$ --cn $ARG1$ -p $ARG2$
}
define command{
- command_name check_ssl_http_on_port_letsencrypt
+ command_name check_ssl_on_port_letsencrypt
command_line $USER1$/check_ssl --warning 7 --critical 3 -H
$HOSTADDRESS$ --cn $ARG1$ -p $ARG2$
}
define command{
- command_name check_ssl_http_on_host_port
+ command_name check_ssl_on_host_port
command_line $USER1$/check_ssl --warning 60 --critical 30 --cn $ARG1$
-H $ARG2$ -p $ARG3$
}
define command{
- command_name check_ssl_http_on_host_port_letsencrypt
+ command_name check_ssl_on_host_port_letsencrypt
command_line $USER1$/check_ssl --warning 7 --critical 3 --cn $ARG1$ -H
$ARG2$ -p $ARG3$
}
--
To view, visit https://gerrit.wikimedia.org/r/333010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id7c9acf4eaa3afdab4fadc595161846e36cee1cf
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@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
