Yuvipanda has submitted this change and it was merged. Change subject: tools: Send logs to multiple servers ......................................................................
tools: Send logs to multiple servers Redundancy! Change-Id: Ia4cdb53bda2abaa8d5f2811f22245ccc1c1db0ff --- M modules/role/manifests/toollabs/logging/sender.pp M modules/role/templates/toollabs/sendlogs.conf.erb 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Yuvipanda: Verified; Looks good to me, approved diff --git a/modules/role/manifests/toollabs/logging/sender.pp b/modules/role/manifests/toollabs/logging/sender.pp index b859606..cb61a74 100644 --- a/modules/role/manifests/toollabs/logging/sender.pp +++ b/modules/role/manifests/toollabs/logging/sender.pp @@ -1,8 +1,7 @@ # Send logs to a central server class role::toollabs::logging::sender( - $centralserver, + $centralserver_ips, ) { - $centralip = ipresolve($centralserver, 4, $::nameservers[0]) rsyslog::conf{ 'everything': content => template('role/toollabs/sendlogs.conf.erb') } diff --git a/modules/role/templates/toollabs/sendlogs.conf.erb b/modules/role/templates/toollabs/sendlogs.conf.erb index 60c75ba..2588907 100644 --- a/modules/role/templates/toollabs/sendlogs.conf.erb +++ b/modules/role/templates/toollabs/sendlogs.conf.erb @@ -1,3 +1,4 @@ -# Send all logs to a central server! -# FIXME: In the future, target this better? -*.* @<%= centralip %>:514 \ No newline at end of file +# Send all logs to multiple central servers +<% @centralserver_ips.each do | ip |%> +*.* @<%= ip %>:514 +<% end %> -- To view, visit https://gerrit.wikimedia.org/r/303711 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4cdb53bda2abaa8d5f2811f22245ccc1c1db0ff Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org> Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits