Skip to content

Commit

Permalink
[sophora-admin-dashboard]: move logback configurations to values (#61)
Browse files Browse the repository at this point in the history 
* move logback configurations to values for sophora-admin-dashboard

* increase chart version
  • Loading branch information
@dustin-wickert
dustin-wickert authored Nov 15, 2023
1 parent 2efb80a commit 74efa6f
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 69 deletions.
2 changes: 1 addition & 1 deletion charts/sophora-admin-dashboard/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ maintainers:
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.1.0
version: 1.2.0
69 changes: 1 addition & 68 deletions charts/sophora-admin-dashboard/templates/logback-cm.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,71 +6,4 @@ metadata:
{{- include "sophora-admin-dashboard.labels" . | nindent 4 }}
data:
logback.xml: |
<?xml version="1.0" encoding="UTF-8" ?>
<configuration scan="true" scanPerion="10 seconds">
<jmxConfigurator />
<!-- Propagate level settings to java.util.logging. -->
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator" />
<property name="PATTERN" value="%d{HH:mm:ss} %-5level [%thread] [%X] %logger{0}:%L: %m%n" />
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>[%d{ISO8601}, %-5p] [%thread] %-5level %.40c:%L - %msg %n</pattern>
</encoder>
</appender>
<appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>logs/dashboard.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>logs/dashboard.%d{yyyy-MM-dd}.log.gz</fileNamePattern>
<maxHistory>7</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${PATTERN}</pattern>
</encoder>
</appender>
<appender name="warnlog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>WARN</level>
</filter>
<File>logs/dashboard_warn.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>logs/dashboard_warn.%d{yyyy-MM-dd}.log.gz</fileNamePattern>
<maxHistory>7</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${PATTERN}</pattern>
</encoder>
</appender>
<appender name="jetty" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/dashboard_request.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>logs/dashboard_request.%d{yyyy-MM-dd}.log.gz</fileNamePattern>
<maxHistory>30</maxHistory>
</rollingPolicy>
<encoder>
<pattern>%-4relative [%thread] %-5level %logger{35} - %msg%n</pattern>
</encoder>
</appender>
<logger name="com.subshell.sophora" level="INFO" />
<logger name="org.springframework" level="WARN" />
<!-- Suppress warnings from the RestTemplate. It will throw an exception anyway. -->
<logger name="org.springframework.web.client.RestTemplate" level="ERROR" />
<logger name="org.eclipse.jetty" level="WARN" />
<logger name="org.eclipse.jetty.server.RequestLog" level="INFO" additivity="false">
<appender-ref ref="jetty" />
</logger>
<root level="WARN">
<appender-ref ref="STDOUT" />
</root>
</configuration>
{{- .Values.sophora.dashboard.logback | nindent 4 }}
70 changes: 70 additions & 0 deletions charts/sophora-admin-dashboard/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,76 @@ sophora:
passwordKey: "password"
usernameKey: "username"

dashboard:
logback: |
<?xml version="1.0" encoding="UTF-8" ?>
<configuration scan="true" scanPerion="10 seconds">
<jmxConfigurator />
<!-- Propagate level settings to java.util.logging. -->
<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator" />
<property name="PATTERN" value="%d{HH:mm:ss} %-5level [%thread] [%X] %logger{0}:%L: %m%n" />
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>[%d{ISO8601}, %-5p] [%thread] %-5level %.40c:%L - %msg %n</pattern>
</encoder>
</appender>
<appender name="logfile" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>logs/dashboard.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>logs/dashboard.%d{yyyy-MM-dd}.log.gz</fileNamePattern>
<maxHistory>7</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${PATTERN}</pattern>
</encoder>
</appender>
<appender name="warnlog" class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>WARN</level>
</filter>
<File>logs/dashboard_warn.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>logs/dashboard_warn.%d{yyyy-MM-dd}.log.gz</fileNamePattern>
<maxHistory>7</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${PATTERN}</pattern>
</encoder>
</appender>
<appender name="jetty" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/dashboard_request.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>logs/dashboard_request.%d{yyyy-MM-dd}.log.gz</fileNamePattern>
<maxHistory>30</maxHistory>
</rollingPolicy>
<encoder>
<pattern>%-4relative [%thread] %-5level %logger{35} - %msg%n</pattern>
</encoder>
</appender>
<logger name="com.subshell.sophora" level="INFO" />
<logger name="org.springframework" level="WARN" />
<!-- Suppress warnings from the RestTemplate. It will throw an exception anyway. -->
<logger name="org.springframework.web.client.RestTemplate" level="ERROR" />
<logger name="org.eclipse.jetty" level="WARN" />
<logger name="org.eclipse.jetty.server.RequestLog" level="INFO" additivity="false">
<appender-ref ref="jetty" />
</logger>
<root level="WARN">
<appender-ref ref="STDOUT" />
</root>
</configuration>
startupProbe:
failureThreshold: 10
initialDelaySeconds: 10
Expand Down

0 comments on commit 74efa6f

Please sign in to comment.