chore!: removing fluentbit (#541)

.github/workflows/.deploy.yml

@@ -70,10 +70,6 @@ jobs:
           overwrite: true
           parameters:
             -p ZONE=${{ inputs.target }}
-            -p AWS_KINESIS_STREAM='${{ secrets.AWS_KINESIS_STREAM }}'
-            -p AWS_KINESIS_ROLE_ARN='${{ secrets.AWS_KINESIS_ROLE_ARN }}'
-            -p AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }}
-            -p AWS_ACCESS_KEY_SECRET='${{ secrets.AWS_ACCESS_KEY_SECRET }}'
             -p ORACLE_DB_USER=${{ secrets.DB_USER }}
             -p ORACLE_DB_PASSWORD='${{ secrets.ORACLE_DB_PASSWORD }}'
             -p ORACLE_DB_HOST='${{ secrets.ORACLE_DB_HOST }}'
@@ -92,7 +88,7 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        name: [database, backend, frontend, fluentbit]
+        name: [database, backend, frontend]
         include:
           - name: database
             file: common/openshift.database.yml
@@ -118,8 +114,6 @@ jobs:
               -p MIN_REPLICAS=1
               -p MAX_REPLICAS=1
               -p FAM_ROUTE=${{ needs.init.outputs.route }}
-          - name: fluentbit
-            file: common/openshift.fluentbit.yml
     steps:
       - uses: bcgov-nr/[email protected]
         id: deploys

backend/Dockerfile

@@ -25,5 +25,7 @@ HEALTHCHECK CMD curl -f http://localhost:${PORT}/actuator/health | grep '"status
 
 ENV SPRING_PROFILES_ACTIVE=container,prod
 
+ENV SPRING_PROFILES_ACTIVE=container,prod
+
 # Startup
 ENTRYPOINT ["/app/results"]

backend/dockerfile-entrypoint.sh

@@ -4,5 +4,4 @@ java \
     -Djava.security.egd=file:/dev/./urandom \
     ${JAVA_OPTS} \
     -jar \
-    -Dspring.profiles.active=prod \
     /app/artifacts/nr-results-backend.jar

backend/openshift.deploy.yml

@@ -105,8 +105,8 @@ objects:
         requests:
           storage: ${CERT_PVC_SIZE}
       storageClassName: netapp-file-standard
-  - apiVersion: apps/v1
-    kind: Deployment
+  - kind: Deployment
+    apiVersion: apps/v1
     metadata:
       labels:
         app: "${NAME}-${ZONE}"
@@ -156,8 +156,6 @@ objects:
               image: ${REGISTRY}/${ORG}/${NAME}/${COMPONENT}:${TAG}
               imagePullPolicy: Always
               volumeMounts:
-                - name: ${NAME}-${ZONE}-fluentbit-logs
-                  mountPath: /logs
                 - name: ${NAME}-${ZONE}-certs
                   mountPath: /cert
               env:
@@ -268,14 +266,11 @@ objects:
                   port: probe-port
                 failureThreshold: 10
           volumes:
-            - name: ${NAME}-${ZONE}-fluentbit-logs
-              persistentVolumeClaim:
-                claimName: ${NAME}-${ZONE}-fluentbit-logs
             - name: ${NAME}-${ZONE}-certs
               persistentVolumeClaim:
                 claimName: ${NAME}-${ZONE}-certs
-  - apiVersion: v1
-    kind: Service
+  - kind: Service
+    apiVersion: v1
     metadata:
       labels:
         app: "${NAME}-${ZONE}"
@@ -288,8 +283,8 @@ objects:
           targetPort: 8080
       selector:
         deployment: "${NAME}-${ZONE}-${COMPONENT}"
-  - apiVersion: route.openshift.io/v1
-    kind: Route
+  - kind: Route
+    apiVersion: route.openshift.io/v1
     metadata:
       labels:
         app: "${NAME}-${ZONE}"
@@ -309,8 +304,8 @@ objects:
       tls:
         termination: edge
         insecureEdgeTerminationPolicy: Redirect
-  - apiVersion: autoscaling/v2
-    kind: HorizontalPodAutoscaler
+  - kind: HorizontalPodAutoscaler
+    apiVersion: autoscaling/v2
     metadata:
       labels:
         app: "${NAME}-${ZONE}"

backend/src/main/resources/application.yml

@@ -160,4 +160,29 @@ ca:
 # Logging
 logging:
   level:
-    ca.bc.gov.restapi.results: ${LOGGING_LEVEL:INFO}
+    ca.bc.gov.restapi.results: ${LOGGING_LEVEL:INFO}
+  pattern:
+    correlation: "[${spring.application.name:},%X{${X-TRACE-ID:traceId}:-},%X{spanId:-},%X{X-USER:-}] "
+
+# Profile Specific Properties
+---
+spring:
+  config:
+    activate:
+      on-profile: container
+  sleuth:
+    propagation-keys:
+      - X-TRACE-ID
+      - X-USER
+    baggage-keys:
+      - X-TRACE-ID
+      - X-USER
+    log:
+      slf4j:
+        whitelisted-mdc-keys:
+          - X-TRACE-ID
+          - X-USER
+
+logging:
+  pattern:
+    console: "{\"time\": \"%d{${LOG_DATEFORMAT_PATTERN:yyyy-MM-dd HH:mm:ss.SSS}}\", \"level\": \"${LOG_LEVEL:%5p}\", \"app\":\"${spring.application.name:-}\", \"user\":\"%X{X-USER:-}\", \"traceId\":\"%X{${X-TRACE-ID:traceId}:-}\", \"spanId\":\"%X{spanId:-}\", \"pid\": \"${PID: }\", \"thread\": \"%t\", \"source\": \"%logger{63}:%L\", \"message\": \"%m\", \"exception\":\"${LOG_EXCEPTION_CONVERSION_WORD:%wEx}\"}%n"