Ottomata has submitted this change and it was merged.

Change subject: Set up eventlogging varnishkafka instance on production bits
......................................................................


Set up eventlogging varnishkafka instance on production bits

Change-Id: I6dc2cb27ddd911a75a443852a09af4c9f0c18fbe
---
M manifests/role/cache.pp
1 file changed, 3 insertions(+), 7 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 0aeea29..f564ce8 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -607,7 +607,7 @@
             # Note that this format uses literal tab characters.
             format            => '%q   %l      %n      %t      %h      
"%{User-agent}i"',
             format_type       => 'string',
-            topic             => 'eventlogging',
+            topic             => 'eventlogging-client-side',
             varnish_name      => $varnish_name,
             varnish_svc_name  => $varnish_svc_name,
             varnish_opts      => { 'm' => 'RxURL:^/beacon/event\.gif\?.' },
@@ -1328,12 +1328,8 @@
 
         include role::cache::varnish::logging::eventlistener
         # Include a varnishkafka instance that will produce
-        # events to Kafka.  This conditional will be removed
-        # once this is well tested in labs and we are ready
-        # to enable this in production.
-        if $::realm == 'labs' {
-            include role::cache::varnish::kafka::eventlogging
-        }
+        # eventlogging events to Kafka.
+        include role::cache::varnish::kafka::eventlogging
 
         # ToDo: Remove production conditional once this works
         # is verified to work in labs.

-- 
To view, visit https://gerrit.wikimedia.org/r/197650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6dc2cb27ddd911a75a443852a09af4c9f0c18fbe
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Nuria <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to