[Fix/402] ELK 설정을 수정한다 (#403)

Nexters · Sep 10, 2024 · a731b51 · a731b51
1 parent 9547b3a
commit a731b51
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/.github/workflows/elk-deploy-workflow.yml b/.github/workflows/elk-deploy-workflow.yml
@@ -62,6 +62,7 @@ jobs:
           scp -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -o StrictHostKeyChecking=no -i private_key.pem ./elk/docker-compose.yml $SERVER_USER_NAME@$SERVER_HOST:/home/$SERVER_USER_NAME/docker
           scp -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -o StrictHostKeyChecking=no -i private_key.pem ./elk/kibana/kibana.yml $SERVER_USER_NAME@$SERVER_HOST:/home/$SERVER_USER_NAME/elk/kibana
           scp -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -o StrictHostKeyChecking=no -i private_key.pem ./elk/logstash/pipeline/logstash.conf $SERVER_USER_NAME@$SERVER_HOST:/home/$SERVER_USER_NAME/elk/logstash
+          scp -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -o StrictHostKeyChecking=no -i private_key.pem ./elk/logstash/logstash.yml $SERVER_USER_NAME@$SERVER_HOST:/home/$SERVER_USER_NAME/elk/logstash
           rm private_key.pem
 
       - name: Deploy to server

diff --git a/elk/docker-compose.yml b/elk/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     environment:
       discovery.type: single-node
       xpack.security.enabled: true
-      xpack.security.transport.ssl.enabled: true
+      ES_JAVA_OPTS: -Xms1g -Xmx1g
       ELASTIC_USERNAME: ${ELASTIC_USERNAME}
       ELASTIC_PASSWORD: ${ELASTIC_PASSWORD}
     networks:
@@ -27,7 +27,12 @@ services:
       - "${LOGSTASH_PORT}:5000"
       - "9600:9600"
     volumes:
-      - ../elk/logstash/pipeline:/usr/share/logstash/pipeline
+      - ../elk/logstash/logstash.conf:/usr/share/logstash/pipeline/logstash.conf
+      - ../elk/logstash/logstash.yml:/usr/share/logstash/config/logstash.yml
+    environment:
+      LOGSTASH_PORT: ${LOGSTASH_PORT}
+      ELASTIC_USERNAME: ${ELASTIC_USERNAME}
+      ELASTIC_PASSWORD: ${ELASTIC_PASSWORD}
     depends_on:
       - elasticsearch
     networks:
@@ -40,6 +45,9 @@ services:
       - "${KIBANA_PORT}:5601"
     volumes:
       - ../elk/kibana/kibana.yml:/usr/share/kibana/config/kibana.yml
+    environment:
+      ELASTIC_USERNAME: ${ELASTIC_USERNAME}
+      ELASTIC_PASSWORD: ${ELASTIC_PASSWORD}
     depends_on:
       - elasticsearch
     networks:

diff --git a/elk/logstash/logstash.yml b/elk/logstash/logstash.yml
@@ -0,0 +1,4 @@
+http.host: "0.0.0.0"
+
+xpack.monitoring.elasticsearch.username: ${ELASTIC_USERNAME}
+xpack.monitoring.elasticsearch.password: ${ELASTIC_PASSWORD}
diff --git a/elk/logstash/pipeline/logstash.conf b/elk/logstash/pipeline/logstash.conf
@@ -7,7 +7,7 @@ input {
 
 output {
   elasticsearch {
-    hosts => "elasticsearch:9200"
+    hosts => ["http://elasticsearch:9200"]
     user => "${ELASTIC_USERNAME}"
     password => "${ELASTIC_PASSWORD}"
     index => "logstash-%{+YYYY.MM.dd}"