Hello Ottomata, I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/102107 to review the following change. Change subject: Log X-Analytics header of response instead of request ...................................................................... Log X-Analytics header of response instead of request As varnish may mangle the X-Analytics header through backend (“mf-m” key), or directly through vcl files (“zero” key), we're more interested in the response's X-Analytics header than the request's vanilla header. modules/varnish/files/varnishncsa.default also uses the X-Analytics header of the response in LOG_FORMAT. Change-Id: If5bbc6f38b0674653bfbfe150b6ed8f30a98de15 --- M manifests/role/cache.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/07/102107/1 diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 47a46a5..a5b53d8 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -483,7 +483,7 @@ # Note: fake_tag tricks varnishkafka into allowing hardcoded string into a JSON field. # Hardcoding the $fqdn into hostname rather than using %l to account for # possible slip ups where varnish only writes the short hostname for %l. - format => "%{fake_tag0@hostname?${::fqdn}}x %{@sequence!num?0}n %{%FT%T@dt}t %{Varnish:time_firstbyte@time_firstbyte!num?0.0}x %{@ip}h %{Varnish:handling@cache_status}x %{@http_status}s %{@response_size!num?0}b %{@http_method}m %{Host@uri_host}i %{@uri_path}U %{@uri_query}q %{Content-Type@content_type}o %{Referer@referer}i %{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i %{Accept-Language@accept_language}i %{X-Analytics@x_analytics}i", + format => "%{fake_tag0@hostname?${::fqdn}}x %{@sequence!num?0}n %{%FT%T@dt}t %{Varnish:time_firstbyte@time_firstbyte!num?0.0}x %{@ip}h %{Varnish:handling@cache_status}x %{@http_status}s %{@response_size!num?0}b %{@http_method}m %{Host@uri_host}i %{@uri_path}U %{@uri_query}q %{Content-Type@content_type}o %{Referer@referer}i %{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i %{Accept-Language@accept_language}i %{X-Analytics@x_analytics}o", message_send_max_retries => 3, queue_buffering_max_messages => 1000000, # large timeout to account for potential cross DC latencies -- To view, visit https://gerrit.wikimedia.org/r/102107 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5bbc6f38b0674653bfbfe150b6ed8f30a98de15 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: QChris <christ...@quelltextlich.at> Gerrit-Reviewer: Ottomata <o...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits