From 0fa8748766d741c2f3c7faf69cfd8dd282aec9cb Mon Sep 17 00:00:00 2001
From: lakamsani <lakamsani@gmail.com>
Date: Mon, 21 Oct 2019 18:26:30 -0700
Subject: [PATCH] changed logstash port to 6000 as it conflicts with docker
 desktop for mac 2.1.0.4. The graph in figure 11.5 and the related table look
 a bit different.

---
 .gitignore                                                      | 2 ++
 Chapter11/docker-compose.yml                                    | 2 +-
 .../exercise1/client/src/main/resources/logback-spring.xml      | 2 +-
 .../exercise1/formatter/src/main/resources/logback-spring.xml   | 2 +-
 Chapter11/exercise1/hello/src/main/resources/logback-spring.xml | 2 +-
 Chapter11/logstash/pipeline/logstash.conf                       | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1d74e21..b3d9e65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 .vscode/
+.idea/
+**/*.iml
diff --git a/Chapter11/docker-compose.yml b/Chapter11/docker-compose.yml
index 9869b16..4852488 100644
--- a/Chapter11/docker-compose.yml
+++ b/Chapter11/docker-compose.yml
@@ -18,7 +18,7 @@ services:
       - ./logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro
       - ./logstash/pipeline:/usr/share/logstash/pipeline:ro
     ports:
-      - "5000:5000"
+      - "6000:6000"
     environment:
       LS_JAVA_OPTS: "-Xmx256m -Xms256m"
     depends_on:
diff --git a/Chapter11/exercise1/client/src/main/resources/logback-spring.xml b/Chapter11/exercise1/client/src/main/resources/logback-spring.xml
index ac68a10..1e6929e 100644
--- a/Chapter11/exercise1/client/src/main/resources/logback-spring.xml
+++ b/Chapter11/exercise1/client/src/main/resources/logback-spring.xml
@@ -6,7 +6,7 @@
         </encoder>
     </appender>
     <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>${logstash.host}:5000</destination>
+        <destination>${logstash.host}:6000</destination>
         <encoder class="net.logstash.logback.encoder.LogstashEncoder">
             <customFields>{"application":"hello-app","service":"client-1"}</customFields>
         </encoder>
diff --git a/Chapter11/exercise1/formatter/src/main/resources/logback-spring.xml b/Chapter11/exercise1/formatter/src/main/resources/logback-spring.xml
index fc30025..7bf5be6 100644
--- a/Chapter11/exercise1/formatter/src/main/resources/logback-spring.xml
+++ b/Chapter11/exercise1/formatter/src/main/resources/logback-spring.xml
@@ -6,7 +6,7 @@
         </encoder>
     </appender>
     <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>${logstash.host}:5000</destination>
+        <destination>${logstash.host}:6000</destination>
         <encoder class="net.logstash.logback.encoder.LogstashEncoder">
             <customFields>{"application":"hello-app","service":"formatter-1"}</customFields>
         </encoder>
diff --git a/Chapter11/exercise1/hello/src/main/resources/logback-spring.xml b/Chapter11/exercise1/hello/src/main/resources/logback-spring.xml
index 3e0b723..afaba21 100644
--- a/Chapter11/exercise1/hello/src/main/resources/logback-spring.xml
+++ b/Chapter11/exercise1/hello/src/main/resources/logback-spring.xml
@@ -6,7 +6,7 @@
         </encoder>
     </appender>
     <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>${logstash.host}:5000</destination>
+        <destination>${logstash.host}:6000</destination>
         <encoder class="net.logstash.logback.encoder.LogstashEncoder">
             <customFields>{"application":"hello-app","service":"hello-1"}</customFields>
         </encoder>
diff --git a/Chapter11/logstash/pipeline/logstash.conf b/Chapter11/logstash/pipeline/logstash.conf
index f990945..1b65367 100644
--- a/Chapter11/logstash/pipeline/logstash.conf
+++ b/Chapter11/logstash/pipeline/logstash.conf
@@ -6,7 +6,7 @@ filter {
 
 input {
 	tcp {
-		port => 5000
+		port => 6000
 	}
 }