From af555222f018fdbc77fb95a60ade6b2671b86240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20Perez?= <ipalbeniz@gmail.com>
Date: Tue, 20 Jul 2021 09:08:07 +0200
Subject: [PATCH 1/2] Add ECS console appender for spring boot

---
 .../logging/logback/boot/ecs-console-appender.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 logback-ecs-encoder/src/main/resources/co/elastic/logging/logback/boot/ecs-console-appender.xml

diff --git a/logback-ecs-encoder/src/main/resources/co/elastic/logging/logback/boot/ecs-console-appender.xml b/logback-ecs-encoder/src/main/resources/co/elastic/logging/logback/boot/ecs-console-appender.xml
new file mode 100644
index 00000000..2618113f
--- /dev/null
+++ b/logback-ecs-encoder/src/main/resources/co/elastic/logging/logback/boot/ecs-console-appender.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ECS JSON console appender logback configuration provided for import, similar to the console-appender.xml included in Spring Boot
+<include resource="co/elastic/logging/logback/boot/ecs-console-appender.xml" />
+-->
+
+<included>
+    <springProperty name="SERVICE_NAME" source="spring.application.name"/>
+    <appender name="ECS_JSON_CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="co.elastic.logging.logback.EcsEncoder">
+            <serviceName>${SERVICE_NAME:-spring-boot-application}</serviceName>
+        </encoder>
+    </appender>
+</included>

From 0d9674c3c4b1cc0b8f0c2775d5fa9761be2a484d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20Perez?= <ipalbeniz@gmail.com>
Date: Tue, 20 Jul 2021 09:35:10 +0200
Subject: [PATCH 2/2] Add example for the new ECS console appender for spring
 boot

---
 docs/tab-widgets/ecs-encoder.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/tab-widgets/ecs-encoder.asciidoc b/docs/tab-widgets/ecs-encoder.asciidoc
index 41a553b2..6b5a184d 100644
--- a/docs/tab-widgets/ecs-encoder.asciidoc
+++ b/docs/tab-widgets/ecs-encoder.asciidoc
@@ -11,8 +11,10 @@ In `src/main/resources/logback-spring.xml`:
     <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
     <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
     <include resource="org/springframework/boot/logging/logback/file-appender.xml" />
+    <include resource="co/elastic/logging/logback/boot/ecs-console-appender.xml" />
     <include resource="co/elastic/logging/logback/boot/ecs-file-appender.xml" />
     <root level="INFO">
+        <appender-ref ref="ECS_JSON_CONSOLE"/>
         <appender-ref ref="CONSOLE"/>
         <appender-ref ref="ECS_JSON_FILE"/>
         <appender-ref ref="FILE"/>