Ema has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326426 )
Change subject: Update default config file
......................................................................
Update default config file
Get rid of configuration options for features that have been removed,
such as format.key and logline.data.copy.
Specify the VSL query to use with varnish.arg.q instead of the old
varnish.arg.m, used by Varnish 3.
Change-Id: I1776524db492af8907359bd14ad653cd6a767b5e
---
M debian/varnishkafka.conf
1 file changed, 2 insertions(+), 26 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/varnishkafka
refs/changes/26/326426/1
diff --git a/debian/varnishkafka.conf b/debian/varnishkafka.conf
index 4235af6..474b49c 100644
--- a/debian/varnishkafka.conf
+++ b/debian/varnishkafka.conf
@@ -87,18 +87,6 @@
#format = %{@host}l %{@seq_num!num}n %{@timestamp}t
%{Varnish:time_firstbyte@response!num}x %{@ip}h %{Varnish:handling@handling}x
%{@http_status}s %{@bytes_sent!num}b %{@request_method}m %{Host@host}i %{@uri}U
%{@query}q %{Content-Type@mime_type}o %{Referer@referer}i
%{X-Forwarded-For@x_forwarded_for}i %{User-Agent@user_agent}i
%{Accept-Language@accept_language}i
-
-# Optional secondary formatting.
-# 'output = kafka': The rendered 'format.key' will be provided as the
-# Kafka message Key
-# 'output = string': Print string to stdout.
-# Supports the same formating and type as 'format' and 'format.type'.
-#
-format.key.type = string
-format.key = %{%s}t
-
-
-
# Where to output varnish log lines:
# kafka - (default) send to kafka broker
# stdout - just print to stdout (behave like varnishncsa)
@@ -110,18 +98,6 @@
# Larger tags will be truncated to this size.
# Defaults to 2048
#tag.size.max = 2048
-
-
-# EXPERIMENTAL
-# Indicates if the log tag data read from VSL files should be copied instantly
-# when read (true). If this is set to false the data is assumed to be
-# persistent (for the duration of collecting and formatting a single request)
-# and no copies will be made, thus improving performance.
-#
-# NOTE:
-# Must be set to true for offline files (-r file..) due to the way
-# libvarnishapi reads its data.
-logline.data.copy = true
# TUNING
@@ -211,8 +187,8 @@
# #
#######################################################################
-# -m tag:regex
-varnish.arg.m = RxRequest:^(?!PURGE$)
+# -q query
+varnish.arg.q = ReqMethod ne "PURGE"
# Examples:
# -C: ignore case when matching regex
--
To view, visit https://gerrit.wikimedia.org/r/326426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1776524db492af8907359bd14ad653cd6a767b5e
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/varnishkafka
Gerrit-Branch: debian
Gerrit-Owner: Ema <e...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
