Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit ca67cc5

Browse files
committed
Add InfluxDB/Grafana charts for Task-run duration
- augment the docker-compose-influx to enable task.management.metrics.xxx for influx. - add initial scdf-task-batch grafana dashboard to springcloud/spring-cloud-dataflow-grafana-influxdb image. - update prometheus, myslq, grafana and influx image versions. Depends on spring-cloud/spring-cloud-task/pull/612 Depends on spring-attic/spring-cloud-task-app-starters-core/issues/14 Resolves #3295
1 parent b828419 commit ca67cc5

File tree

6 files changed

+441
-8
lines changed

6 files changed

+441
-8
lines changed

spring-cloud-dataflow-server/docker-compose-influxdb.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3'
22

33
services:
44
mysql:
5-
image: mysql:5.7.25
5+
image: mysql:5.7.26
66
container_name: dataflow-mysql
77
environment:
88
MYSQL_DATABASE: dataflow
@@ -46,14 +46,17 @@ services:
4646
- spring.cloud.dataflow.applicationProperties.stream.management.metrics.export.influx.enabled=true
4747
- spring.cloud.dataflow.applicationProperties.stream.management.metrics.export.influx.db=myinfluxdb
4848
- spring.cloud.dataflow.applicationProperties.stream.management.metrics.export.influx.uri=http://influxdb:8086
49+
- spring.cloud.dataflow.applicationProperties.task.management.metrics.export.influx.enabled=true
50+
- spring.cloud.dataflow.applicationProperties.task.management.metrics.export.influx.db=myinfluxdb
51+
- spring.cloud.dataflow.applicationProperties.task.management.metrics.export.influx.uri=http://influxdb:8086
4952
- spring.cloud.dataflow.grafana-info.url=http://localhost:3000
5053
- SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/dataflow
5154
- SPRING_DATASOURCE_USERNAME=root
5255
- SPRING_DATASOURCE_PASSWORD=rootpw
5356
- SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver
5457
depends_on:
5558
- kafka
56-
entrypoint: "./wait-for-it.sh mysql:3306 -- java -jar /maven/spring-cloud-dataflow-server.jar"
59+
entrypoint: "./wait-for-it.sh -t 120 mysql:3306 -- java -jar /maven/spring-cloud-dataflow-server.jar"
5760

5861
app-import:
5962
image: springcloud/openjdk:latest
@@ -82,10 +85,10 @@ services:
8285
- SPRING_DATASOURCE_USERNAME=root
8386
- SPRING_DATASOURCE_PASSWORD=rootpw
8487
- SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver
85-
entrypoint: "./wait-for-it.sh mysql:3306 -- java -Djava.security.egd=file:/dev/./urandom -jar /spring-cloud-skipper-server.jar"
88+
entrypoint: "./wait-for-it.sh -t 120 mysql:3306 -- java -Djava.security.egd=file:/dev/./urandom -jar /spring-cloud-skipper-server.jar"
8689

8790
influxdb:
88-
image: influxdb:1.7.5
91+
image: influxdb:1.7.7
8992
container_name: influxdb
9093
ports:
9194
- '8086:8086'

src/grafana/influxdb/docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33

44
# Grafana uses the InfluxDB datasource
55
influxdb:
6-
image: influxdb:1.7.5
6+
image: influxdb:1.7.7
77
container_name: 'influxdb'
88
ports:
99
- '8086:8086'

src/grafana/influxdb/docker/grafana/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM grafana/grafana:5.4.3
1+
FROM grafana/grafana:6.2.5
22
ADD ./provisioning /etc/grafana/provisioning
33
ADD ./config.ini /etc/grafana/config.ini
44
ADD ./dashboards /var/lib/grafana/dashboards

0 commit comments

Comments
 (0)