Use the framework's log4j configuration by default if no custom log4j properties have been set

charts/ecosystem/templates/api.yaml

@@ -107,8 +107,10 @@ spec:
         - --api
         - --bootstrap
         - file:/bootstrap.properties
+        {{- if .Values.log4j2Properties }}
         - --log4j2-properties-file
         - file:/log4j2.properties
+        {{- end }}
         env:
         # The Kubernetes namespace that the Galasa service is running within is passed into the API server
         # so that the API server can query Kubernetes for monitor deployments in the /monitors REST APIs
@@ -190,10 +192,12 @@ spec:
         - name: bootstrap
           mountPath: /bootstrap.properties
           subPath: bootstrap.properties
+        {{- if .Values.log4j2Properties }}
         - name: log4j2-config
           mountPath: /log4j2.properties
           subPath: log4j2.properties
           readOnly: true
+        {{- end }}
       {{- if .Values.log4jJsonTemplatesConfigMapName }}
         - name: log4j-json-templates
           mountPath: /log4j-config
@@ -217,9 +221,11 @@ spec:
       - name: bootstrap
         configMap:
           name: {{ .Release.Name }}-bootstrap-file
+      {{- if .Values.log4j2Properties }}
       - name: log4j2-config
         configMap:
           name: {{ .Release.Name }}-log4j2-config
+      {{- end }}
       {{- if .Values.log4jJsonTemplatesConfigMapName }}
       - name: log4j-json-templates
         configMap:

charts/ecosystem/templates/custom-resource-monitor.yaml

@@ -51,8 +51,10 @@ spec:
         - --obr
         - file:galasa.obr
         - --resourcemanagement
+        {{- if .Values.log4j2Properties }}
         - --log4j2-properties-file
         - file:/log4j2.properties
