From ffeb04291dbf0d0391447d7b042ef4f89a02f6e5 Mon Sep 17 00:00:00 2001 From: HongGit Date: Thu, 23 Jan 2025 02:16:36 +0900 Subject: [PATCH 01/16] =?UTF-8?q?[chore/#12]=20=EB=AA=A8=EB=8B=88=ED=84=B0?= =?UTF-8?q?=EB=A7=81=20=EA=B4=80=EB=A0=A8=20=EC=9D=98=EC=A1=B4=EC=84=B1=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- build.gradle | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4125023..716f06a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ build/ !**/src/main/**/build/ !**/src/test/**/build/ -.env +*.env ### STS ### .apt_generated diff --git a/build.gradle b/build.gradle index 47c4de6..6ddc254 100644 --- a/build.gradle +++ b/build.gradle @@ -56,6 +56,12 @@ dependencies { // validator implementation 'commons-validator:commons-validator:1.7' + // actuator + implementation 'org.springframework.boot:spring-boot-starter-actuator' + + // monitoring + implementation 'io.micrometer:micrometer-registry-prometheus' + } tasks.named('test') { From d4622ab17ec764bf4003dac8d96d19927bb30be0 Mon Sep 17 00:00:00 2001 From: HongGit Date: Thu, 23 Jan 2025 02:17:21 +0900 Subject: [PATCH 02/16] =?UTF-8?q?[feat/#12]=20=EB=AA=A8=EB=8B=88=ED=84=B0?= =?UTF-8?q?=EB=A7=81=20=EC=84=A4=EC=A0=95=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-monitoring.yml | 11 +++++++++++ src/main/resources/application.yml | 1 + 2 files changed, 12 insertions(+) create mode 100644 src/main/resources/application-monitoring.yml diff --git a/src/main/resources/application-monitoring.yml b/src/main/resources/application-monitoring.yml new file mode 100644 index 0000000..3d4d975 --- /dev/null +++ b/src/main/resources/application-monitoring.yml @@ -0,0 +1,11 @@ +management: + endpoints: + web: + exposure: + include: "prometheus,health,info" + health: + show-details: always + metrics: + export: + prometheus: + enabled: true \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c5ca596..29ea7a0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,6 +8,7 @@ spring: include: - aws - security + - monitoring mvc: ignore-default-favicon: true From 5af12d19e36ffd5551e07509f3f461faee5718db Mon Sep 17 00:00:00 2001 From: HongGit Date: Thu, 23 Jan 2025 02:18:06 +0900 Subject: [PATCH 03/16] =?UTF-8?q?[feat/#12]=20=EB=AA=A8=EB=8B=88=ED=84=B0?= =?UTF-8?q?=EB=A7=81=20docker-compose=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..ca19583 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,53 @@ +version: "3" +services: + + prometheus: + image: prom/prometheus + container_name: prometheus + volumes: + - ./src/main/resources/prometheus.yml:/etc/prometheus/prometheus.yml + command: + - "--config.file=/etc/prometheus/prometheus.yml" + ports: + - "9090:9090" + networks: + - monitoring + + grafana: + image: grafana/grafana:9.4.7 + container_name: grafana + ports: + - "3000:3000" + volumes: + - ./grafana/volume:/var/lib/grafana + restart: always + networks: + - monitoring + + loki: + image: grafana/loki:2.8.2 + container_name: loki + ports: + - "3100:3100" + volumes: + - ./loki-data:/var/lib/loki + - ./loki-config.yml:/etc/loki/config.yml + command: -config.file=/etc/loki/config.yml + networks: + - monitoring + + promtail: + image: grafana/promtail:2.8.2 + container_name: promtail + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - ./promtail-config.yml:/etc/promtail/config.yml + command: -config.file=/etc/promtail/config.yml + depends_on: + - loki + networks: + - monitoring + +networks: + monitoring: + driver: bridge \ No newline at end of file From 0e8cb35c569df3ac5b86f5b78b7389f9c7dd0083 Mon Sep 17 00:00:00 2001 From: HongGit Date: Thu, 23 Jan 2025 02:19:17 +0900 Subject: [PATCH 04/16] =?UTF-8?q?[feat/#12]=20=EB=AA=A8=EB=8B=88=ED=84=B0?= =?UTF-8?q?=EB=A7=81=20=EB=84=A4=ED=8A=B8=EC=9B=8C=ED=81=AC=20=EB=B8=8C?= =?UTF-8?q?=EB=A6=BF=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose-dev.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 821939f..0931020 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -29,6 +29,7 @@ services: - moplus-dev - nginx-network - apm_env + - monitoring mysql: image: mysql:8.0 @@ -55,6 +56,8 @@ volumes: networks: moplus-dev: driver: bridge + monitoring: + driver: bridge nginx-network: external: true apm_env: From 7b6effc6acb1a504c2fb6faff86766214be311b1 Mon Sep 17 00:00:00 2001 From: HongGit Date: Thu, 23 Jan 2025 02:20:04 +0900 Subject: [PATCH 05/16] =?UTF-8?q?[feat/#12]=20loki=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- loki-config.yml | 46 +++++++++++++++++++++++++++++++++++++++++++++ promtail-config.yml | 18 ++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 loki-config.yml create mode 100644 promtail-config.yml diff --git a/loki-config.yml b/loki-config.yml new file mode 100644 index 0000000..501413a --- /dev/null +++ b/loki-config.yml @@ -0,0 +1,46 @@ +auth_enabled: false + +server: + http_listen_port: ${LOKI_PORT} + +ingester: + wal: + enabled: true + dir: /var/lib/loki/wal + lifecycler: + address: 127.0.0.1 + ring: + kvstore: + store: inmemory + replication_factor: 1 + +compactor: + working_directory: /var/lib/loki/compactor + shared_store: filesystem + +schema_config: + configs: + - from: 2022-10-24 + store: boltdb-shipper + object_store: filesystem + schema: v11 + index: + prefix: index_ + period: 24h + +storage_config: + boltdb_shipper: + active_index_directory: /var/lib/loki/index + shared_store: filesystem + cache_location: /var/lib/loki/cache + +limits_config: + reject_old_samples: true + reject_old_samples_max_age: 168h + +chunk_store_config: + max_look_back_period: 0s + +table_manager: + retention_deletes_enabled: false + retention_period: 0s \ No newline at end of file diff --git a/promtail-config.yml b/promtail-config.yml new file mode 100644 index 0000000..d83a699 --- /dev/null +++ b/promtail-config.yml @@ -0,0 +1,18 @@ +server: + http_listen_port: ${PROMTAIL_PORT} + +positions: + filename: /tmp/positions.yaml + +clients: + - url: http://loki:3100/loki/api/v1/push + +scrape_configs: + - job_name: "docker-logs" + docker_sd_configs: + - host: unix:///var/run/docker.sock + refresh_interval: 5s + relabel_configs: + - source_labels: [__meta_docker_container_name] + regex: "/(.*)" + target_label: container \ No newline at end of file From e84da8e2517e5ab035ac1b01638b3b0b510f2940 Mon Sep 17 00:00:00 2001 From: HongGit Date: Thu, 23 Jan 2025 02:20:47 +0900 Subject: [PATCH 06/16] =?UTF-8?q?[feat/#12]=20=EC=8B=9C=ED=81=90=EB=A6=AC?= =?UTF-8?q?=ED=8B=B0=20=ED=99=94=EC=9D=B4=ED=8A=B8=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20actuator=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moplus_server/global/config/security/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/moplus/moplus_server/global/config/security/SecurityConfig.java b/src/main/java/com/moplus/moplus_server/global/config/security/SecurityConfig.java index 64d3142..31d5835 100644 --- a/src/main/java/com/moplus/moplus_server/global/config/security/SecurityConfig.java +++ b/src/main/java/com/moplus/moplus_server/global/config/security/SecurityConfig.java @@ -34,7 +34,7 @@ public class SecurityConfig { private final EmailPasswordSuccessHandler emailPasswordSuccessHandler; private final AuthenticationConfiguration authenticationConfiguration; - private String[] allowUrls = {"/", "/favicon.ico", "/swagger-ui/**", "/v3/**"}; + private String[] allowUrls = {"/", "/favicon.ico", "/swagger-ui/**", "/v3/**", "/actuator/**"}; @Value("${cors-allowed-origins}") private List corsAllowedOrigins; From e9df9c7a40928ad8a69b7d12ea0bed7c482ebced Mon Sep 17 00:00:00 2001 From: HongGit Date: Thu, 23 Jan 2025 02:21:39 +0900 Subject: [PATCH 07/16] =?UTF-8?q?[feat/#12]=20=ED=94=84=EB=A1=9C=EB=A9=94?= =?UTF-8?q?=ED=85=8C=EC=9A=B0=EC=8A=A4=20=EC=84=A4=EC=A0=95=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/prometheus.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/main/resources/prometheus.yml diff --git a/src/main/resources/prometheus.yml b/src/main/resources/prometheus.yml new file mode 100644 index 0000000..6d88d23 --- /dev/null +++ b/src/main/resources/prometheus.yml @@ -0,0 +1,12 @@ +global: + scrape_interval: ${PROMETHEUS_SCRAPE_INTERVAL} + +scrape_configs: + - job_name: 'prometheus' + static_configs: + - targets: ['localhost:9090'] + + - job_name: 'moplus_server' + metrics_path: '/actuator/prometheus' + static_configs: + - targets: ['${PROMETHEUS_TARGET_BACKEND}'] \ No newline at end of file From 4860fb31b9230335d62ce719a93d394a2b8c4b19 Mon Sep 17 00:00:00 2001 From: HongGit Date: Wed, 29 Jan 2025 02:41:06 +0900 Subject: [PATCH 08/16] =?UTF-8?q?[feat/#12]=20=ED=99=98=EA=B2=BD=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ca19583..36acb20 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,10 +8,15 @@ services: - ./src/main/resources/prometheus.yml:/etc/prometheus/prometheus.yml command: - "--config.file=/etc/prometheus/prometheus.yml" + env_file: + - .env + environment: + - PROMETHEUS_SCRAPE_INTERVAL=${PROMETHEUS_SCRAPE_INTERVAL} ports: - "9090:9090" networks: - monitoring + restart: always grafana: image: grafana/grafana:9.4.7 @@ -19,10 +24,14 @@ services: ports: - "3000:3000" volumes: - - ./grafana/volume:/var/lib/grafana + - grafana-volume:/var/lib/grafana restart: always networks: - monitoring + environment: + - GF_SECURITY_ADMIN_PASSWORD=admin + - GF_SECURITY_ADMIN_USER=admin + user: "472" loki: image: grafana/loki:2.8.2 @@ -30,11 +39,16 @@ services: ports: - "3100:3100" volumes: - - ./loki-data:/var/lib/loki + - loki-data:/var/lib/loki - ./loki-config.yml:/etc/loki/config.yml command: -config.file=/etc/loki/config.yml + env_file: + - .env + environment: + - LOKI_PORT=${LOKI_PORT} networks: - monitoring + restart: always promtail: image: grafana/promtail:2.8.2 @@ -43,11 +57,30 @@ services: - /var/run/docker.sock:/var/run/docker.sock - ./promtail-config.yml:/etc/promtail/config.yml command: -config.file=/etc/promtail/config.yml + env_file: + - .env + environment: + - PROMTAIL_PORT=${PROMTAIL_PORT} depends_on: - loki networks: - monitoring + restart: always networks: monitoring: - driver: bridge \ No newline at end of file + driver: bridge + +volumes: + grafana-volume: + driver: local + driver_opts: + type: none + o: bind + device: ./grafana/volume + loki-data: + driver: local + driver_opts: + type: none + o: bind + device: ./loki-data \ No newline at end of file From 349b5c96982435d97ef8611628dc3205eb222af0 Mon Sep 17 00:00:00 2001 From: HongGit Date: Wed, 29 Jan 2025 03:01:34 +0900 Subject: [PATCH 09/16] =?UTF-8?q?[fix/#12]=20=ED=99=98=EA=B2=BD=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=A0=81=EC=9A=A9=20=EB=B0=A9=EC=8B=9D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 36acb20..7e06a7d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,17 +6,13 @@ services: container_name: prometheus volumes: - ./src/main/resources/prometheus.yml:/etc/prometheus/prometheus.yml - command: - - "--config.file=/etc/prometheus/prometheus.yml" - env_file: - - .env environment: - - PROMETHEUS_SCRAPE_INTERVAL=${PROMETHEUS_SCRAPE_INTERVAL} + PROMETHEUS_SCRAPE_INTERVAL: ${PROMETHEUS_SCRAPE_INTERVAL} + PROMETHEUS_TARGET_BACKEND: ${PROMETHEUS_TARGET_BACKEND} ports: - "9090:9090" networks: - monitoring - restart: always grafana: image: grafana/grafana:9.4.7 @@ -39,16 +35,12 @@ services: ports: - "3100:3100" volumes: - - loki-data:/var/lib/loki + - ./loki-data:/var/lib/loki - ./loki-config.yml:/etc/loki/config.yml - command: -config.file=/etc/loki/config.yml - env_file: - - .env environment: - - LOKI_PORT=${LOKI_PORT} + LOKI_PORT: ${LOKI_PORT} networks: - monitoring - restart: always promtail: image: grafana/promtail:2.8.2 @@ -56,16 +48,12 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock - ./promtail-config.yml:/etc/promtail/config.yml - command: -config.file=/etc/promtail/config.yml - env_file: - - .env environment: - - PROMTAIL_PORT=${PROMTAIL_PORT} + PROMTAIL_PORT: ${PROMTAIL_PORT} depends_on: - loki networks: - monitoring - restart: always networks: monitoring: From be32a596697210952dbde9b18afc2fde507c5c19 Mon Sep 17 00:00:00 2001 From: HongGit Date: Wed, 29 Jan 2025 16:51:08 +0900 Subject: [PATCH 10/16] =?UTF-8?q?[fix/#12]=20=EB=AA=A8=EB=8B=88=ED=84=B0?= =?UTF-8?q?=EB=A7=81=20env=20=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- loki-config.yml | 2 +- promtail-config.yml | 2 +- src/main/resources/prometheus.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/loki-config.yml b/loki-config.yml index 501413a..e8ec94f 100644 --- a/loki-config.yml +++ b/loki-config.yml @@ -1,7 +1,7 @@ auth_enabled: false server: - http_listen_port: ${LOKI_PORT} + http_listen_port: 3100 ingester: wal: diff --git a/promtail-config.yml b/promtail-config.yml index d83a699..b85d753 100644 --- a/promtail-config.yml +++ b/promtail-config.yml @@ -1,5 +1,5 @@ server: - http_listen_port: ${PROMTAIL_PORT} + http_listen_port: 9080 positions: filename: /tmp/positions.yaml diff --git a/src/main/resources/prometheus.yml b/src/main/resources/prometheus.yml index 6d88d23..a1969ed 100644 --- a/src/main/resources/prometheus.yml +++ b/src/main/resources/prometheus.yml @@ -1,5 +1,5 @@ global: - scrape_interval: ${PROMETHEUS_SCRAPE_INTERVAL} + scrape_interval: 5s scrape_configs: - job_name: 'prometheus' @@ -9,4 +9,4 @@ scrape_configs: - job_name: 'moplus_server' metrics_path: '/actuator/prometheus' static_configs: - - targets: ['${PROMETHEUS_TARGET_BACKEND}'] \ No newline at end of file + - targets: back:8080 \ No newline at end of file From 7a9b86b0ee9d42e224e6d878110b0f19468dd0ce Mon Sep 17 00:00:00 2001 From: HongGit Date: Wed, 29 Jan 2025 16:54:41 +0900 Subject: [PATCH 11/16] =?UTF-8?q?[fix/#12]=20=ED=94=84=EB=A1=9C=EB=A9=94?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EC=88=98=20=EC=84=A4=EC=A0=95=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EB=AC=B8=EB=B2=95=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/prometheus.yml b/src/main/resources/prometheus.yml index a1969ed..d6b777c 100644 --- a/src/main/resources/prometheus.yml +++ b/src/main/resources/prometheus.yml @@ -9,4 +9,4 @@ scrape_configs: - job_name: 'moplus_server' metrics_path: '/actuator/prometheus' static_configs: - - targets: back:8080 \ No newline at end of file + - targets: ['back:8080'] \ No newline at end of file From c9f219900207fce28486981a6ff312edadf68605 Mon Sep 17 00:00:00 2001 From: HongGit Date: Wed, 29 Jan 2025 18:55:20 +0900 Subject: [PATCH 12/16] =?UTF-8?q?[fix/#12]=20=ED=94=84=EB=A1=AC=ED=85=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=84=A4=EC=A0=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- promtail-config.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/promtail-config.yml b/promtail-config.yml index b85d753..441f4d7 100644 --- a/promtail-config.yml +++ b/promtail-config.yml @@ -2,10 +2,12 @@ server: http_listen_port: 9080 positions: - filename: /tmp/positions.yaml + filename: /var/lib/promtail/positions.yaml clients: - url: http://loki:3100/loki/api/v1/push + batchwait: 5s + batchsize: 512000 scrape_configs: - job_name: "docker-logs" @@ -14,5 +16,5 @@ scrape_configs: refresh_interval: 5s relabel_configs: - source_labels: [__meta_docker_container_name] - regex: "/(.*)" - target_label: container \ No newline at end of file + regex: "moplus-server-dev" + action: keep \ No newline at end of file From f399400619b048d7d02af186d65fafca0c3b1ca1 Mon Sep 17 00:00:00 2001 From: HongGit Date: Wed, 29 Jan 2025 19:02:16 +0900 Subject: [PATCH 13/16] =?UTF-8?q?[fix/#12]=20=EB=A1=9C=ED=82=A4=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EC=88=98=EC=A7=91=20=EA=B8=B0=EA=B0=84=20?= =?UTF-8?q?=EC=A6=9D=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- loki-config.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/loki-config.yml b/loki-config.yml index e8ec94f..703da35 100644 --- a/loki-config.yml +++ b/loki-config.yml @@ -35,12 +35,14 @@ storage_config: cache_location: /var/lib/loki/cache limits_config: + ingestion_rate_mb: 8 + ingestion_burst_size_mb: 16 reject_old_samples: true - reject_old_samples_max_age: 168h + reject_old_samples_max_age: 720h chunk_store_config: max_look_back_period: 0s table_manager: - retention_deletes_enabled: false - retention_period: 0s \ No newline at end of file + retention_deletes_enabled: true + retention_period: 720h \ No newline at end of file From bf1750d6dc9caee48293a8ba2d1a6cbb8791ab8b Mon Sep 17 00:00:00 2001 From: HongGit Date: Wed, 29 Jan 2025 19:21:07 +0900 Subject: [PATCH 14/16] =?UTF-8?q?[fix/#12]=20=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=ED=8C=8C=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- loki-config.yml | 14 +++----------- promtail-config.yml | 6 ++++-- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/loki-config.yml b/loki-config.yml index 703da35..ca56319 100644 --- a/loki-config.yml +++ b/loki-config.yml @@ -1,5 +1,3 @@ -auth_enabled: false - server: http_listen_port: 3100 @@ -14,10 +12,6 @@ ingester: store: inmemory replication_factor: 1 -compactor: - working_directory: /var/lib/loki/compactor - shared_store: filesystem - schema_config: configs: - from: 2022-10-24 @@ -35,14 +29,12 @@ storage_config: cache_location: /var/lib/loki/cache limits_config: - ingestion_rate_mb: 8 - ingestion_burst_size_mb: 16 reject_old_samples: true - reject_old_samples_max_age: 720h + reject_old_samples_max_age: 168h chunk_store_config: max_look_back_period: 0s table_manager: - retention_deletes_enabled: true - retention_period: 720h \ No newline at end of file + retention_deletes_enabled: false + retention_period: 0s \ No newline at end of file diff --git a/promtail-config.yml b/promtail-config.yml index 441f4d7..5510424 100644 --- a/promtail-config.yml +++ b/promtail-config.yml @@ -16,5 +16,7 @@ scrape_configs: refresh_interval: 5s relabel_configs: - source_labels: [__meta_docker_container_name] - regex: "moplus-server-dev" - action: keep \ No newline at end of file + regex: "/moplus-server-dev" + action: keep + - source_labels: [__meta_docker_container_name] + target_label: container \ No newline at end of file From 8f703f15c1831dfc7beecb2496c1f4391fd19206 Mon Sep 17 00:00:00 2001 From: HongGit Date: Wed, 29 Jan 2025 19:30:40 +0900 Subject: [PATCH 15/16] =?UTF-8?q?[fix/#12]=20=EB=A1=9C=ED=82=A4=20?= =?UTF-8?q?=EB=9D=BC=EB=B2=A8=EB=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- loki-config.yml | 13 +++++++++---- promtail-config.yml | 10 ++++++++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/loki-config.yml b/loki-config.yml index ca56319..248ff74 100644 --- a/loki-config.yml +++ b/loki-config.yml @@ -6,12 +6,17 @@ ingester: enabled: true dir: /var/lib/loki/wal lifecycler: - address: 127.0.0.1 + address: 0.0.0.0 ring: kvstore: store: inmemory replication_factor: 1 +compactor: + working_directory: /var/lib/loki/compactor + shared_store: filesystem + retention_enabled: true + schema_config: configs: - from: 2022-10-24 @@ -33,8 +38,8 @@ limits_config: reject_old_samples_max_age: 168h chunk_store_config: - max_look_back_period: 0s + max_look_back_period: 168h table_manager: - retention_deletes_enabled: false - retention_period: 0s \ No newline at end of file + retention_deletes_enabled: true + retention_period: 168h \ No newline at end of file diff --git a/promtail-config.yml b/promtail-config.yml index 5510424..4aa3685 100644 --- a/promtail-config.yml +++ b/promtail-config.yml @@ -16,7 +16,13 @@ scrape_configs: refresh_interval: 5s relabel_configs: - source_labels: [__meta_docker_container_name] - regex: "/moplus-server-dev" + regex: "/?moplus-server-dev" action: keep - source_labels: [__meta_docker_container_name] - target_label: container \ No newline at end of file + regex: "/?(.+)" + target_label: container + - source_labels: [container] + target_label: job + replacement: "moplus-server-dev-logs" + - source_labels: [container] + target_label: instance \ No newline at end of file From ae33d9f154452a35d6e9762f5b2c50f972de7e3e Mon Sep 17 00:00:00 2001 From: HongGit Date: Wed, 29 Jan 2025 19:37:31 +0900 Subject: [PATCH 16/16] =?UTF-8?q?[fix/#12]=20=EB=A1=9C=ED=82=A4=20?= =?UTF-8?q?=EB=9D=BC=EB=B2=A8=EB=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- promtail-config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/promtail-config.yml b/promtail-config.yml index 4aa3685..d1ff114 100644 --- a/promtail-config.yml +++ b/promtail-config.yml @@ -16,13 +16,13 @@ scrape_configs: refresh_interval: 5s relabel_configs: - source_labels: [__meta_docker_container_name] - regex: "/?moplus-server-dev" + regex: "moplus-server-dev" action: keep + - source_labels: [__meta_docker_container_name] - regex: "/?(.+)" + regex: "/(.+)" target_label: container + - source_labels: [container] target_label: job - replacement: "moplus-server-dev-logs" - - source_labels: [container] - target_label: instance \ No newline at end of file + replacement: "moplus-server-dev-logs" \ No newline at end of file