Merge pull request #429 from nlamirault/feat/logging-json

slok · Nov 26, 2022 · e147cad · e147cad
2 parents 128115f + 687c385
commit e147cad
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 1 deletion.
diff --git a/deploy/kubernetes/helm/sloth/Chart.yaml b/deploy/kubernetes/helm/sloth/Chart.yaml
@@ -4,4 +4,4 @@ description: Base chart for Sloth.
 type: application
 home: https://github.com/slok/sloth
 kubeVersion: ">= 1.19.0-0"
-version: 0.6.4
+version: 0.7.0
diff --git a/deploy/kubernetes/helm/sloth/templates/deployment.yaml b/deploy/kubernetes/helm/sloth/templates/deployment.yaml
@@ -59,6 +59,7 @@ spec:
             {{- if .Values.customSloConfig.enabled }}
             - --slo-period-windows-path={{ .Values.customSloConfig.path }}
             {{- end }}
+            - --logger={{ .Values.sloth.logger }}
             {{- if .Values.sloth.debug.enabled }}
             - --debug
             {{- end}}

diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom.yaml
@@ -50,6 +50,7 @@ spec:
             - --extra-labels=k2=v2
             - --sli-plugins-path=/plugins
             - --disable-optimized-rules
+            - --logger=default
           ports:
             - containerPort: 8081
               name: metrics

diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom_no_extras.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom_no_extras.yaml
@@ -49,6 +49,7 @@ spec:
             - --extra-labels=k1=v1
             - --extra-labels=k2=v2
             - --disable-optimized-rules
+            - --logger=default
           securityContext:
             allowPrivilegeEscalation: false
           resources:

diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom_slo_config.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_custom_slo_config.yaml
@@ -51,6 +51,7 @@ spec:
             - --extra-labels=k2=v2
             - --disable-optimized-rules
             - --slo-period-windows-path=/windows
+            - --logger=default
           ports:
             - containerPort: 8081
               name: metrics

diff --git a/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_default.yaml b/deploy/kubernetes/helm/sloth/tests/testdata/output/deployment_default.yaml
@@ -36,6 +36,7 @@ spec:
           args:
             - kubernetes-controller
             - --sli-plugins-path=/plugins
+            - --logger=default
           ports:
             - containerPort: 8081
               name: metrics

diff --git a/deploy/kubernetes/helm/sloth/values.yaml b/deploy/kubernetes/helm/sloth/values.yaml
@@ -27,6 +27,8 @@ sloth:
   optimizedRules: true  # Reduce prom load for calculating period window burnrates.
   debug:
     enabled: false
+  # Could be: default or json
+  logger: default
 
 commonPlugins:
   enabled: true