From cc3332613bedb451b4cac24bfe0f2aa57be6d879 Mon Sep 17 00:00:00 2001 From: Despereaux <157133321+Despereaux-MAU@users.noreply.github.com> Date: Sat, 4 Jan 2025 13:50:00 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=EB=A9=94=EC=9D=BC=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=20no=5Freply@botanify.site=20=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20/=20ssl=20=3D=20true=20=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #110 --- .../botanify/common/config/mail/MailConfig.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java b/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java index c4f417b..a475e0f 100644 --- a/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java +++ b/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java @@ -32,9 +32,10 @@ public JavaMailSender javaMailSender() { mailSender.setPassword(password); Properties props = mailSender.getJavaMailProperties(); - props.put("mail.transport.protocol", "smtp"); + props.put("mail.transport.protocol", "smtps"); props.put("mail.smtp.auth", "true"); - props.put("mail.smtp.starttls.enable", "true"); + props.put("mail.smtp.starttls.enable", "false"); + props.put("mail.smtp.ssl.enable", "true"); // SSL 설정 props.put("mail.debug", "true"); return mailSender; From 3f5c5f7215ba5644f69db67853a930f4427b8d05 Mon Sep 17 00:00:00 2001 From: Despereaux <157133321+Despereaux-MAU@users.noreply.github.com> Date: Sat, 4 Jan 2025 14:41:16 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=ED=95=98=EC=9D=B4=EC=9B=8D=EC=8A=A4?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #110 --- .../botanify/common/config/mail/MailConfig.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java b/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java index a475e0f..a7244e6 100644 --- a/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java +++ b/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java @@ -30,12 +30,14 @@ public JavaMailSender javaMailSender() { mailSender.setPort(port); mailSender.setUsername(username); mailSender.setPassword(password); + mailSender.setProtocol("smtps"); Properties props = mailSender.getJavaMailProperties(); props.put("mail.transport.protocol", "smtps"); props.put("mail.smtp.auth", "true"); + props.put("mail.smtp.ssl.enable", "true"); + props.put("mail.smtp.ssl.trust", "smtps.hiworks.com"); props.put("mail.smtp.starttls.enable", "false"); - props.put("mail.smtp.ssl.enable", "true"); // SSL 설정 props.put("mail.debug", "true"); return mailSender; From e41c49418c5b9444f3138af733ba420f836fd569 Mon Sep 17 00:00:00 2001 From: Despereaux <157133321+Despereaux-MAU@users.noreply.github.com> Date: Sat, 4 Jan 2025 20:19:48 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=EB=A9=94=EC=9D=BC=20=EC=8A=B9?= =?UTF-8?q?=EC=9D=B8=20=EC=A0=84=EA=B9=8C=EC=A7=80=20=EB=8C=80=EA=B8=B0=20?= =?UTF-8?q?=EB=B0=8F=20=ED=94=84=EB=A1=9C=EB=A9=94=ED=85=8C=EC=9A=B0?= =?UTF-8?q?=EC=8A=A4=20=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #110 --- prometheus/config/prometheus.yml | 27 ++++++++++--------- .../common/config/mail/MailConfig.java | 9 +++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/prometheus/config/prometheus.yml b/prometheus/config/prometheus.yml index 10ea651..c43748f 100644 --- a/prometheus/config/prometheus.yml +++ b/prometheus/config/prometheus.yml @@ -1,20 +1,21 @@ global: scrape_interval: 15s - scrape_timeout: 15s - evaluation_interval: 2m - - external_labels: - monitor: 'codelab-monitor' - query_log_file: query_log_file.log scrape_configs: - - job_name: 'monitoring-item' - scrape_interval: 10s - scrape_timeout: 10s - metrics_path: '/metrics' - scheme: 'http' + - job_name: 'spring-1' + static_configs: + - targets: ['3.39.43.235:8080'] + labels: + application: 'spring-1' + + - job_name: 'spring-2' + static_configs: + - targets: ['15.165.192.37:8080'] + labels: + application: 'spring-2' + - job_name: 'nginx' static_configs: - - targets: ['prometheus:9090', 'node_exporter:9100'] + - targets: ['43.202.147.203:9113'] labels: - service: 'monitor' \ No newline at end of file + instance: 'nginx' \ No newline at end of file diff --git a/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java b/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java index a7244e6..62efd63 100644 --- a/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java +++ b/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java @@ -30,14 +30,13 @@ public JavaMailSender javaMailSender() { mailSender.setPort(port); mailSender.setUsername(username); mailSender.setPassword(password); - mailSender.setProtocol("smtps"); + mailSender.setDefaultEncoding("UTF-8"); Properties props = mailSender.getJavaMailProperties(); + props.put("mail.smtps.auth", "true"); + props.put("mail.smtps.ssl.enable", "true"); + props.put("mail.smtps.ssl.trust", "smtps.hiworks.com"); props.put("mail.transport.protocol", "smtps"); - props.put("mail.smtp.auth", "true"); - props.put("mail.smtp.ssl.enable", "true"); - props.put("mail.smtp.ssl.trust", "smtps.hiworks.com"); - props.put("mail.smtp.starttls.enable", "false"); props.put("mail.debug", "true"); return mailSender; From 50a30e1ed6a2f87a3648be11370a3636860ab62e Mon Sep 17 00:00:00 2001 From: Despereaux <157133321+Despereaux-MAU@users.noreply.github.com> Date: Sun, 5 Jan 2025 20:51:58 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=EB=8F=84=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=EB=A9=94=EC=9D=BC=20=EC=9D=B8=EC=A6=9D=20=EC=8B=A4=ED=8C=A8?= =?UTF-8?q?=EB=A1=9C=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #110 --- .../botanify/common/config/mail/MailConfig.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java b/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java index 62efd63..c4f417b 100644 --- a/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java +++ b/src/main/java/com/sounganization/botanify/common/config/mail/MailConfig.java @@ -30,13 +30,11 @@ public JavaMailSender javaMailSender() { mailSender.setPort(port); mailSender.setUsername(username); mailSender.setPassword(password); - mailSender.setDefaultEncoding("UTF-8"); Properties props = mailSender.getJavaMailProperties(); - props.put("mail.smtps.auth", "true"); - props.put("mail.smtps.ssl.enable", "true"); - props.put("mail.smtps.ssl.trust", "smtps.hiworks.com"); - props.put("mail.transport.protocol", "smtps"); + props.put("mail.transport.protocol", "smtp"); + props.put("mail.smtp.auth", "true"); + props.put("mail.smtp.starttls.enable", "true"); props.put("mail.debug", "true"); return mailSender;