Merge pull request #53 from sebglon/feat/log4j2

Add new property `log4j2XML`
pmint93 · Dec 31, 2022 · 9e36b07 · 9e36b07
2 parents bd34db8 + b44359a
commit 9e36b07
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/charts/metabase/Chart.yaml b/charts/metabase/Chart.yaml
@@ -3,7 +3,7 @@ description:
   The easy, open source way for everyone in your company to ask questions
   and learn from data.
 name: metabase
-version: 2.5.0
+version: 2.6.0
 appVersion: v0.45.1
 maintainers:
   - name: pmint93

diff --git a/charts/metabase/README.md b/charts/metabase/README.md
@@ -122,7 +122,8 @@ The following table lists the configurable parameters of the Metabase chart and
 | ingress.labels                                  | Ingress labels configuration                                               | null              |
 | ingress.annotations                             | Ingress annotations configuration                                          | {}                |
 | ingress.tls                                     | Ingress TLS configuration                                                  | null              |
-| log4jProperties                                 | Custom `log4j.properties` file                                             | null              |
+| log4j2XML                                       | Custom `log4j2.xml` file                                                   | null              |
+| log4jProperties                                 | DEPRECATED Custom `log4j.properties` file                                             | null              |
 | resources                                       | Server resource requests and limits                                        | {}                |
 | nodeSelector                                    | Node labels for pod assignment                                             | {}                |
 | tolerations                                     | Toleration labels for pod assignment                                       | []                |

diff --git a/charts/metabase/templates/config.yaml b/charts/metabase/templates/config.yaml
@@ -13,3 +13,7 @@ data:
   log4j.properties:
 {{ toYaml .Values.log4jProperties | indent 4}}
   {{- end}}
+  {{- if .Values.log4j2XML }}
+  log4j2.xml:
+{{ toYaml .Values.log4j2XML | indent 4}}
+  {{- end}}
diff --git a/charts/metabase/templates/deployment.yaml b/charts/metabase/templates/deployment.yaml
@@ -140,6 +140,10 @@ spec:
           - name: JAVA_OPTS
             value: "-Dlog4j.configuration=file:/tmp/conf/log4j.properties"
             {{- end }}
+            {{- if .Values.log4j2XML }}
+          - name: JAVA_OPTS
+            value: "-Dlog4j.configuration=file:/tmp/conf/log4j2.xml"
+            {{- end }}
           {{- end }}
           {{- if .Values.pluginsDirectory }}
           - name: MB_PLUGINS_DIR
@@ -190,7 +194,7 @@ spec:
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
           {{- if or .Values.log4jProperties (ne (len .Values.extraVolumeMounts) 0) }}
           volumeMounts:
-            {{- if .Values.log4jProperties }}
+            {{- if or .Values.log4jProperties .Values.log4j2XML }}
             - name: config
               mountPath: /tmp/conf/
             {{- end }}
@@ -256,13 +260,19 @@ spec:
       {{- end }}
       serviceAccountName: {{ template "metabase.serviceAccountName" . }}
       volumes:
-        {{- if .Values.log4jProperties}}
+        {{- if or .Values.log4jProperties .Values.log4j2XML }}
         - name: config
           configMap:
             name: {{ template "metabase.fullname" . }}-config
             items:
+            {{- if .Values.log4jProperties }}
             - key: log4j.properties
               path: log4j.properties
+            {{- end }}
+            {{- if .Values.log4j2XML}}
+            - key: log4j2.xml
+              path: log4j2.xml
+            {{- end }}
         {{- end }}
         {{- if ne (len .Values.extraVolumes) 0 }}
           {{ toYaml .Values.extraVolumes | nindent 8 }}

diff --git a/charts/metabase/values.yaml b/charts/metabase/values.yaml
@@ -171,7 +171,13 @@ ingress:
     #   hosts:
     #     - metabase.domain.com
 
-# A custom log4j.properties file can be provided using a multiline YAML string.
+# A custom log4j2.xml file can be provided using a multiline YAML string.
+# See https://github.com/metabase/metabase/blob/master/resources/log4j2.xml
+#
+# log4j2XML:
+
+
+# DEPRECATED; A custom log4j.properties file can be provided using a multiline YAML string.
 # See https://github.com/metabase/metabase/blob/master/resources/log4j.properties
 #
 # log4jProperties: