chore(deps): update docker.elastic.co/elasticsearch/elasticsearch doc…

…ker tag to v8 (#173)

* chore(deps): update docker.elastic.co/elasticsearch/elasticsearch docker tag to v8

* Upgrade to latest version of ELK Stack, remove where not necessary

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Raja Kolli <[email protected]>

.vscode/launch.json

@@ -102,6 +102,16 @@
             "projectName": "aws-lambda-project",
             "args": "--spring.profiles.active=local",
             "envFile": "${workspaceFolder}/.env"
+        },
+        {
+            "type": "java",
+            "name": "Spring Boot-Application<aws-cloudwatch-project>",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "mainClass": "com.example.awsspring.Application",
+            "projectName": "aws-cloudwatch-project",
+            "args": "--spring.profiles.active=local",
+            "envFile": "${workspaceFolder}/.env"
         }
     ]
 }

aws-cloudwatch-project/.gitignore

@@ -34,4 +34,5 @@ build/
 
 ### Misc ###
 *.log
-.DS_Store
+.DS_Store
+/docker/volume

aws-cloudwatch-project/docker/docker-compose-elk.yml

@@ -2,7 +2,7 @@ version: '3.8'
 services:
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.17
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0
     container_name: elasticsearch
     environment:
       - cluster.name=docker-cluster
@@ -15,13 +15,9 @@ services:
     ports:
       - "9200:9200"
       - "9300:9300"
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
 
   logstash:
-    image: docker.elastic.co/logstash/logstash:7.17.17
+    image: docker.elastic.co/logstash/logstash:8.12.0
     container_name: logstash
     command: logstash -f /etc/logstash/conf.d/logstash.conf
     volumes:
@@ -32,7 +28,7 @@ services:
       - elasticsearch
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:7.17.17
+    image: docker.elastic.co/kibana/kibana:8.12.0
     container_name: kibana
     environment:
       - ELASTICSEARCH_URL=http://elasticsearch:9200

aws-cloudwatch-project/pom.xml

@@ -21,9 +21,6 @@
         <java.version>21</java.version>
         <spring-cloud-aws.version>3.1.0</spring-cloud-aws.version>
         <springdoc-openapi.version>2.3.0</springdoc-openapi.version>
-        <commons-io.version>2.15.1</commons-io.version>
-
-        <testcontainers.version>1.18.0</testcontainers.version>
 
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <spotless.version>2.43.0</spotless.version>
@@ -102,25 +99,16 @@
             <version>${springdoc-openapi.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>7.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.awaitility</groupId>
-            <artifactId>awaitility</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>

aws-cloudwatch-project/src/main/resources/application-local.properties

@@ -8,4 +8,7 @@ spring.cloud.aws.cloudwatch.region=us-east-1
 
 spring.cloud.aws.credentials.access-key=noop
 spring.cloud.aws.credentials.secret-key=noop
-spring.cloud.aws.region.static=us-east-1
+spring.cloud.aws.region.static=us-east-1
+
+logstash.host=localhost
+logstash.port=5000

aws-cloudwatch-project/src/main/resources/logback-spring.xml

@@ -3,6 +3,17 @@
     <include resource="org/springframework/boot/logging/logback/defaults.xml" />
     <include resource="org/springframework/boot/logging/logback/console-appender.xml" />
 
+    <springProperty scope="context" name="app_name" source="spring.application.name"/>
+    <springProperty scope="context" name="app_port" source="server.port"/>
+    <springProperty scope="local" name="logstash_host" source="logstash.host"/>
+    <springProperty scope="local" name="logstash_port" source="logstash.port"/>
+
+    <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <param name="Encoding" value="UTF-8"/>
+        <destination>${logstash_host:- }:${logstash_port:- }</destination>
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
+    </appender>
+
     <springProfile name="default">
         <root level="INFO">
             <appender-ref ref="CONSOLE" />
@@ -13,6 +24,7 @@
         <root level="INFO">
             <appender-ref ref="FILE" />
             <appender-ref ref="CONSOLE" />
+            <appender-ref ref="logstash" />
         </root>
     </springProfile>