DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #836 from coryfklein/master

Browse source 
Make log format json escaping configurable
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-06-11 14:12:00 -04:00 committed by GitHub
commit 023688c82f
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
controllers/nginx/pkg/config/config.go
View file

@ -175,6 +175,10 @@ type Configuration struct {
// Default: 4 8k // Default: 4 8k
LargeClientHeaderBuffers string `json:"large-client-header-buffers"` LargeClientHeaderBuffers string `json:"large-client-header-buffers"`
// Enable json escaping
// http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format
LogFormatEscapeJson bool `json:"log-format-escape-json,omitempty"`
// Customize upstream log_format // Customize upstream log_format
// http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format // http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format
LogFormatUpstream string `json:"log-format-upstream,omitempty"` LogFormatUpstream string `json:"log-format-upstream,omitempty"`
@ -311,6 +315,7 @@ func NewDefault() Configuration {
KeepAlive: 75, KeepAlive: 75,
KeepAliveRequests: 100, KeepAliveRequests: 100,
LargeClientHeaderBuffers: "4 8k", LargeClientHeaderBuffers: "4 8k",
LogFormatEscapeJson: false,
LogFormatStream: logFormatStream, LogFormatStream: logFormatStream,
LogFormatUpstream: logFormatUpstream, LogFormatUpstream: logFormatUpstream,
MaxWorkerConnections: 16384, MaxWorkerConnections: 16384,

2
controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
View file

@ -93,7 +93,7 @@ http {
# disable warnings # disable warnings
uninitialized_variable_warn off; uninitialized_variable_warn off;
log_format upstreaminfo '{{ buildLogFormatUpstream $cfg }}'; log_format upstreaminfo {{ if $cfg.LogFormatEscapeJson }}escape=json {{ end }}'{{ buildLogFormatUpstream $cfg }}';
{{/* map urls that should not appear in access.log */}} {{/* map urls that should not appear in access.log */}}
{{/* http://nginx.org/en/docs/http/ngx_http_log_module.html#access_log */}} {{/* http://nginx.org/en/docs/http/ngx_http_log_module.html#access_log */}}