feat: logger

.gitignore

@@ -25,3 +25,4 @@ replay_pid*
 !metabase/ojdbc8-full/**
 !metabase/InstallCert.class
 !Install
+.idea

charts/nr-metabase/templates/metabase/configmap.yaml

@@ -0,0 +1,74 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "metabase.fullname" . }}-log4j2
+  labels:
+    {{- include "metabase.labels" . | nindent 4 }}
+data:
+    log4j2.xml: |-
+        <?xml version="1.0" encoding="UTF-8"?>
+        <Configuration>
+        <Appenders>
+            <Console name="STDOUT" target="SYSTEM_OUT" follow="true">
+            <PatternLayout pattern="%style{%date}{white} | %highlight{%level}{ERROR=bright red, WARN=bright yellow, INFO=bright green, DEBUG=bright cyan} | %logger | %message%n%throwable">
+                <replace regex=":basic-auth \\[.*\\]" replacement=":basic-auth [redacted]"/>
+            </PatternLayout>
+            <Filters>
+                <RegexFilter regex=".*\/api\/health.*" onMatch="DENY" onMismatch="NEUTRAL"/>
+            </Filters>
+            </Console>
+        </Appenders>
+
+        <Loggers>
+            <Logger name="metabase" level="INFO"/>
+            <Logger name="metabase.server.middleware" level="DEBUG"/>
+
+            <Root level="ERROR">
+            <AppenderRef ref="STDOUT"/>
+            </Root>
+        </Loggers>
+        </Configuration>
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "metabase.fullname" . }}-startup
+  labels:
+    {{- include "metabase.labels" . | nindent 4 }}
+data:
+    run_app.sh: |-
+        #!/bin/bash
+        DB_HOST_PORT_ENV=${DB_HOST_PORT_ENV}
+        cert_folder="/opt"
+        MAX_HEAP=${MAX_HEAP:-500m}
+        MIN_HEAP=${MIN_HEAP:-500m}
+        if [ -z "$DB_HOST_PORT_ENV" ]; then
+        DB_HOST_PORT_ENV=nrcdb01.bcgov:1543,nrcdb03.bcgov:1543,nrkdb01.bcgov:1543,nrkdb03.bcgov:1543,nrcdb02.bcgov:1543,nrkdb02.bcgov:1543,nrkdb11.bcgov:1543
+        fi
+        IFS=','
+        read -ra DB_HOST_PORT_ARRAY <<< "${DB_HOST_PORT_ENV}"
+        for DB_HOST_PORT in "${DB_HOST_PORT_ARRAY[@]}"; do
+            IFS=':'
+            read -ra strarr <<<"${DB_HOST_PORT}"
+            DB_HOST="${strarr[0]}"
+            DB_PORT="${strarr[1]}"
+            openssl s_client -connect "${DB_HOST}:${DB_PORT}" -showcerts </dev/null 2>/dev/null | openssl x509 -outform pem >"$cert_folder/${DB_HOST}.pem" 2>/dev/null || exit 1
+            openssl x509 -outform der -in "$cert_folder/${DB_HOST}.pem" -out "$cert_folder/${DB_HOST}.der" 2>/dev/null || exit 1
+            keytool -import -alias "orakey-${DB_HOST}-1" -keystore "${JAVA_HOME}"/lib/security/cacerts -storepass changeit -file "$cert_folder/${DB_HOST}.der" -noprompt >/dev/null 2>&1 || exit 1
+        done
+
+        echo -e "\033[1;33m=====================================\033[0m"
+        echo -e "\033[0;36m  _   _ ____         __  __ ____  \033[0m"
+        echo -e "\033[0;36m | \ | |  _ \        |  \/  | __ ) \033[0m"
+        echo -e "\033[0;36m |  \| | |_) |       | |\/| |  _ \ \033[0m"
+        echo -e "\033[0;36m | |\  |  _ <        | |  | | |_) |\033[0m"
+        echo -e "\033[0;36m |_| \_|_| \_\       |_|  |_|____/ \033[0m"
+        echo -e "\033[0;36m                          ${NR_MB_VERSION} \033[0m"
+        echo -e "\033[1;33m=====================================\033[0m"
+
+
+        if [ -f /config/log4j2.xml ]; then
+            java -Duser.name=metabase -Xms${MIN_HEAP} -Xmx${MAX_HEAP} -XX:TieredStopAtLevel=4 -XX:+UseZGC -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=350m -XX:+ExitOnOutOfMemoryError -Dlog4j.configurationFile=file:/config/log4j2.xml -jar metabase.jar
+        else
+            java -Duser.name=metabase -Xms${MIN_HEAP} -Xmx${MAX_HEAP} -XX:TieredStopAtLevel=4 -XX:+UseZGC -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=350m -XX:+ExitOnOutOfMemoryError -jar metabase.jar
+        fi

charts/nr-metabase/templates/metabase/deployment.yaml

@@ -15,10 +15,8 @@ spec:
       {{- include "metabase.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      {{- with .Values.metabase.podAnnotations }}
       annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+        rollme: {{ randAlphaNum 5 | quote }}
       labels:
         {{- include "metabase.selectorLabels" . | nindent 8 }}
     spec:
@@ -28,7 +26,7 @@ spec:
         - name: {{ include "metabase.fullname" . }}
           securityContext:
             {{- toYaml .Values.metabase.securityContext | nindent 12 }}
-          image: "image-registry.openshift-image-registry.svc:5000/{{.Release.Namespace}}/{{ include "metabase.fullname" . }}:{{ .Values.metabase.metabaseImage.tag }}"
+          image: "artifacts.developer.gov.bc.ca/github-docker-remote/bcgov/nr-metabase/metabase:{{ .Values.metabase.metabaseImage.tag }}"
           imagePullPolicy: {{ .Values.metabase.image.pullPolicy }}
           env:
             - name: MB_DB_DBNAME
@@ -65,29 +63,52 @@ spec:
               value: 0.0.0.0
             - name: MB_PASSWORD_COMPLEXITY
               value: strong
+            - name: NR_MB_VERSION
+              value: {{ .Values.metabase.metabaseImage.tag }}
           ports:
             - name: http
               containerPort: {{ .Values.metabase.service.targetPort }}
               protocol: TCP
+          startupProbe:
+            httpGet:
+              path: /api/health
+              port: http
+            initialDelaySeconds: 5
+            periodSeconds: 5
+            timeoutSeconds: 2
+            failureThreshold: 20
           livenessProbe:
             httpGet:
               path: /api/health
               port: http
             initialDelaySeconds: 120
-            periodSeconds: 5
+            periodSeconds: 30
             timeoutSeconds: 3
-            failureThreshold: 30
+            failureThreshold: 2
           readinessProbe:
             httpGet:
               path: /api/health
               port: http
-            initialDelaySeconds: 10
-            periodSeconds: 5
+            initialDelaySeconds: 30
+            periodSeconds: 10
             timeoutSeconds: 3
-            failureThreshold: 50
+            failureThreshold: 5
           resources:
             {{- toYaml .Values.metabase.resources | nindent 12 }}
-
+          volumeMounts:
+            - name: log4j2
+              mountPath: /config
+            - name: startup
+              mountPath: /mnt
+      volumes:
+        - name: log4j2
+          configMap:
+            name: {{ template "metabase.fullname" . }}-log4j2
+            defaultMode: 0755 # Important: Sets execute permissions
+        - name: startup
+          configMap:
+            name: {{ template "metabase.fullname" . }}-startup
+            defaultMode: 0755 # Important: Sets execute permissions
       {{- with .Values.metabase.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/nr-metabase/values.yaml

@@ -37,7 +37,6 @@ metabase:
       memory: 1200Mi
   autoscaling:
     enabled: false
-  podAnnotations: {}
   podSecurityContext: {}
   securityContext: {}
   imagePullSecrets: []

metabase/Dockerfile

@@ -14,9 +14,7 @@ RUN wget -q https://downloads.metabase.com/${METABASE_VER}/metabase.jar \
 && chmod -R 777 /app
 COPY InstallCert.class .
 COPY "InstallCert\$SavingTrustManager.class" .
-COPY run_app.sh .
-RUN chmod +x run_app.sh
 RUN chmod -R 777 /opt && chmod -R 777 /etc/ca-certificates && chmod -R 777 "${JAVA_HOME}"/lib/security
 EXPOSE 3000
 USER 185
-ENTRYPOINT ["./run_app.sh"]
+ENTRYPOINT ["/mnt/run_app.sh"]

metabase/run_app.sh

@@ -1,26 +1,36 @@
 #!/bin/bash
 DB_HOST_PORT_ENV=${DB_HOST_PORT_ENV}
+cert_folder="/opt"
+MAX_HEAP=${MAX_HEAP:-750m}
+MIN_HEAP=${MIN_HEAP:-750m}
 echo "DB_HOST_PORT_ENV is $DB_HOST_PORT_ENV"
 if [ -z "$DB_HOST_PORT_ENV" ]; then
   DB_HOST_PORT_ENV=nrcdb01.bcgov:1543,nrcdb03.bcgov:1543,nrkdb01.bcgov:1543,nrkdb03.bcgov:1543,nrcdb02.bcgov:1543,nrkdb02.bcgov:1543
 fi
-echo "DB_HOST_PORT_ENV is $DB_HOST_PORT_ENV"
-echo "Adding certs"
   IFS=','
   read -ra DB_HOST_PORT_ARRAY <<< "${DB_HOST_PORT_ENV}"
   for DB_HOST_PORT in "${DB_HOST_PORT_ARRAY[@]}"; do
     IFS=':'
     read -ra strarr <<<"${DB_HOST_PORT}"
     DB_HOST="${strarr[0]}"
-    echo "DB_HOST is $DB_HOST"
     DB_PORT="${strarr[1]}"
-    echo "DB_PORT is $DB_PORT"
-    echo "I will try to get the ${DB_HOST}-1 cert"
-    echo "Connecting to ${DB_HOST}:${DB_PORT}"
-    java InstallCert --quiet "${DB_HOST}:${DB_PORT}"
-    keytool -exportcert -alias "$DB_HOST-1" -keystore jssecacerts -storepass changeit -file /opt/"$DB_HOST-1.cer"
-    keytool -importcert -alias "orakey-$DB_HOST-1" -noprompt -keystore "${JAVA_HOME}"/lib/security/cacerts -storepass changeit -file /opt/"$DB_HOST-1.cer"
+    openssl s_client -connect "${DB_HOST}:${DB_PORT}" -showcerts </dev/null | openssl x509 -outform pem >"$cert_folder/${DB_HOST}.pem" || exit 1
+    openssl x509 -outform der -in "$cert_folder/${DB_HOST}.pem" -out "$cert_folder/${DB_HOST}.der" || exit 1
+    keytool -import -alias "orakey-${DB_HOST}-1" -keystore "${JAVA_HOME}"/lib/security/cacerts -storepass changeit -file "$cert_folder/${DB_HOST}.der" -noprompt || exit 1
   done
 
-echo "Starting Metabase"
-java -Duser.name=metabase -Xms750m -Xmx750m -XX:TieredStopAtLevel=2 -XX:+UseParallelGC -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=350m -XX:ParallelGCThreads=2 -Djava.util.concurrent.ForkJoinPool.common.parallelism=4 -XX:CICompilerCount=2 -XX:+ExitOnOutOfMemoryError -jar metabase.jar
+echo -e "\033[1;33m=====================================\033[0m" # Bright Yellow
+echo -e "\033[0;36m  _   _ ____      __  __ ____  \033[0m" # Cyan
+echo -e "\033[0;36m | \ | |  _ \     |  \/  | __ ) \033[0m" # Cyan
+echo -e "\033[0;36m |  \| | |_) |    | |\/| |  _ \ \033[0m" # Cyan
+echo -e "\033[0;36m | |\  |  _ <     | |  | | |_) |\033[0m" # Cyan
+echo -e "\033[0;36m |_| \_|_| \_\    |_|  |_|____/ \033[0m" # Cyan
+echo -e "\033[0;36m                        ${NR_MB_VERSION} \033[0m" # Cyan
+echo -e "\033[1;33m=====================================\033[0m" # Bright Yellow
+
+if [ -f /mnt/conf/log4j2.xml ]; then
+  java -Duser.name=metabase "-Xms${MIN_HEAP}" "-Xmx${MAX_HEAP}" -XX:TieredStopAtLevel=2 -XX:+UseZGC  -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=350m -XX:ParallelGCThreads=2 -Djava.util.concurrent.ForkJoinPool.common.parallelism=4 -XX:CICompilerCount=2 -XX:+ExitOnOutOfMemoryError -Dlog4j.configurationFile=file:/config/log4j2.xml -jar metabase.jar
+else
+  java -Duser.name=metabase "-Xms${MIN_HEAP}" "-Xmx${MAX_HEAP}" -XX:TieredStopAtLevel=2 -XX:+UseZGC  -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=350m -XX:ParallelGCThreads=2 -Djava.util.concurrent.ForkJoinPool.common.parallelism=4 -XX:CICompilerCount=2 -XX:+ExitOnOutOfMemoryError -jar metabase.jar
+fi
+