Merge branch 'PDP1-895' into 'team_city_migration'

Resolve PDP1-895

See merge request pluralsight/Technology/adapt/data-platform/hydra!1

.gitlab-ci.yml

@@ -3,6 +3,9 @@ include:
     file: '/salt-deploy/helper.yml'
   - project: 'pluralsight/experience/gitlab-helpers'
     file: '/helm-deploy/helper.yml'
+  - project: 'pluralsight/Technology/adapt/data-platform/gitlab-fragments/snyk'
+    ref: main
+    file: 'snyk-check.yml'
 
 image: openjdk:8
 
@@ -30,6 +33,11 @@ variables:
     Version: *[[BUILD_VERSION]]*
     [[PIPELINE_LINK]]
   SLACK_USERNAME: 'GITLAB'
+  SNYK_SLACK_CHANNEL: '#dataops-snyk-vulnerability-alerts'
+  SNYK_SLACK_ICON_EMOJI: ":snyk:"
+  SNYK_ORG_ID: "d8094638-7a37-413f-b1b4-ad840fb9e239"
+  SNYK_PROJECT_ID: "d243a0e6-4ced-4efe-83fc-169d03b40cc7"
+  SNYK_PROJECT_URL: "https://app.snyk.io/org/ps-data-services"
 
 before_script:
   - apt-get update -yqq
@@ -43,6 +51,7 @@ before_script:
 
 stages:
   - build
+  - code-analysis
   - package
   - publish
   - deploy_dev

catalog-info.yaml

@@ -0,0 +1,20 @@
+apiVersion: pluralsight/v1
+kind: BC
+metadata:
+  name: adapt-dvs
+spec:
+  lifecycle: production
+  owner: exp_adapt_dvs
+  responsibilities:
+    - Shared component for hydra
+  systems:
+    - adapt-dvs
+---
+apiVersion: backstage.io/v1alpha1
+kind: System
+metadata:
+  name: adapt-dvs
+  tags: []
+spec:
+  lifecycle: production
+  owner: exp_adapt_dvs

ingest/src/main/resources/log4j2.xml

@@ -14,12 +14,15 @@
   ~ limitations under the License.
   -->
 <Configuration>
+    <Properties>
+        <Property name="LOG_DIR">/var/log/hydra</Property>
+    </Properties>
     <Appenders>
         <Console name="STDOUT" target="SYSTEM_OUT">
             <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p (%C:%L) - %m%n"/>
         </Console>
-        <RollingFile name="LogToRollingFile" fileName="/var/log/hydra/schema-registry-endpoint2.log"
-                     filePattern="/var/log/hydra/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
+        <RollingFile name="LogToRollingFile" fileName="${LOG_DIR}/schema-registry-endpoint2.log"
+                     filePattern="${LOG_DIR}/$${date:yyyy-MM}/app-%d{MM-dd-yyyy}-%i.log.gz">
             <PatternLayout>
                 <Pattern>%d{yyyy-MM-dd HH:mm:ss} %-5p (%C:%L) - %m%n</Pattern>
             </PatternLayout>
@@ -28,25 +31,41 @@
                 <SizeBasedTriggeringPolicy size="10 MB"/>
             </Policies>
         </RollingFile>
+        <RollingFile name="RollingFileHydraIngest" fileName="${LOG_DIR}/hydra-ingest.log"
+                     filePattern="${LOG_DIR}/$${date:yyyy-MM}/hydra-ingest-%d{yyyy-MM-dd}.log.gz">
+            <PatternLayout>
+                <Pattern>%d{yyyy-MM-dd HH:mm:ss} %-5p (%C:%L) - %m%n</Pattern>
+            </PatternLayout>
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <SizeBasedTriggeringPolicy size="3GB"/>
+            </Policies>
+        </RollingFile>
     </Appenders>
     <Loggers>
         <Logger name="hydra.ingest.http" level="info" additivity="false">
             <AppenderRef ref="LogToRollingFile"/>
+            <AppenderRef ref="RollingFileHydraIngest"/>
         </Logger>
         <Logger name="org.reflections" additivity="false">
             <AppenderRef ref="STDOUT"/>
+            <AppenderRef ref="RollingFileHydraIngest"/>
         </Logger>
         <Logger name="org.apache.kafka" additivity="false" level="ERROR">
             <AppenderRef ref="STDOUT"/>
+            <AppenderRef ref="RollingFileHydraIngest"/>
         </Logger>
         <Logger name="io.confluent.common.config" additivity="false" level="ERROR">
             <AppenderRef ref="STDOUT"/>
+            <AppenderRef ref="RollingFileHydraIngest"/>
         </Logger>
         <Logger name="akka.management" additivity="false" level="ERROR">
             <AppenderRef ref="STDOUT"/>
+            <AppenderRef ref="RollingFileHydraIngest"/>
         </Logger>
         <Root level="${env:LOG_LEVEL}">
             <AppenderRef ref="STDOUT"/>
+            <AppenderRef ref="RollingFileHydraIngest"/>
         </Root>
     </Loggers>
 </Configuration>