Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
phjppo0918 committed Nov 27, 2023
2 parents 772cc39 + 2bb50b9 commit d28c685
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 1 deletion.
3 changes: 3 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ dependencies {
testImplementation("org.testcontainers:junit-jupiter")
testImplementation("com.redis.testcontainers:testcontainers-redis-junit:1.6.4")

//monitoring
implementation("org.springframework.boot:spring-boot-starter-actuator")
runtimeOnly("io.micrometer:micrometer-registry-prometheus")

// rest docs
testImplementation("org.springframework.restdocs:spring-restdocs-mockmvc")
Expand Down
17 changes: 17 additions & 0 deletions src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,20 @@ service:
local-storage:
directory: http://localhost/qbox/image/
url: http://localhost:5172


management:
endpoint:
prometheus:
enabled: true
endpoints:
enabled-by-default: false
jmx:
exposure:
exclude: "*"
web:
exposure:
include: health, info, prometheus
base-path: /actuator
server:
port: 8081
18 changes: 17 additions & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,20 @@ service:

local-storage:
directory: ${LOCAL_STORAGE_DIRECTORY}
url: ${LOCAL_STORAGE_URL}
url: ${LOCAL_STORAGE_URL}

management:
endpoint:
prometheus:
enabled: true
endpoints:
enabled-by-default: false
jmx:
exposure:
exclude: "*"
web:
exposure:
include: health, info, prometheus
base-path: ${ACTUATOR_PATH}
server:
port: ${ACTUATOR_PORT}

0 comments on commit d28c685

Please sign in to comment.