Ensure consistent captured headers, between all HTTP request processing HAProxy frontends.

We can't do this in `defaults` as the Prometheus frontend has `no log`.

Author: benbz

charts/matrix-stack/configs/synapse/partial-haproxy.cfg.tpl

@@ -22,9 +22,6 @@ frontend startup
 frontend synapse-http-in
   bind *:8008
 
-  # same as http log, with %Th (handshake time)
-  log-format "%ci:%cp [%tr] %ft %b/%s %Th/%TR/%Tw/%Tc/%Tr/%Ta %ST %B %CC %CS %tsc %ac/%fc/%bc/%sc/%rc %sq/%bq %hr %hs %{+Q}r"
-
   # if we hit the maxconn on a server, and the queue timeout expires, we want
   # to avoid returning 503, since that will cause cloudflare to mark us down.
   #
@@ -35,6 +32,9 @@ frontend synapse-http-in
   #
   errorfile 503 /synapse/429.http
 
+  # same as http log, with %Th (handshake time)
+  log-format "%ci:%cp [%tr] %ft %b/%s %Th/%TR/%Tw/%Tc/%Tr/%Ta %ST %B %CC %CS %tsc %ac/%fc/%bc/%sc/%rc %sq/%bq %hr %hs %{+Q}r"
+
   capture request header Host len 32
   capture request header Referer len 200
   capture request header User-Agent len 200

charts/matrix-stack/configs/well-known/partial-haproxy.cfg.tpl

@@ -13,6 +13,10 @@ frontend well-known-in
   # same as http log, with %Th (handshake time)
   log-format "%ci:%cp [%tr] %ft %b/%s %Th/%TR/%Tw/%Tc/%Tr/%Ta %ST %B %CC %CS %tsc %ac/%fc/%bc/%sc/%rc %sq/%bq %hr %hs %{+Q}r"
 
+  capture request header Host len 32
+  capture request header Referer len 200
+  capture request header User-Agent len 200
+
   acl is_delete_put_post_method method DELETE POST PUT
   http-request deny status 405 if is_delete_put_post_method
 

newsfragments/788.changed.md

@@ -0,0 +1 @@
+Ensure consistent captured headers in HAProxy log lines, between all HTTP request processing HAProxy frontends.