Merge branch 'master' into ADAPT-1690-kafka-schema-registry-upgrade

ps-dev · Feb 29, 2024 · 0919e2f · 0919e2f
2 parents 9a1681b + 60e0436
commit 0919e2f
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/catalog-info.yaml b/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
diff --git a/ingest/src/main/resources/log4j2.xml b/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>