Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340267 )
Change subject: prometheus: fix ferm rules for rsync and add IPv6
......................................................................
prometheus: fix ferm rules for rsync and add IPv6
follow-up fix to Change-Id: Ifb727adc42012a
ferm service could not start due to missing whitespace, resulting in:
" DNS query for 'bast3001.wikimedia.orgbast3002.wikimedia.org' failed: NXDOMAIN"
Merge hosts with a a space in between.
Also add ferm rule to allow IPv6 in addition to just IPv4. As v6 is preferred
when available this is necessary.
Change-Id: I26179f8b4572306e38d91a93826ee78aeb3d13b7
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Dzahn: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/prometheus/ops.pp
b/modules/role/manifests/prometheus/ops.pp
index 3b9b27d..8b37cc2 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -354,17 +354,18 @@
# Move Prometheus metrics to new HW - T148408
include rsync::server
- $prometheus_nodes = hiera('prometheus_nodes')
+ $prometheus_nodes_ferm = join(hiera('prometheus_nodes'), ' ')
+
rsync::server::module { 'prometheus-ops':
path => '/srv/prometheus/ops/metrics',
uid => 'prometheus',
gid => 'prometheus',
- hosts_allow => $prometheus_nodes,
+ hosts_allow => $prometheus_nodes_ferm,
}
ferm::service { 'rsync-prometheus':
proto => 'tcp',
port => '873',
- srange => "@resolve((${prometheus_nodes}))",
+ srange => "(@resolve((${prometheus_nodes_ferm}))
@resolve((${prometheus_nodes_ferm}), AAAA))",
}
}
--
To view, visit https://gerrit.wikimedia.org/r/340267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26179f8b4572306e38d91a93826ee78aeb3d13b7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
