Merge pull request #2 from JosephHieu/develop

Develop

Author: JosephHieu

.github/workflows/ci-cd.yml

@@ -2,9 +2,9 @@ name: Feedback Online System CI
 
 on:
   push:
-    branches: ["main"]
+    branches: ["main", "develop"]
   pull_request:
-    branches: ["main"]
+    branches: ["main", "develop"]
 
 jobs:
   # 1. JOB CHO BACKEND

01-backend/docker-compose-elk.yml

@@ -0,0 +1,50 @@
+version: '3.8'
+
+services:
+  backend-service:
+    build: .
+    container_name: feedback-backend
+    ports:
+      - "8080:8080"
+    environment:
+      - SPRING_PROFILES_ACTIVE=prod
+      - SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL}
+      - SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}
+      - SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD}
+      - JWT_SECRET_KEY=${JWT_SECRET_KEY}
+      - LOGSTASH_HOST=logstash
+    depends_on:
+      - logstash
+
+  # Logstash nhận log từ Spring Boot
+  logstash:
+    image: docker.elastic.co/logstash/logstash:8.12.0
+    container_name: feedback-logstash
+    volumes:
+      - ./logstash.conf:/usr/share/logstash/pipeline/logstash.conf:ro
+    ports:
+      - "5000:5000"
+    depends_on:
+      - elasticsearch
+
+  # Elasticsearch lưu trữ log
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.12.0
+    container_name: feedback-elasticsearch
+    environment:
+      - discovery.type=single-node
+      - xpack.security.enabled=false
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    ports:
+      - "9200:9200"
+
+  # Kibana giao diện xem log
+  kibana:
+    image: docker.elastic.co/kibana/kibana:8.12.0
+    container_name: feedback-kibana
+    ports:
+      - "5601:5601"
+    environment:
+      - ELASTICSEARCH_HOSTS=http://elasticsearch:9200
+    depends_on:
+      - elasticsearch

01-backend/logstash.conf

@@ -0,0 +1,13 @@
+input {
+  tcp {
+    port => 5000
+    codec => json_lines
+  }
+}
+
+output {
+  elasticsearch {
+    hosts => ["http://elasticsearch:9200"]
+    index => "feedback-online-logs-%{+YYYY.MM.dd}"
+  }
+}

01-backend/src/main/java/com/josephhieu/feedbackonline/entity/CauHoi.java

@@ -2,6 +2,9 @@
 
 import jakarta.persistence.*;
 import lombok.*;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+
 import java.util.UUID;
 
 @Entity
@@ -19,7 +22,8 @@ public class CauHoi extends BaseEntity {
     @JoinColumn(name = "MaTemplate")
     private Template template;
 
-    @Column(name = "TenCauHoi", nullable = false, columnDefinition = "TEXT")
+    @Column(name = "TenCauHoi", nullable = false)
+    @JdbcTypeCode(SqlTypes.LONGVARCHAR)
     private String tenCauHoi;
 
     @Column(name = "DiemToiThieu")

01-backend/src/main/resources/logback-spring.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
+
+    <!-- Appender 1: In log ra Console  -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%X{traceId}] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Appender 2: Gửi Log dạng JSON tới Logstash qua TCP -->
+    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+        <destination>${LOGSTASH_HOST:-localhost}:${LOGSTASH_PORT:-5000}</destination>
+        <encoder class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"app_name":"feedback-online"}</customFields>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="CONSOLE" />
+        <appender-ref ref="LOGSTASH" />
+    </root>
+</configuration>