Skip to content

Commit

Permalink
Merge pull request #18 from Billing-Wise/dev
Browse files Browse the repository at this point in the history
[release] 1.0.1
  • Loading branch information
dtd1614 authored Jul 31, 2024
2 parents e4b1a5d + cd97162 commit 3b07643
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 2 deletions.
8 changes: 7 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

group = 'site.billingwise.batch'
version = '1.0.0'
version = '1.0.1'

java {
toolchain {
Expand Down Expand Up @@ -42,6 +42,12 @@ dependencies {
testImplementation 'org.mockito:mockito-junit-jupiter'
testImplementation 'org.springframework.batch:spring-batch-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

// actuator
implementation 'org.springframework.boot:spring-boot-starter-actuator'

// prometheus
implementation 'io.micrometer:micrometer-registry-prometheus'
}

ext {
Expand Down
8 changes: 7 additions & 1 deletion src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,10 @@ pay:
logging:
level:
org:
hibernate: info
hibernate: info

management:
endpoints:
web:
exposure:
include: "prometheus"
35 changes: 35 additions & 0 deletions task-definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,41 @@
"secretOptions": []
},
"systemControls": []
},
{
"name": "aws-otel-collector",
"image": "public.ecr.aws/aws-observability/aws-otel-collector:v0.40.0",
"cpu": 0,
"portMappings": [],
"essential": true,
"command": [
"--config",
"s3://t5-bucket.s3.ap-northeast-2.amazonaws.com/ecs-amp-prometheus.yaml"
],
"environment": [
{
"name": "AWS_PROMETHEUS_SCRAPING_ENDPOINT",
"value": "0.0.0.0:9090"
},
{
"name": "AWS_PROMETHEUS_ENDPOINT",
"value": "https://aps-workspaces.ap-northeast-2.amazonaws.com/workspaces/ws-b7a8e8a8-64f4-4f2c-82f3-8722683960aa/api/v1/remote_write"
}
],
"environmentFiles": [],
"mountPoints": [],
"volumesFrom": [],
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "/ecs/ecs-aws-otel-sidecar-collector",
"awslogs-create-group": "true",
"awslogs-region": "ap-northeast-2",
"awslogs-stream-prefix": "ecs"
},
"secretOptions": []
},
"systemControls": []
}
],
"family": "t5-batch-task-definition",
Expand Down

0 comments on commit 3b07643

Please sign in to comment.