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

Disable opentracing for nginx internal urls (#2272)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-03-29 13:47:13 -03:00 committed by GitHub
parent c6c219a7d1
commit 146db43794
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/file/bindata.go
View file

File diff suppressed because one or more lines are too long

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

@ -493,6 +493,9 @@ http {
location /nginx_status { location /nginx_status {
set $proxy_upstream_name "internal"; set $proxy_upstream_name "internal";
{{ if $cfg.EnableOpentracing }}
opentracing off;
{{ end }}
{{ if $cfg.EnableVtsStatus }} {{ if $cfg.EnableVtsStatus }}
vhost_traffic_status_display; vhost_traffic_status_display;
@ -505,6 +508,10 @@ http {
{{ if $all.DynamicConfigurationEnabled }} {{ if $all.DynamicConfigurationEnabled }}
location /configuration { location /configuration {
{{ if $cfg.EnableOpentracing }}
opentracing off;
{{ end }}
allow 127.0.0.1; allow 127.0.0.1;
{{ if $IsIPV6Enabled }} {{ if $IsIPV6Enabled }}
allow ::1; allow ::1;
@ -995,6 +1002,10 @@ stream {
{{ if eq $server.Hostname "_" }} {{ if eq $server.Hostname "_" }}
# health checks in cloud providers require the use of port {{ $all.ListenPorts.HTTP }} # health checks in cloud providers require the use of port {{ $all.ListenPorts.HTTP }}
location {{ $all.HealthzURI }} { location {{ $all.HealthzURI }} {
{{ if $all.Cfg.EnableOpentracing }}
opentracing off;
{{ end }}
access_log off; access_log off;
return 200; return 200;
} }
@ -1002,6 +1013,10 @@ stream {
# this is required to avoid error if nginx is being monitored # this is required to avoid error if nginx is being monitored
# with an external software (like sysdig) # with an external software (like sysdig)
location /nginx_status { location /nginx_status {
{{ if $all.Cfg.EnableOpentracing }}
opentracing off;
{{ end }}
{{ range $v := $all.NginxStatusIpv4Whitelist }} {{ range $v := $all.NginxStatusIpv4Whitelist }}
allow {{ $v }}; allow {{ $v }};
{{ end }} {{ end }}