Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adding metrics endpoint and docker changes after testing
  • Loading branch information
arunvasudevan committed Apr 5, 2020
commit 17d39fdc2609e1f4f2c82ca84b15e95628991607
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ project.ext.externalDependency = [
'springBootStarterWeb': 'org.springframework.boot:spring-boot-starter-web:2.1.2.RELEASE',
'springBootStarterJetty': 'org.springframework.boot:spring-boot-starter-jetty:2.1.2.RELEASE',
'springKafka': 'org.springframework.kafka:spring-kafka:2.2.3.RELEASE',
'springActuator': 'org.springframework.boot:spring-boot-starter-actuator:2.2.3.RELEASE',
'springActuator': 'org.springframework.boot:spring-boot-starter-actuator:2.1.2.RELEASE',
'testng': 'org.testng:testng:6.9.9'
]

Expand Down
4 changes: 3 additions & 1 deletion docker/mce-consumer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ RUN cd datahub-src && ./gradlew :metadata-jobs:mce-consumer-job:build \

FROM openjdk:8-jre-alpine

COPY --from=builder /mce-consumer-job /mce-consumer-job/
COPY --from=builder /mce-consumer-job.jar /mce-consumer-job.jar

EXPOSE 8080

ENTRYPOINT ["java", "-jar", "mce-consumer-job.jar"]
3 changes: 1 addition & 2 deletions docker/mce-consumer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ services:
- GMS_PORT=8080
- KAFKA_MCE_TOPIC_NAME=MetadataChangeEvent
- KAFKA_FMCE_TOPIC_NAME=FailedMetadataChangeEvent
- SPRING_PROFILES_ACTIVE=test
command: "sh -c './mce-consumer-job/bin/mce-consumer-job'"
command: "java -jar mce-consumer-job.jar"

networks:
default:
Expand Down
2 changes: 0 additions & 2 deletions docker/quickstart/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,6 @@ services:
depends_on:
- kafka-setup
- datahub-gms
command: "sh -c 'while ping -c1 kafka-setup &>/dev/null; do echo waiting for kafka-setup... && sleep 1; done; \
echo kafka-setup done! && ./mce-consumer-job/bin/mce-consumer-job'"

networks:
default:
Expand Down
1 change: 1 addition & 0 deletions metadata-jobs/mce-consumer-job/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ dependencies {
}
compile externalDependency.springBootStarterJetty
compile externalDependency.springKafka

compile externalDependency.springActuator

compileOnly externalDependency.lombok
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
management.endpoints.web.exposure.include=metrics, health, info