From 8940ea17aea1359528710215f626166ac726cd7c Mon Sep 17 00:00:00 2001 From: munyeong0103 Date: Tue, 6 Jan 2026 11:19:07 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=9D=B8=ED=94=84=EB=9D=BC=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 10244 -> 10244 bytes ec2-user@54.116.37.146/docker-compose.yml | 88 ++++++++++++++++++ .../elasticsearch/config/elasticsearch.yml | 3 + .../elasticsearch/config/elasticsearch.yml | 3 + .../elk/kibana/config/kibana.yml | 3 + .../elk/logstash/config/logstash.yml | 2 + .../elk/logstash/pipeline/logstash.conf | 21 +++++ .../kibana/config/kibana.yml | 3 + .../logstash/config/logstash.yml | 2 + .../logstash/pipeline/logstash.conf | 21 +++++ .../common/health/HealthCheckController.java | 18 ++++ src/main/resources/application-dev.yml | 5 + .../resources/application-integration.yml | 5 + src/main/resources/application-prod.yml | 7 +- src/main/resources/application.yml | 7 ++ 15 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 ec2-user@54.116.37.146/docker-compose.yml create mode 100644 ec2-user@54.116.37.146/elasticsearch/config/elasticsearch.yml create mode 100644 ec2-user@54.116.37.146/elk/elasticsearch/config/elasticsearch.yml create mode 100644 ec2-user@54.116.37.146/elk/kibana/config/kibana.yml create mode 100644 ec2-user@54.116.37.146/elk/logstash/config/logstash.yml create mode 100644 ec2-user@54.116.37.146/elk/logstash/pipeline/logstash.conf create mode 100644 ec2-user@54.116.37.146/kibana/config/kibana.yml create mode 100644 ec2-user@54.116.37.146/logstash/config/logstash.yml create mode 100644 ec2-user@54.116.37.146/logstash/pipeline/logstash.conf create mode 100644 src/main/java/com/kt/common/health/HealthCheckController.java diff --git a/.DS_Store b/.DS_Store index 5236c20644cca775cd380445018713f0bd0c6e39..e9970641273a40c887ded6c4a6554a9aa067c1be 100644 GIT binary patch delta 376 zcmZn(XbG6$UDU^hRb;$(SYxy@PvQ@KP;OpJ9D3{8z|brh;CjSO@YOpMJY3yK&| zW|Ov4mXwl|i5Cz~N=(j9FUl{?OL5N6$uDxsDNT*YOwP{>&a6tETp+zmC|-cSI3vH@ z6DSr?lv6CjbBd delta 56 zcmV-80LTA?P=rvBPXQgVP`eKS9g`mu9 9601 # docker-compose 에서 열어둔 포트 + mode => "server" + codec => json_lines # LogstashEncoder 기본 포맷과 잘 맞음 + } +} + +filter { + mutate { + add_field => { "app" => "techup-shopping" } + add_field => { "env" => "${ENVIRONMENT}" } + } +} + +output { + elasticsearch { + hosts => ["http://elasticsearch:9200"] + index => "ep-logs-%{+YYYY.MM.dd}" + } +} \ No newline at end of file diff --git a/ec2-user@54.116.37.146/kibana/config/kibana.yml b/ec2-user@54.116.37.146/kibana/config/kibana.yml new file mode 100644 index 00000000..5b5d4968 --- /dev/null +++ b/ec2-user@54.116.37.146/kibana/config/kibana.yml @@ -0,0 +1,3 @@ +server.name: kibana +server.host: "0.0.0.0" +elasticsearch.hosts: [ "http://elasticsearch:9200" ] \ No newline at end of file diff --git a/ec2-user@54.116.37.146/logstash/config/logstash.yml b/ec2-user@54.116.37.146/logstash/config/logstash.yml new file mode 100644 index 00000000..3d2b63e5 --- /dev/null +++ b/ec2-user@54.116.37.146/logstash/config/logstash.yml @@ -0,0 +1,2 @@ +#http.host: "0.0.0.0" +xpack.monitoring.enabled: false \ No newline at end of file diff --git a/ec2-user@54.116.37.146/logstash/pipeline/logstash.conf b/ec2-user@54.116.37.146/logstash/pipeline/logstash.conf new file mode 100644 index 00000000..14983dfd --- /dev/null +++ b/ec2-user@54.116.37.146/logstash/pipeline/logstash.conf @@ -0,0 +1,21 @@ +input { + tcp { + port => 9601 # docker-compose 에서 열어둔 포트 + mode => "server" + codec => json_lines # LogstashEncoder 기본 포맷과 잘 맞음 + } +} + +filter { + mutate { + add_field => { "app" => "techup-shopping" } + add_field => { "env" => "${ENVIRONMENT}" } + } +} + +output { + elasticsearch { + hosts => ["http://elasticsearch:9200"] + index => "ep-logs-%{+YYYY.MM.dd}" + } +} \ No newline at end of file diff --git a/src/main/java/com/kt/common/health/HealthCheckController.java b/src/main/java/com/kt/common/health/HealthCheckController.java new file mode 100644 index 00000000..1f4da1b3 --- /dev/null +++ b/src/main/java/com/kt/common/health/HealthCheckController.java @@ -0,0 +1,18 @@ +package com.kt.common.health; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import lombok.RequiredArgsConstructor; + +@RestController +@RequestMapping("/api/health") +@RequiredArgsConstructor +public class HealthCheckController { + + @GetMapping + public String healthCheck() { + return "test success"; + } +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 65eb6296..f05c7cb9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -17,6 +17,11 @@ spring: cluster: nodes: ${redis.host} max-redirects: 3 + mail: + host: smtp.gmail.com + port: 587 + username: ${mail-username} + password: ${mail-password} jwt: secret: ${kt.jwt.secret} diff --git a/src/main/resources/application-integration.yml b/src/main/resources/application-integration.yml index c522ded6..b56474ac 100644 --- a/src/main/resources/application-integration.yml +++ b/src/main/resources/application-integration.yml @@ -10,6 +10,11 @@ spring: format_sql: true show_sql: true show-sql: true + mail: + host: smtp.gmail.com + port: 587 + username: ${mail-username} + password: ${mail-password} # data: # redis: # ssl: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index f9943a84..b27574c0 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -17,6 +17,11 @@ spring: cluster: nodes: ${redis.host} max-redirects: 3 + mail: + host: smtp.gmail.com + port: 587 + username: ${mail-username} + password: ${mail-password} jwt: secret: ${kt.jwt.secret} @@ -28,4 +33,4 @@ slack: log-channel: ${slack.channel} server: - port: ${shopping.server.port} \ No newline at end of file + port: ${server.port} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b95c160d..4dc09b47 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -14,3 +14,10 @@ logstash: host: ${logstashhost:localhost} port: ${logstashport:9601} + +slack: + bot-token: ${slack.token} + log-channel: ${slack.channel} + +server: + port: 8080 \ No newline at end of file