merge: develop merge

.gitignore

@@ -1,3 +1,13 @@
 .DS_Store
 *.log
-venv
+venv
+certbot
+*.tmpl
+*.db
+.envrc
+/.idea/
+config.yml
+bin/
+coverage.txt
+.env
+dashboard/

alertmanager/alertmanager.yml

@@ -0,0 +1,15 @@
+global:
+  resolve_timeout: 5m
+
+route:
+  receiver: 'slack-notifications'
+  group_wait: 10s
+  group_interval: 10s
+  repeat_interval: 5m
+
+receivers:
+  - name: 'slack-notifications' #알림 이름
+    slack_configs:
+    - api_url: 'https://hooks.slack.com/services/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' #webhook url 추가
+      channel: '#team-d' #사용하는 채널
+      send_resolved: true

docker-compose-dev.yml

@@ -4,20 +4,20 @@ services:
   redis:
     image: redis:6
     ports:
-      - "6379:6379"
+      - '6379:6379'
     networks:
       - mvs
 
   rabbitmq:
     image: rabbitmq:3-management
     ports:
-      - "5672:5672"
-      - "15672:15672"
+      - '5672:5672'
+      - '15672:15672'
     environment:
       RABBITMQ_DEFAULT_USER: guest
       RABBITMQ_DEFAULT_PASS: guest
     healthcheck:
-      test: ["CMD", "rabbitmqctl", "status"]
+      test: ['CMD', 'rabbitmqctl', 'status']
       interval: 30s
       timeout: 10s
       retries: 5
@@ -27,12 +27,22 @@ services:
   celery:
     build:
       context: ./MVStudio-Backend
-    command: celery -A config worker --loglevel=info
+    ports:
+      - '5555:5555'
     depends_on:
-      - redis
       - rabbitmq
+      - redis
     networks:
       - mvs
+    command: >
+      sh -c "
+            celery -A config worker --loglevel=info --concurrency=2 -n worker_1_@%h &
+            celery -A config worker --loglevel=info --concurrency=2 -Q music_queue -n worker_2_@%h &
+            celery -A config worker --loglevel=info --concurrency=10 -Q video_queue -n worker_3_@%h &
+            celery -A config worker --loglevel=info --concurrency=2 -Q final_queue -n worker_4_@%h &
+            celery -A config flower --port=5555 --broker=$CELERY_BROKER_URL --broker-api=http://guest:guest@rabbitmq:15672/api/"
+    environment:
+      - CELERY_BROKER_URL=amqp://guest:guest@rabbitmq:5672/
 
   celery-beat:
     build:
@@ -44,43 +54,29 @@ services:
     networks:
       - mvs
 
-  flower:
-    image: mher/flower:0.9.7
-    build:
-      context: ./MVStudio-Backend
-    working_dir: /MVStudio-Backend
-    command: celery flower --port=5555 --broker=$CELERY_BROKER_URL
-    ports:
-      - "5555:5555"
-    depends_on:
-      rabbitmq:
-        condition: service_healthy
-      celery:
-        condition: service_started
-    environment:
-      - CELERY_BROKER_URL=amqp://guest:guest@rabbitmq:5672/
-    networks:
-      - mvs
-
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.10.1
     environment:
       - discovery.type=single-node
-      - ES_JAVA_OPTS=-Xms512m -Xmx512m
+      - ES_JAVA_OPTS=-Xms256m -Xmx256m
     ulimits:
       memlock:
         soft: -1
         hard: -1
     volumes:
       - es_data:/usr/share/elasticsearch/data
     ports:
-      - "9200:9200"
-    user: "1000:1000"  # 비루트 사용자로 설정
+      - '9200:9200'
+    user: '1000:1000' # 비루트 사용자로 설정
     command: >
       sh -c "elasticsearch-plugin install analysis-nori &&
              bin/elasticsearch"
     healthcheck:
-      test: ["CMD-SHELL", "curl -s http://localhost:9200/_cluster/health | grep -vq '\"status\":\"red\"'"]
+      test:
+        [
+          'CMD-SHELL',
+          'curl -s http://localhost:9200/_cluster/health | grep -vq ''"status":"red"''',
+        ]
       interval: 10s
       timeout: 5s
       retries: 10
@@ -95,7 +91,7 @@ services:
       - static_volume:/MVStudio-Backend/static
       - ./MVStudio-Backend:/MVStudio-Backend
     ports:
-      - "8000:8000"
+      - '8000:8000'
     depends_on:
       redis:
         condition: service_started
@@ -112,10 +108,10 @@ services:
             python manage.py makemigrations member &&
             python manage.py makemigrations music_videos &&
             python manage.py migrate &&
+            python manage.py migrate --fake &&
             python manage.py search_index --create &&
             python manage.py search_index --rebuild -f&&
             python manage.py runserver 0.0.0.0:8000"
-            
 
 volumes:
   static_volume: