Merge pull request #106 from DogCatWorldTeam/fix#105

[fix] 모니터링 수정
DogCatWorldTeam · Aug 13, 2024 · 4215107 · 4215107
2 parents d905ff1 + 8ce65e9
commit 4215107
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 38 deletions.
diff --git a/build.gradle b/build.gradle
@@ -73,6 +73,7 @@ dependencies {
 	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
 	implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
+	implementation 'io.micrometer:micrometer-registry-prometheus'
 }
 
 def querydslSrcDir = 'src/main/generated'

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -55,7 +55,7 @@ services:
     image: gcr.io/cadvisor/cadvisor
     container_name: cadvisor
     ports:
-      - 8080:8080
+      - 3100:3100
     volumes:
       - /:/rootfs:ro
       - /var/run:/var/run:rw

diff --git a/elk/logstash/pipeline/logstash.conf b/elk/logstash/pipeline/logstash.conf
@@ -4,39 +4,12 @@ input {
   }
 }
 
-filter {
- grok {
-   match => [ "message" , "%{COMBINEDAPACHELOG}+%{GREEDYDATA:extra_fields}"]
-   overwrite => [ "message" ]
- }
- mutate {
-   convert => ["response", "integer"]
-   convert => ["bytes", "integer"]
-   convert => ["responsetime", "float"]
- }
- geoip {
-   source => "clientip"
-   target => "geoip"
-   add_tag => [ "nginx-geoip" ]
- }
- date {
-   match => [ "timestamp" , "dd/MMM/YYYY:HH:mm:ss Z" ]
-   remove_field => [ "timestamp" ]
- }
- useragent {
-   source => "agent"
- }
-}
-
 output {
-    stdout{
-        codec => "dots"
-    }
-    elasticsearch{
-        hosts => ["elasticsearch:9200"]
-        index => "weblogs-%{+YYYY.MM.dd}"
-        user => "logstash_internal"
-        password => "changeme"
-        ecs_compatibility => disabled
-    }
+        elasticsearch {
+                hosts => "elasticsearch:9200"
+                index => "logstash-%{+yyyy.MM.dd}"
+                user => "elastic"
+                password => "elastic"
+                ecs_compatibility => disabled
+        }
 }
diff --git a/src/main/java/com/techeer/abandoneddog/users/config/SecurityConfig.java b/src/main/java/com/techeer/abandoneddog/users/config/SecurityConfig.java
@@ -67,7 +67,7 @@ public SecurityFilterChain filterChain(HttpSecurity http, RedisService redisServ
         .authorizeHttpRequests((auth) -> auth
             .requestMatchers("/api/v1/users/login", "/api/v1/users/register", "/login", "/reissue",
                 "/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs/**", "/api/v1/pet-funeral",
-                "/api/v1/shelter/*", "/api/v1/shelter_address",  "/api/v1/pet_board/**").permitAll()
+                "/api/v1/shelter/*", "/api/v1/shelter_address",  "/api/v1/pet_board/**", "/actuator/prometheus").permitAll()
             .anyRequest().authenticated());
     // .anyRequest().permitAll());
 

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -51,4 +51,10 @@ logging:
       max-file-size: 10MB
       max-history: 7
   file:
-    name: ./log/server.log
+    name: ./log/server.log
+
+  management:
+    endpoints:
+      web:
+        exposure:
+          include: "prometheus"
diff --git a/src/main/resources/prometheus.yml b/src/main/resources/prometheus.yml
@@ -5,4 +5,7 @@ scrape_configs:
   - job_name: prometheus
     metrics_path: '/actuator/prometheus'
     static_configs:
-      - targets: ['host.docker.internal:8080']
+      - targets: ['host.docker.internal:8080']
+  - job_name: 'cadvisor'
+    static_configs:
+      - targets: ['cadvisor:3100']