diff --git a/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml b/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml index fb70ac6..dd22c56 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml +++ b/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml @@ -16,21 +16,19 @@ org.springframework.boot spring-boot-starter-parent - 2.3.2.RELEASE - + 2.4.3 com.example.task task-demo-metrics-prometheus - 0.0.3-SNAPSHOT + 0.0.4-SNAPSHOT task-demo-metrics-prometheus Demo project for Spring Boot 1.8 - 1.0.0 - - 2.3.0.BUILD-SNAPSHOT + 1.3.0 + 2.3.0 @@ -63,6 +61,10 @@ prometheus-rsocket-spring ${prometheus-rsocket-spring.version} + + io.micrometer + micrometer-registry-prometheus + org.springframework.boot spring-boot-configuration-processor @@ -72,15 +74,14 @@ io.micrometer.prometheus prometheus-rsocket-client ${prometheus-rsocket-spring.version} - test - - - io.rsocket - rsocket-transport-netty - 1.0.1 - - test + + + + + + + diff --git a/monitoring-samples/task-apps/task-demo-metrics-prometheus/src/main/resources/application.properties b/monitoring-samples/task-apps/task-demo-metrics-prometheus/src/main/resources/application.properties index 075f682..d83d480 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-prometheus/src/main/resources/application.properties +++ b/monitoring-samples/task-apps/task-demo-metrics-prometheus/src/main/resources/application.properties @@ -5,16 +5,16 @@ info.app.version=@project.version@ management.endpoints.web.exposure.include=health,info,bindings -spring.datasource.url=jdbc:mysql://localhost:3306/dataflow -spring.datasource.driverClassName=org.mariadb.jdbc.Driver -spring.datasource.username=root -spring.datasource.password=rootpw - -management.metrics.export.prometheus.rsocket.host=localhost -management.metrics.export.prometheus.rsocket.port=7001 -management.metrics.export.prometheus.enabled=true -management.metrics.export.prometheus.rsocket.enabled=true - -spring.cloud.task.name=task999 +#spring.datasource.url=jdbc:mysql://localhost:3306/dataflow +#spring.datasource.driverClassName=org.mariadb.jdbc.Driver +#spring.datasource.username=root +#spring.datasource.password=rootpw +# +#management.metrics.export.prometheus.rsocket.host=localhost +#management.metrics.export.prometheus.rsocket.port=7001 +#management.metrics.export.prometheus.enabled=true +#management.metrics.export.prometheus.rsocket.enabled=true +# +#spring.cloud.task.name=task999 diff --git a/monitoring-samples/task-apps/task-demo-metrics-wavefront/Dockerfile b/monitoring-samples/task-apps/task-demo-metrics-wavefront/Dockerfile new file mode 100644 index 0000000..93b0693 --- /dev/null +++ b/monitoring-samples/task-apps/task-demo-metrics-wavefront/Dockerfile @@ -0,0 +1,5 @@ +FROM springcloud/baseimage:1.0.0 +ARG JAR_FILE=target/*.jar +COPY ${JAR_FILE} app.jar +VOLUME ["/tmp"] +ENTRYPOINT ["java","-jar","/app.jar"] diff --git a/monitoring-samples/task-apps/task-demo-metrics-wavefront/README.md b/monitoring-samples/task-apps/task-demo-metrics-wavefront/README.md index 768e6be..03631de 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-wavefront/README.md +++ b/monitoring-samples/task-apps/task-demo-metrics-wavefront/README.md @@ -96,8 +96,25 @@ Follow the [Task Monitoring](https://dataflow.spring.io/docs/feature-guides/batc Build and publish docker image +## Fabric8 - Maven plugin ``` ./mvnw clean install docker:build ./mvnw docker:push ``` + +## Jib - Maven plugin +``` +./mvnw clean install jib:build +``` +or for test purposes build a local image: +``` +./mvnw clean install jib:dockerBuild +``` + +## Dockerfile + +``` +./mvnw clean install +docker build -t springcloud/task-demo-metrics-wavefront:dockerfile . +``` diff --git a/monitoring-samples/task-apps/task-demo-metrics-wavefront/pom.xml b/monitoring-samples/task-apps/task-demo-metrics-wavefront/pom.xml index 72379ff..849f2c4 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-wavefront/pom.xml +++ b/monitoring-samples/task-apps/task-demo-metrics-wavefront/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.4.3 @@ -17,7 +17,8 @@ 1.8 - Hoxton.SR6 + 2020.0.0 + registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:latest @@ -70,15 +71,6 @@ io.micrometer micrometer-registry-wavefront - - - - com.wavefront - wavefront-sdk-java - 2.6.0 - @@ -99,6 +91,20 @@ org.springframework.boot spring-boot-maven-plugin + + io.fabric8 + fabric8-maven-plugin + 4.4.1 + + test-ns + + + task-demo-metrics-wavefront:s2i + + + + + io.fabric8 docker-maven-plugin @@ -127,6 +133,31 @@ + + + com.google.cloud.tools + jib-maven-plugin + 2.8.0 + + + springcloud/baseimage:1.0.0 + + + springcloud/${project.artifactId} + + jib-${project.version} + + + + USE_CURRENT_TIMESTAMP + Docker + + ${project.artifactId} + ${project.version} + + + + diff --git a/monitoring-samples/task-apps/task-demo-metrics-wavefront/src/main/java/com/example/task/taskdemometrics/TaskDemoMetricsApplication.java b/monitoring-samples/task-apps/task-demo-metrics-wavefront/src/main/java/com/example/task/taskdemometrics/TaskDemoMetricsApplication.java index fb49022..5f10d87 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-wavefront/src/main/java/com/example/task/taskdemometrics/TaskDemoMetricsApplication.java +++ b/monitoring-samples/task-apps/task-demo-metrics-wavefront/src/main/java/com/example/task/taskdemometrics/TaskDemoMetricsApplication.java @@ -17,6 +17,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.context.annotation.Bean; +import org.springframework.util.StringUtils; @SpringBootApplication @EnableTask @@ -32,6 +33,7 @@ public class TaskDemoMetricsApplication { private Random random = new Random(); public static void main(String[] args) { + System.out.println("ARGS: " + StringUtils.arrayToCommaDelimitedString(args)); SpringApplication.run(TaskDemoMetricsApplication.class, args); }