From 0dcd2b1b9ae9587b0f9d38ffb8a2eaea71f51b1d Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Thu, 12 Sep 2024 22:02:04 +0900
Subject: [PATCH] =?UTF-8?q?chore:=20json=E3=81=AE=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=82=92=E8=A6=8B=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 develop/docker-compose.yml                    | 60 +++++++++++++++++++
 develop/fluentd/Dockerfile                    |  4 ++
 develop/fluentd/conf/fluent.conf              | 19 ++++++
 .../http-client.env.json                      |  0
 .../mastodon-api.http                         |  0
 docker-compose.yml                            | 16 -----
 .../src/main/resources/logback-spring.xml     |  6 +-
 7 files changed, 88 insertions(+), 17 deletions(-)
 create mode 100644 develop/docker-compose.yml
 create mode 100644 develop/fluentd/Dockerfile
 create mode 100644 develop/fluentd/conf/fluent.conf
 rename http-client.env.json => develop/http-client.env.json (100%)
 rename mastodon-api.http => develop/mastodon-api.http (100%)
 delete mode 100644 docker-compose.yml

diff --git a/develop/docker-compose.yml b/develop/docker-compose.yml
new file mode 100644
index 00000000..4abaed5f
--- /dev/null
+++ b/develop/docker-compose.yml
@@ -0,0 +1,60 @@
+version: "3"
+
+services:
+  db:
+    image: postgres:16
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: "postgres"
+      POSTGRES_PASSWORD: "password"
+      POSTGRES_DB: "hideout"
+
+  mongodb:
+    image: mongo:7.0.14
+    ports:
+      - "27017:27017"
+
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.24
+    container_name: elasticsearch
+    environment:
+      - discovery.type=single-node
+      - cluster.name=docker-cluster
+      - bootstrap.memory_lock=true
+      - xpack.security.enabled=true
+      - xpack.monitoring.collection.enabled=true
+      - ELASTIC_PASSWORD=Passw0rd
+      - "ES_JAVA_OPTS=-Xms512M -Xmx512M"
+    ports:
+      - "9200:9200"
+    volumes:
+      - elasticsearch-data:/usr/share/elasticsearch/data
+    restart: always
+  kibana:
+    image: docker.elastic.co/kibana/kibana:7.17.24
+    container_name: kibana
+    ports:
+      - "5601:5601"
+    environment:
+      - ELASTICSEARCH_URL=http://elasticsearch:9200
+      - ELASTICSEARCH_USERNAME=elastic
+      - ELASTICSEARCH_PASSWORD=Passw0rd
+    depends_on:
+      - elasticsearch
+    restart: always
+
+  fluentd:
+    build: ./fluentd
+    volumes:
+      - ./fluentd/conf:/fluentd/etc
+      - ../logs:/in
+    depends_on:
+      - "elasticsearch"
+    ports:
+      - "24224:24224"
+      - "24224:24224/udp"
+
+volumes:
+  elasticsearch-data:
+    driver: local
\ No newline at end of file
diff --git a/develop/fluentd/Dockerfile b/develop/fluentd/Dockerfile
new file mode 100644
index 00000000..1070a2ce
--- /dev/null
+++ b/develop/fluentd/Dockerfile
@@ -0,0 +1,4 @@
+FROM fluent/fluentd:v1.16-debian-2
+USER root
+RUN fluent-gem install fluent-plugin-elasticsearch --no-document
+USER fluent
\ No newline at end of file
diff --git a/develop/fluentd/conf/fluent.conf b/develop/fluentd/conf/fluent.conf
new file mode 100644
index 00000000..51dbd4cf
--- /dev/null
+++ b/develop/fluentd/conf/fluent.conf
@@ -0,0 +1,19 @@
+<source>
+  @type tail
+  path /in/logFile.log.json
+  pos_file /in/logFile.pos
+  tag hideout
+  <parse>
+    @type json
+  </parse>
+</source>
+
+<match hideout>
+  @type elasticsearch
+  host elasticsearch
+  port 9200
+  index_name logs
+  include_timestamp true
+  user elastic
+  password Passw0rd
+</match>
\ No newline at end of file
diff --git a/http-client.env.json b/develop/http-client.env.json
similarity index 100%
rename from http-client.env.json
rename to develop/http-client.env.json
diff --git a/mastodon-api.http b/develop/mastodon-api.http
similarity index 100%
rename from mastodon-api.http
rename to develop/mastodon-api.http
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 274d183c..00000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: "3"
-
-services:
-  db:
-    image: postgres:16
-    ports:
-      - "5432:5432"
-    environment:
-      POSTGRES_USER: "postgres"
-      POSTGRES_PASSWORD: "password"
-      POSTGRES_DB: "hideout"
-
-  mongodb:
-    image: mongo:7.0.14
-    ports:
-      - "27017:27017"
\ No newline at end of file
diff --git a/hideout-core/src/main/resources/logback-spring.xml b/hideout-core/src/main/resources/logback-spring.xml
index 62421f27..a29f493e 100644
--- a/hideout-core/src/main/resources/logback-spring.xml
+++ b/hideout-core/src/main/resources/logback-spring.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <property name="LOG_FILE" value="logs/logFile.log"/>
-    <property name="CONSOLE_LOG_THRESHOLD" value="${CONSOLE_LOG_THRESHOLD:-INFO}"/>
+    <property name="CONSOLE_LOG_THRESHOLD" value="${CONSOLE_LOG_THRESHOLD:-TRACE}"/>
     <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"/>
@@ -12,4 +12,8 @@
         <appender-ref ref="ECS_JSON_FILE"/>
         <appender-ref ref="FILE"/>
     </root>
+    <logger name="javax.management" level="INFO"/>
+    <logger name="sun.rmi.loader" level="INFO"/>
+    <logger name="sun.rmi" level="INFO"/>
+    <logger name="java.io.serialization" level="INFO"/>
 </configuration>
\ No newline at end of file