proxy: Add setting to configure LOGFMT env var (#121)

neondatabase · Feb 4, 2025 · c3d780b · c3d780b
1 parent 3bade9d
commit c3d780b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/charts/neon-proxy/Chart.yaml b/charts/neon-proxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: neon-proxy
 description: Neon Proxy
 type: application
-version: 1.10.1
+version: 1.11.0
 appVersion: "0.1.0"
 kubeVersion: "^1.18.x-x"
 home: https://neon.tech

diff --git a/charts/neon-proxy/README.md b/charts/neon-proxy/README.md
@@ -1,6 +1,6 @@
 # neon-proxy
 
-![Version: 1.10.1](https://img.shields.io/badge/Version-1.10.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml)
+![Version: 1.11.0](https://img.shields.io/badge/Version-1.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) [![Lint and Test Charts](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml/badge.svg)](https://github.com/neondatabase/helm-charts/actions/workflows/lint-test.yaml)
 
 Neon Proxy
 
@@ -79,6 +79,7 @@ Kubernetes: `^1.18.x-x`
 | settings.extraCmdFlags | list | `[]` | (list) additional arguments to proxy binary |
 | settings.extraDomains | list | `[]` | domains used in extra TLS certs for client postgres connections |
 | settings.httpPoolOptIn | bool | `true` | (bool) Sets the SQL over HTTP Pool to opt-in-only mode if true. Set false to enable it always |
+| settings.logfmt | string | `nil` | Log format to use: "text" (default) or "json". |
 | settings.metricBackupCollectionChunkSize | string | `"4194304"` | (string) How large each chunk of the metric backup files should be in bytes |
 | settings.metricBackupCollectionInterval | string | `"10m"` |  |
 | settings.metricBackupCollectionRemoteStorage | string | `""` | (string) Storage location to upload the metric backup files to |

diff --git a/charts/neon-proxy/templates/deployment.yaml b/charts/neon-proxy/templates/deployment.yaml
@@ -199,6 +199,10 @@ spec:
             - name: RUST_LOG
               value: {{ . }}
             {{- end }}
+            {{- with .Values.settings.logfmt }}
+            - name: LOGFMT
+              value: {{ . }}
+            {{- end }}
             {{- with .Values.settings.otelExporterOtlpEndpoint }}
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
               value: {{ . }}

diff --git a/charts/neon-proxy/values.yaml b/charts/neon-proxy/values.yaml
@@ -43,6 +43,8 @@ settings:
   extraDomains: []
   # settings.rustLog -- Proxy log level
   rustLog: "INFO"
+  # settings.logfmt -- Log format to use: "text" (default) or "json".
+  logfmt: null
   # settings.otelExporterOtlpEndpoint -- OpenTelemetry collector URL (will be converted into `OTEL_EXPORTER_OTLP_ENDPOINT` environment variable)
   otelExporterOtlpEndpoint: ""
   # settings.otelExporterDisabled -- Disables OpenTelemetry (will be converted into `OTEL_SDK_DISABLED` environment variable)