feat(agent): add configurable logging format (#1536)

Co-authored-by: David Ragot <[email protected]>
formancehq · May 24, 2024 · 1d7c51a · 1d7c51a
1 parent bb23227
commit 1d7c51a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/ee/agent/.earthly/values.yaml b/ee/agent/.earthly/values.yaml
@@ -1,3 +1,8 @@
+global:
+  monitoring:
+    logs:
+      format: ""
+
 image:
   pullPolicy: Always
 

diff --git a/ee/agent/helm/templates/_helpers.tpl b/ee/agent/helm/templates/_helpers.tpl
@@ -5,3 +5,10 @@ Selector labels
 app.kubernetes.io/name: {{ .Chart.Name }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
+
+{{- define "agent.monitoring.logs" -}}
+{{- if eq .Values.global.monitoring.logs.format "json" }}
+- name: JSON_FORMATTING_LOGGER
+  value: "true"
+{{- end }}
+{{- end }}
diff --git a/ee/agent/helm/templates/deployment.yaml b/ee/agent/helm/templates/deployment.yaml
@@ -65,6 +65,7 @@ spec:
               value: "{{ .Values.agent.baseUrl }}"
             - name: PRODUCTION
               value: "{{ .Values.agent.production }}"
+            {{- include "agent.monitoring.logs" . | nindent 12 }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

diff --git a/ee/agent/helm/values.yaml b/ee/agent/helm/values.yaml
@@ -1,5 +1,10 @@
 global:
+  # This is not a global value shared over all charts, but a global value shared over all templates in this chart.
   serviceName: agent
+  monitoring:
+    logs:
+      # format:Enum:{json, ""}
+      format: json
 
 image:
   repository: ghcr.io/formancehq/agent
@@ -20,7 +25,8 @@ podAnnotations: {}
 podSecurityContext: {}
 # fsGroup: 2000
 
-securityContext: {}
+securityContext:
+  {}
   # capabilities:
   #   drop:
   #   - ALL
@@ -29,12 +35,12 @@ securityContext: {}
 # runAsUser: 1000
 
 resources:
-   limits:
-     cpu: 100m
-     memory: 128Mi
-   requests:
-     cpu: 100m
-     memory: 128Mi
+  limits:
+    cpu: 100m
+    memory: 128Mi
+  requests:
+    cpu: 100m
+    memory: 128Mi
 
 nodeSelector: {}