Cleanup #373
Cleanup #373
Conversation
k8s-ci-robot
added
the
cncf-cla: yes
|
This change is |
aledbf
force-pushed
the
log-format
branch
2 times, most recently
from
ffce209
to
5a40495
Compare
| // BuildLogFormatUpstream format the log_format upstream using | ||
| // proxy_protocol_addr as remote client address if UseProxyProtocol | ||
| // is enabled. | ||
| func (cfg Configuration) BuildLogFormatUpstream() string { |
There was a problem hiding this comment.
@aledbf Don't forget to compare if the logFormatUpstream is coming from configmap. (--log-format-upstream)
There was a problem hiding this comment.
@gianrubio no need. At this point the configuration contains the default value or the defined in the configmap.
apiVersion: v1
data:
log-format-upstream: $remote_user
kind: ConfigMap
metadata:
name: nginx-template
namespace: default
I0304 21:53:19.723598 5 nginx.go:224] --- /tmp/a080909879 2017-03-04 21:53:19.000000000 +0000
+++ /tmp/b283781162 2017-03-04 21:53:19.000000000 +0000
@@ -56,7 +56,7 @@
server_tokens on;
- log_format upstreaminfo '$remote_addr - [$proxy_add_x_forwarded_for] - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent" $request_length $request_time [$proxy_upstream_name] $upstream_addr $upstream_response_length $upstream_response_time $upstream_status"';
+ log_format upstreaminfo '$remote_addr - $remote_user';
map $request_uri $loggable {
default 1;
I0304 21:53:20.358319 5 controller.go:426] ingress backend successfully reloaded...There was a problem hiding this comment.
I mean, if I have this configmap
apiVersion: v1
data:
use-proxy-protocol: "true"
kind: ConfigMap
metadata:
name: nginx-template
namespace: default
and change to this?
apiVersion: v1
kind: ConfigMap
data:
use-proxy-protocol: "true"
log-format-upstream: $remote_user
metadata:
name: nginx-template
namespace: default
ingress will build a wrong log_format
log_format upstreaminfo '$proxy_protocol_addr - $remote_user';
| // is enabled. | ||
| func (cfg Configuration) BuildLogFormatUpstream() string { | ||
| if cfg.UseProxyProtocol { | ||
| return fmt.Sprintf("$proxy_protocol_addr - %s", cfg.LogFormatUpstream) |
There was a problem hiding this comment.
This is breaking overrides of the log format and just seems extremely sloppy as users are now stuck with a hardcoded string format ($ip - $customlogformat) regardless of custom logging formats.
Please revert or fix this as i (and i figure lots of people) want to define my own structured logging format and this IP prefix is preventing this.
No description provided.