Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/305587
Change subject: deployment-prep: Move udp2log to deployment-fluorine02 ...................................................................... deployment-prep: Move udp2log to deployment-fluorine02 Change-Id: I9aeb30e904d574e723918064beb414f98b6cff22 --- M hieradata/labs/deployment-prep/common.yaml A hieradata/labs/deployment-prep/host/deployment-fluorine02.yaml M modules/scap/templates/scap.cfg.erb 3 files changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/305587/1 diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index 93ca450..89720fe 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -117,7 +117,7 @@ restbase::mathoid_uri: http://deployment-mathoid.deployment-prep.eqiad.wmflabs:10042 restbase::aqs_uri: https://wikimedia.org/api/rest_v1/metrics restbase::eventlogging_service_uri: http://deployment-eventlogging04.deployment-prep.eqiad.wmflabs:8085/v1/events -"mediawiki::log_aggregator": deployment-fluorine.eqiad.wmflabs:8420 +"mediawiki::log_aggregator": deployment-fluorine02.eqiad.wmflabs:8420 "mediawiki::forward_syslog": deployment-logstash2.deployment-prep.eqiad.wmflabs:10514 mediawiki_memcached_servers: - 10.68.23.25:11211:1 # deployment-memc04 diff --git a/hieradata/labs/deployment-prep/host/deployment-fluorine02.yaml b/hieradata/labs/deployment-prep/host/deployment-fluorine02.yaml new file mode 100644 index 0000000..8f7c7c6 --- /dev/null +++ b/hieradata/labs/deployment-prep/host/deployment-fluorine02.yaml @@ -0,0 +1,3 @@ +role::logging::mediawiki::monitor: false +role::logging::mediawiki::log_directory: /srv/mw-log +role::logging::mediawiki::count: 100 diff --git a/modules/scap/templates/scap.cfg.erb b/modules/scap/templates/scap.cfg.erb index c374236..50d6386 100644 --- a/modules/scap/templates/scap.cfg.erb +++ b/modules/scap/templates/scap.cfg.erb @@ -92,7 +92,7 @@ # Wikimedia Foundation beta cluster configuration master_rsync: <%= @wmflabs_master %> statsd_host: labmon1001.eqiad.wmnet -udp2log_host: 10.68.16.198 +udp2log_host: deployment-fluorine02.deployment-prep.eqiad.wmflabs wmf_realm: labs # No pybal in labs, but pretend that there is anyway pybal_interface: lo -- To view, visit https://gerrit.wikimedia.org/r/305587 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9aeb30e904d574e723918064beb414f98b6cff22 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alex Monk <a...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
