Ottomata has uploaded a new change for review. https://gerrit.wikimedia.org/r/237486
Change subject: Remove unused ZMQ inputs and outputs ...................................................................... Remove unused ZMQ inputs and outputs Bug: T106260 Change-Id: I5bedfde1c037ad589a76acf4a3356bfc6d3776b1 --- M manifests/role/eventlogging.pp 1 file changed, 3 insertions(+), 33 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/86/237486/1 diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp index a960afa..dc09d70 100644 --- a/manifests/role/eventlogging.pp +++ b/manifests/role/eventlogging.pp @@ -32,14 +32,9 @@ # Event data flows through several processes that communicate with each # other via TCP/IP sockets. By default, all processing is performed - # on one node, but the work could be easily distributed across multiple hosts. - - # If all eventlogging services are on a single host, then you only need to - # set this one hiera variable. The following three will default to it. - # NOTE: ZeroMQ does not like using hostnames; use IP addresses. + # on one node, but the work could be easily distributed across + # multiple hosts. $eventlogging_host = hiera('eventlogging_host', $::ipaddress) - $forwarder_host = hiera('eventlogging_forwarder_host', $eventlogging_host) - $processor_host = hiera('eventlogging_processor_host', $eventlogging_host) # Define statsd host url # for beta cluster, set in https://wikitech.wikimedia.org/wiki/Hiera:Deployment-prep @@ -95,17 +90,8 @@ } } - - # analytics1010 is temporarily being used as a staging perf test - # host for the EventLogging on Kafka project. Disable job alerts there. - $monitor_jobs_ensure = $::hostname ? { - 'analytics1010' => 'absent', - default => 'present', - } # make sure any defined eventlogging services are running - class { '::eventlogging::monitoring::jobs': - ensure => $monitor_jobs_ensure, - } + class { '::eventlogging::monitoring::jobs': } } @@ -130,21 +116,9 @@ # Don't use async producer for low volume server side forwarder. outputs => [ "${kafka_server_side_raw_uri}&async=False", - "tcp://${processor_host}:8421", ], count => true, } - - # Client-side events are generated by JavaScript-triggered HTTP/S - # requests to //bits.wikimedia.org/event.gif?<event payload>. - # A varnishncsa instance on the bits caches greps for these requests - # and forwards them to eventlog* on UDP port 8422. The varnishncsa - # configuration is specified in <manifests/role/cache.pp>. - eventlogging::service::forwarder { 'client-side-raw': - input => 'udp://0.0.0.0:8422', - outputs => ["tcp://${forwarder_host}:8422"], - } - # This forwards the kafka eventlogging-valid-mixed topic to # ZMQ port 8600 for backwards compatibility. @@ -178,8 +152,6 @@ # also to the eventlogging-valid-mixed topic. $kafka_schema_uri, $kafka_mixed_uri, - # Keep the ZMQ output running until we are ready to turn it off. - "tcp://${processor_host}:8521", ], # Invalid events to to eventlogging_EventError topic output_invalid => true, @@ -200,8 +172,6 @@ outputs => [ $kafka_schema_uri, $kafka_mixed_uri, - # Keep the ZMQ output running until we are ready to turn it off. - "tcp://${processor_host}:8522", ], output_invalid => true, } -- To view, visit https://gerrit.wikimedia.org/r/237486 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bedfde1c037ad589a76acf4a3356bfc6d3776b1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits