SpringCloud/spring-cloud-dataflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

boot24 update

Browse Source
This commit is contained in:
Christian Tzolov
2021-03-16 17:30:26 +01:00
parent 350f1c0cf9
commit 519644fcd0
6 changed files with 92 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml
View File

@@ -16,21 +16,19 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.2.RELEASE</version> <version>2.4.3</version>
<!-- <version>2.1.13.RELEASE</version>-->
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>com.example.task</groupId> <groupId>com.example.task</groupId>
<artifactId>task-demo-metrics-prometheus</artifactId> <artifactId>task-demo-metrics-prometheus</artifactId>
<version>0.0.3-SNAPSHOT</version> <version>0.0.4-SNAPSHOT</version>
<name>task-demo-metrics-prometheus</name> <name>task-demo-metrics-prometheus</name>
<description>Demo project for Spring Boot</description> <description>Demo project for Spring Boot</description>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<prometheus-rsocket-spring.version>1.0.0</prometheus-rsocket-spring.version> <prometheus-rsocket-spring.version>1.3.0</prometheus-rsocket-spring.version>
<!-- <prometheus-rsocket-spring.version>0.9.0</prometheus-rsocket-spring.version>--> <spring-cloud-task-dependencies.version>2.3.0</spring-cloud-task-dependencies.version>
<spring-cloud-task-dependencies.version>2.3.0.BUILD-SNAPSHOT</spring-cloud-task-dependencies.version>
</properties> </properties>
<dependencies> <dependencies>
@@ -63,6 +61,10 @@
<artifactId>prometheus-rsocket-spring</artifactId> <artifactId>prometheus-rsocket-spring</artifactId>
<version>${prometheus-rsocket-spring.version}</version> <version>${prometheus-rsocket-spring.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId> <artifactId>spring-boot-configuration-processor</artifactId>
@@ -72,15 +74,14 @@
<groupId>io.micrometer.prometheus</groupId> <groupId>io.micrometer.prometheus</groupId>
<artifactId>prometheus-rsocket-client</artifactId> <artifactId>prometheus-rsocket-client</artifactId>
<version>${prometheus-rsocket-spring.version}</version> <version>${prometheus-rsocket-spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rsocket</groupId>
<artifactId>rsocket-transport-netty</artifactId>
<version>1.0.1</version>
<!-- <version>1.0.0-RC5</version>-->
<scope>test</scope>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>io.rsocket</groupId>-->
<!-- <artifactId>rsocket-transport-netty</artifactId>-->
<!-- <version>1.0.2</version>-->
<!--&lt;!&ndash; <version>1.0.0-RC5</version>&ndash;&gt;-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>

22
monitoring-samples/task-apps/task-demo-metrics-prometheus/src/main/resources/application.properties
View File

@@ -5,16 +5,16 @@ info.app.version=@project.version@
management.endpoints.web.exposure.include=health,info,bindings management.endpoints.web.exposure.include=health,info,bindings
spring.datasource.url=jdbc:mysql://localhost:3306/dataflow #spring.datasource.url=jdbc:mysql://localhost:3306/dataflow
spring.datasource.driverClassName=org.mariadb.jdbc.Driver #spring.datasource.driverClassName=org.mariadb.jdbc.Driver
spring.datasource.username=root #spring.datasource.username=root
spring.datasource.password=rootpw #spring.datasource.password=rootpw
#
management.metrics.export.prometheus.rsocket.host=localhost #management.metrics.export.prometheus.rsocket.host=localhost
management.metrics.export.prometheus.rsocket.port=7001 #management.metrics.export.prometheus.rsocket.port=7001
management.metrics.export.prometheus.enabled=true #management.metrics.export.prometheus.enabled=true
management.metrics.export.prometheus.rsocket.enabled=true #management.metrics.export.prometheus.rsocket.enabled=true
#
spring.cloud.task.name=task999 #spring.cloud.task.name=task999

5
monitoring-samples/task-apps/task-demo-metrics-wavefront/Dockerfile Normal file
View File

@@ -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"]

17
monitoring-samples/task-apps/task-demo-metrics-wavefront/README.md
View File

@@ -96,8 +96,25 @@ Follow the [Task Monitoring](https://dataflow.spring.io/docs/feature-guides/batc
Build and publish docker image Build and publish docker image
## Fabric8 - Maven plugin
``` ```
./mvnw clean install docker:build ./mvnw clean install docker:build
./mvnw docker:push ./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 .
```

53
monitoring-samples/task-apps/task-demo-metrics-wavefront/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version> <version>2.4.3</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
@@ -17,7 +17,8 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-cloud.version>Hoxton.SR6</spring-cloud.version> <spring-cloud.version>2020.0.0</spring-cloud.version>
<fabric8.generator.from>registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:latest</fabric8.generator.from>
</properties> </properties>
<dependencies> <dependencies>
@@ -70,15 +71,6 @@
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-wavefront</artifactId> <artifactId>micrometer-registry-wavefront</artifactId>
</dependency> </dependency>
<!-- Override the WF SDK dependency coming with micrometer to resolve
the https://github.com/wavefrontHQ/wavefront-sdk-java/pull/152 makes it
to Micrometer (likely 1.5.3) and Boot-->
<dependency>
<groupId>com.wavefront</groupId>
<artifactId>wavefront-sdk-java</artifactId>
<version>2.6.0</version>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
@@ -99,6 +91,20 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>4.4.1</version>
<configuration>
<namespace>test-ns</namespace>
<images>
<image>
<name>task-demo-metrics-wavefront:s2i</name>
</image>
</images>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
@@ -127,6 +133,31 @@
</images> </images>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>2.8.0</version>
<configuration>
<from>
<image>springcloud/baseimage:1.0.0</image>
</from>
<to>
<image>springcloud/${project.artifactId}</image>
<tags>
<tag>jib-${project.version}</tag>
</tags>
</to>
<container>
<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
<format>Docker</format>
<labels>
<application.name>${project.artifactId}</application.name>
<application.version>${project.version}</application.version>
</labels>
</container>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

2
monitoring-samples/task-apps/task-demo-metrics-wavefront/src/main/java/com/example/task/taskdemometrics/TaskDemoMetricsApplication.java
View File

@@ -17,6 +17,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.cloud.task.configuration.EnableTask;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.util.StringUtils;
@SpringBootApplication @SpringBootApplication
@EnableTask @EnableTask
@@ -32,6 +33,7 @@ public class TaskDemoMetricsApplication {
private Random random = new Random(); private Random random = new Random();
public static void main(String[] args) { public static void main(String[] args) {
System.out.println("ARGS: " + StringUtils.arrayToCommaDelimitedString(args));
SpringApplication.run(TaskDemoMetricsApplication.class, args); SpringApplication.run(TaskDemoMetricsApplication.class, args);
} }