Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373266 )
Change subject: role: use port 22 for ssh probing
......................................................................
role: use port 22 for ssh probing
Bug: T169860
Change-Id: I85ff7a7ecfd308571f39106d258548bc756cd6a7
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/role/manifests/prometheus/ops.pp
b/modules/role/manifests/prometheus/ops.pp
index 3b3bb1b..756341a 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -134,7 +134,9 @@
content => ordered_yaml([{'targets' =>
$::network::constants::special_hosts[$::realm]['bastion_hosts']}]),
}
file { "${targets_path}/blackbox_ssh_bastions.yaml":
- content => ordered_yaml([{'targets' =>
$::network::constants::special_hosts[$::realm]['bastion_hosts']}]),
+ content => ordered_yaml([{
+ 'targets' =>
regsubst($::network::constants::special_hosts[$::realm]['bastion_hosts'],
'(.*)', '[\0]:22')
+ }]),
}
# Add one job for each of mysql 'group' (i.e. their broad function)
--
To view, visit https://gerrit.wikimedia.org/r/373266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85ff7a7ecfd308571f39106d258548bc756cd6a7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