+        {{- end }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -110,10 +112,12 @@ spec:
         - name: encryption-keys
           mountPath: {{ include "ecosystem.encryption.keys.directory" . }}
           readOnly: true
+        {{- if .Values.log4j2Properties }}
         - name: log4j2-config
           mountPath: /log4j2.properties
           subPath: log4j2.properties
           readOnly: true
+        {{- end }}
       {{- if .Values.log4jJsonTemplatesConfigMapName }}
         - name: log4j-json-templates
           mountPath: /log4j-config
@@ -129,9 +133,11 @@ spec:
       - name: encryption-keys
         secret:
           secretName: {{ include "ecosystem.encryption.keys.secret.name" . }}
+      {{- if .Values.log4j2Properties }}
       - name: log4j2-config
         configMap:
           name: {{ .Release.Name }}-log4j2-config
+      {{- end }}
       {{- if .Values.log4jJsonTemplatesConfigMapName }}
       - name: log4j-json-templates
         configMap:

charts/ecosystem/templates/engine-controller.yaml

@@ -82,8 +82,11 @@ spec:
           - /bin/bash
           - -ec
           - |
-            java -jar boot.jar --obr file:galasa.obr --setupeco --log4j2-properties-file file:/log4j2.properties
-            java -jar boot.jar --obr file:galasa.obr --k8scontroller --log4j2-properties-file file:/log4j2.properties
+            {{- if .Values.log4j2Properties }}
+            LOG4J_PROPERTIES_FLAG="--log4j2-properties-file file:/log4j2.properties"
+            {{- end }}
+            java -jar boot.jar --obr file:galasa.obr --setupeco ${LOG4J_PROPERTIES_FLAG}
+            java -jar boot.jar --obr file:galasa.obr --k8scontroller ${LOG4J_PROPERTIES_FLAG}
         env:
         - name: GALASA_INSTALL_NAME
           value: {{ .Release.Name }}
@@ -153,10 +156,12 @@ spec:
         - name: encryption-keys
           mountPath: {{ include "ecosystem.encryption.keys.directory" . }}
           readOnly: true
+        {{- if .Values.log4j2Properties }}
         - name: log4j2-config
           mountPath: /log4j2.properties
           subPath: log4j2.properties
           readOnly: true
+        {{- end }}
       {{- if .Values.log4jJsonTemplatesConfigMapName }}
         - name: log4j-json-templates
           mountPath: /log4j-config
@@ -172,9 +177,11 @@ spec:
       - name: encryption-keys
         secret:
           secretName: {{ include "ecosystem.encryption.keys.secret.name" . }}
+      {{- if .Values.log4j2Properties }}
       - name: log4j2-config
         configMap:
           name: {{ .Release.Name }}-log4j2-config
+      {{- end }}
       {{- if .Values.log4jJsonTemplatesConfigMapName }}
       - name: log4j-json-templates
         configMap:

charts/ecosystem/templates/log4j2-config.yaml

@@ -5,9 +5,11 @@
 #
 # A ConfigMap that contains the global Log4j2 configuration that will be applied to all Galasa service pods
 #
+{{- if .Values.log4j2Properties }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-log4j2-config
 data:
   log4j2.properties: {{ .Values.log4j2Properties | quote }}
+{{- end }}

charts/ecosystem/templates/metrics.yaml

@@ -85,8 +85,10 @@ spec:
         - --obr
         - file:galasa.obr
         - --metricserver
+        {{- if .Values.log4j2Properties }}
         - --log4j2-properties-file
         - file:/log4j2.properties
+        {{- end }}
         env:
         - name: GALASA_EXTRA_BUNDLES
           value: {{ include "framework.extra.bundles" . }}
@@ -127,10 +129,12 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
         volumeMounts:
+        {{- if .Values.log4j2Properties }}
         - name: log4j2-config
           mountPath: /log4j2.properties
           subPath: log4j2.properties
           readOnly: true
+        {{- end }}
       {{- if .Values.log4jJsonTemplatesConfigMapName }}
         - name: log4j-json-templates
           mountPath: /log4j-config
@@ -143,9 +147,11 @@ spec:
           readOnly: true
       {{- end }}
       volumes:
+      {{- if .Values.log4j2Properties }}
       - name: log4j2-config
         configMap:
           name: {{ .Release.Name }}-log4j2-config
+      {{- end }}
       {{- if .Values.log4jJsonTemplatesConfigMapName }}
       - name: log4j-json-templates
         configMap:

charts/ecosystem/templates/resource-monitor.yaml

@@ -86,8 +86,10 @@ spec:
         - --obr
         - file:galasa.obr
         - --resourcemanagement
+        {{- if .Values.log4j2Properties }}
         - --log4j2-properties-file
         - file:/log4j2.properties
+        {{- end }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -141,10 +143,12 @@ spec:
         - name: encryption-keys
           mountPath: {{ include "ecosystem.encryption.keys.directory" . }}
           readOnly: true
+        {{- if .Values.log4j2Properties }}
         - name: log4j2-config
           mountPath: /log4j2.properties
           subPath: log4j2.properties
           readOnly: true
+        {{- end }}
       {{- if .Values.log4jJsonTemplatesConfigMapName }}
         - name: log4j-json-templates
           mountPath: /log4j-config
@@ -160,9 +164,11 @@ spec:
       - name: encryption-keys
         secret:
           secretName: {{ include "ecosystem.encryption.keys.secret.name" . }}
+      {{- if .Values.log4j2Properties }}
       - name: log4j2-config
         configMap:
           name: {{ .Release.Name }}-log4j2-config
+      {{- end }}
       {{- if .Values.log4jJsonTemplatesConfigMapName }}
       - name: log4j-json-templates
         configMap:

charts/ecosystem/values.yaml

@@ -675,26 +675,7 @@ maxgRPCMessageSize: {}
 #   rootLogger.level = debug
 #   rootLogger.appenderRef.stdout.ref = stdout
 #
-log4j2Properties: |
-  status = error
-  name = Default
-
-  appender.console.type = Console
-  appender.console.name = stdout
-  appender.console.layout.type = PatternLayout
-  appender.console.layout.pattern = %d{dd/MM/yyyy HH:mm:ss.SSS} %-5p %c{1.} - %m%n
-
-  rootLogger.level = debug
-  rootLogger.appenderRef.stdout.ref = stdout
-
-  logger.http.name = org.apache.http
-  logger.http.level = info
-
-  logger.sshtools.name = com.sshtools
-  logger.sshtools.level = warn
-
-  logger.ftp.name = ftp
-  logger.ftp.level = info
+log4j2Properties: ""
 
 # The name of an existing ConfigMap in the same Kubernetes namespace that the Helm chart will be installed
 # in containing one or more custom Log4j JSON template layouts to customize the Log4j events generated