Skip to content

Commit

Permalink
revert($ELK): enable ELK
Browse files Browse the repository at this point in the history 
Revert "perf($ELK): disable ELK"

This reverts commit ecdb3e2
  • Loading branch information
@johnnymillergh
johnnymillergh committed Jul 14, 2021
1 parent a334e9d commit 58ca161
Show file tree
Hide file tree
Showing 30 changed files with 35 additions and 35 deletions.
4 changes: 2 additions & 2 deletions api-gateway/src/main/resources/logback-configuration/logback-base.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
</rollingPolicy>
</appender>

<!-- LOGSTASH
<!-- LOGSTASH -->
<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_HOST}:4560</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
<customFields>{"appname": "${APPLICATION}"}</customFields>
</encoder>
</appender> -->
</appender>
</included>
2 changes: 1 addition & 1 deletion api-gateway/src/main/resources/logback-configuration/logback-development-docker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion api-gateway/src/main/resources/logback-configuration/logback-development-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion api-gateway/src/main/resources/logback-configuration/logback-production.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion api-gateway/src/main/resources/logback-configuration/logback-stage.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion api-gateway/src/main/resources/logback-configuration/logback-test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
4 changes: 2 additions & 2 deletions auth-center/src/main/resources/logback-configuration/logback-base.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@
</rollingPolicy>
</appender>

<!-- LOGSTASH
<!-- LOGSTASH -->
<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_HOST}:4560</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
<customFields>{"appname": "${APPLICATION}"}</customFields>
</encoder>
</appender> -->
</appender>
</included>
2 changes: 1 addition & 1 deletion auth-center/src/main/resources/logback-configuration/logback-development-docker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion auth-center/src/main/resources/logback-configuration/logback-development-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion auth-center/src/main/resources/logback-configuration/logback-production.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion auth-center/src/main/resources/logback-configuration/logback-stage.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion auth-center/src/main/resources/logback-configuration/logback-test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
4 changes: 2 additions & 2 deletions maf-mis/src/main/resources/logback-configuration/logback-base.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
</rollingPolicy>
</appender>

<!-- LOGSTASH
<!-- LOGSTASH -->
<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_HOST}:4560</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
<customFields>{"appname": "${APPLICATION}"}</customFields>
</encoder>
</appender> -->
</appender>
</included>
2 changes: 1 addition & 1 deletion maf-mis/src/main/resources/logback-configuration/logback-development-docker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion maf-mis/src/main/resources/logback-configuration/logback-development-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion maf-mis/src/main/resources/logback-configuration/logback-production.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion maf-mis/src/main/resources/logback-configuration/logback-stage.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion maf-mis/src/main/resources/logback-configuration/logback-test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
4 changes: 2 additions & 2 deletions oss-center/src/main/resources/logback-configuration/logback-base.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@
</rollingPolicy>
</appender>

<!-- LOGSTASH
<!-- LOGSTASH -->
<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_HOST}:4560</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
<customFields>{"appname": "${APPLICATION}"}</customFields>
</encoder>
</appender> -->
</appender>
</included>
2 changes: 1 addition & 1 deletion oss-center/src/main/resources/logback-configuration/logback-development-docker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion oss-center/src/main/resources/logback-configuration/logback-development-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion oss-center/src/main/resources/logback-configuration/logback-production.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion oss-center/src/main/resources/logback-configuration/logback-stage.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion oss-center/src/main/resources/logback-configuration/logback-test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
4 changes: 2 additions & 2 deletions spring-boot-admin/src/main/resources/logback-configuration/logback-base.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
</rollingPolicy>
</appender>

<!-- LOGSTASH
<!-- LOGSTASH -->
<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
<destination>${LOGSTASH_HOST}:4560</destination>
<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
<customFields>{"appname": "${APPLICATION}"}</customFields>
</encoder>
</appender> -->
</appender>
</included>
2 changes: 1 addition & 1 deletion spring-boot-admin/src/main/resources/logback-configuration/logback-development-docker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion spring-boot-admin/src/main/resources/logback-configuration/logback-development-local.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion spring-boot-admin/src/main/resources/logback-configuration/logback-production.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion spring-boot-admin/src/main/resources/logback-configuration/logback-stage.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>
2 changes: 1 addition & 1 deletion spring-boot-admin/src/main/resources/logback-configuration/logback-test.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<root level="INFO">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
<!--<appender-ref ref="LOGSTASH"/>-->
<appender-ref ref="LOGSTASH"/>
</root>
</configuration>

0 comments on commit 58ca161

Please sign in to comment.