Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NODE-5565 Add configuration parameter for Nginx extended logs #206

Merged
merged 2 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.1
1.6.0
4 changes: 4 additions & 0 deletions files/template.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ volumes:
value: "{{ .Config.nginx.tarantoolUpstream.server.maxConns }}"
- name: NGINX_TARANTOOL_UPSTREAM_SERVER_MAX_CONNS
value: "{{ .Config.nginx.tarantoolUpstream.server.failTimeout }}"
- name: NGINX_LOGS_EXTENDED
value: "{{ .Config.nginx.logs.extended }}"
- name: NGINX_LOGS_FORMAT
value: "{{ .Config.nginx.logs.format }}"
{{ if (isSet .ObjectMeta.Annotations (withAP "nginx-http-include")) -}}
- name: NGINX_HTTP_INCLUDE
value: "{{ index .ObjectMeta.Annotations (withAP `nginx-http-include`) }}"
Expand Down
2 changes: 1 addition & 1 deletion helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ annotations:
- name: sidecar
image: wallarm/sidecar:5.2.11
- name: sidecar-controller
image: wallarm/sidecar-controller:1.4.1
image: wallarm/sidecar-controller:1.6.0
- name: node-helpers
image: wallarm/node-helpers:5.2.11
6 changes: 5 additions & 1 deletion helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ config:
- 172.16.0.0/12
- 127.0.0.0/8
- fd00::/8
### Nginx sidecar-proxy log config
logs:
extended: false
format: text
### Nginx directive 'worker_processes' http://nginx.org/en/docs/ngx_core_module.html#worker_processes
### Defines the number of worker processes
###
Expand Down Expand Up @@ -787,7 +791,7 @@ controller:
image:
registry: docker.io
image: wallarm/sidecar-controller
tag: 1.4.1
tag: 1.6.0
pullPolicy: IfNotPresent
# -- Admission webhook configuration
# @default -- *See below for details*
Expand Down
Loading