chore: set default log level to info & enable json logs

flanksource · May 21, 2024 · 9bd0939 · 9bd0939
1 parent b6cdcfd
commit 9bd0939
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/agent-chart/templates/deployment.yaml b/agent-chart/templates/deployment.yaml
@@ -44,9 +44,15 @@ spec:
             - --apm-hub=http://apm-hub:8080
             - --canary-checker=http://canary-checker:8080
             - --config-db=http://config-db:8080
-           {{- range $k, $v := .Values.extraArgs}}
-           - --{{$k}}={{$v}}
-           {{- end }}
+            {{- if (tpl .Values.logLevel .)}}
+            - {{ tpl .Values.logLevel . }}
+            {{- end }}
+            {{- if .Values.jsonLogs }}
+            - --json-logs
+            {{- end }}
+            {{- range $k, $v := .Values.extraArgs}}
+            - --{{$k}}={{$v}}
+            {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           startupProbe:

diff --git a/agent-chart/values.yaml b/agent-chart/values.yaml
@@ -3,6 +3,14 @@ image:
   repository: docker.io/flanksource/incident-commander
   pullPolicy: IfNotPresent
   tag: "v0.0.546"
+
+global:
+  # -v, -vv, -vvv
+  logLevel: ""
+
+logLevel: "{{.Values.global.logLevel}}"
+jsonLogs: true
+
 serviceAccount:
   # Annotations to add to the service account
   annotations: {}
@@ -91,6 +99,7 @@ db:
     enabled: false
     secretName: pganalyze
 canary-checker:
+  logLevel: "{{.Values.global.logLevel}}"
   image:
     type: full
   upstream:
@@ -110,6 +119,7 @@ canary-checker:
     enabled: false
 config-db:
   disablePostgrest: true
+  logLevel: "{{.Values.global.logLevel}}"
   db:
     runMigrations: false
     embedded:

diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
@@ -75,6 +75,12 @@ spec:
            {{- else}}
             - --postgrest-max-rows='{{.Values.externalPostgrest.maxRows}}'
            {{- end }}
+           {{- if (tpl .Values.logLevel .)}}
+            - {{ tpl .Values.logLevel . }}
+           {{- end }}
+           {{- if .Values.jsonLogs }}
+            - --json-logs
+           {{- end }}
            {{- range $k, $v := .Values.extraArgs}}
            - --{{$k}}={{$v}}
            {{- end }}

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -5,7 +5,10 @@ image:
   repository: docker.io/flanksource/incident-commander
   pullPolicy: IfNotPresent
   tag: "v0.0.546"
+
 global:
+  # -v, -vv, -vvv
+  logLevel: ""
   ui:
     host: "mission-control-ui.local"
     tlsSecretName: "mission-control-ui-tls"
@@ -80,6 +83,11 @@ otel:
 properties:
   incidents.disable: true
   logs.disable: true
+
+# -v, -vv, -vvv
+logLevel: "{{.Values.global.logLevel}}"
+jsonLogs: true
+
 db:
   create: true
   conf:
@@ -140,6 +148,7 @@ canary-checker:
   image:
     type: full
   disablePostgrest: true
+  logLevel: "{{.Values.global.logLevel}}"
   otel:
     collector: "{{ .Values.global.otel.collector }}"
     labels: "{{ .Values.global.otel.labels }}"
@@ -159,6 +168,7 @@ config-db:
   otel:
     collector: "{{ .Values.global.otel.collector }}"
     labels: "{{ .Values.global.otel.labels }}"
+  logLevel: "{{.Values.global.logLevel}}"
   db:
     runMigrations: false
     embedded: