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

Add option in the configuration configmap to enable remote logging (syslog) (#2145)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-02-25 12:47:14 -03:00 committed by GitHub
parent 0dee303ac2
commit 216fe01a07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/ingress/controller/config/config.go
View file

@ -475,6 +475,13 @@ type Configuration struct {
// http://nginx.org/en/docs/http/ngx_http_limit_req_module.html#limit_req_status // http://nginx.org/en/docs/http/ngx_http_limit_req_module.html#limit_req_status
// Default: 503 // Default: 503
LimitReqStatusCode int `json:"limit-req-status-code"` LimitReqStatusCode int `json:"limit-req-status-code"`
// EnableSyslog enables the configuration for remote logging in NGINX
EnableSyslog bool `json:"enable-syslog"`
// SyslogHost FQDN or IP address where the logs should be sent
SyslogHost string `json:"syslog-host"`
// SyslogPort port
SyslogPort int `json:"syslog-port",omitempty`
} }
// NewDefault returns the default nginx configuration // NewDefault returns the default nginx configuration
@ -569,6 +576,7 @@ func NewDefault() Configuration {
JaegerSamplerType: "const", JaegerSamplerType: "const",
JaegerSamplerParam: "1", JaegerSamplerParam: "1",
LimitReqStatusCode: 503, LimitReqStatusCode: 503,
SyslogPort: 514,
} }
if glog.V(5) { if glog.V(5) {

9
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -150,9 +150,18 @@ http {
{{ if $cfg.DisableAccessLog }} {{ if $cfg.DisableAccessLog }}
access_log off; access_log off;
{{ else }} {{ else }}
{{ if $cfg.EnableSyslog }}
access_log syslog:server={{ $cfg.SyslogHost }}:{{ $cfg.SyslogPort }} upstreaminfo if=$loggable;
{{ else }}
access_log {{ $cfg.AccessLogPath }} upstreaminfo if=$loggable; access_log {{ $cfg.AccessLogPath }} upstreaminfo if=$loggable;
{{ end }} {{ end }}
{{ end }}
{{ if $cfg.EnableSyslog }}
error_log syslog:server={{ $cfg.SyslogHost }}:{{ $cfg.SyslogPort }} {{ $cfg.ErrorLogLevel }};
{{ else }}
error_log {{ $cfg.ErrorLogPath }} {{ $cfg.ErrorLogLevel }}; error_log {{ $cfg.ErrorLogPath }} {{ $cfg.ErrorLogLevel }};
{{ end }}
{{ buildResolvers $cfg.Resolver $cfg.DisableIpv6DNS }} {{ buildResolvers $cfg.Resolver $cfg.DisableIpv6DNS }}