Skip to content

Commit 7c49126

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 spring-attic#3295
1 parent b828419 commit 7c49126

File tree

6 files changed

+443
-8
lines changed

6 files changed

+443
-8
lines changed

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

Lines changed: 9 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
@@ -35,6 +35,8 @@ services:
3535
dataflow-server:
3636
image: springcloud/spring-cloud-dataflow-server:${DATAFLOW_VERSION:?DATAFLOW_VERSION is not set!}
3737
container_name: dataflow-server
38+
volumes:
39+
- '/tmp/apps:/apps/'
3840
ports:
3941
- "9393:9393"
4042
environment:
@@ -46,14 +48,17 @@ services:
4648
- spring.cloud.dataflow.applicationProperties.stream.management.metrics.export.influx.enabled=true
4749
- spring.cloud.dataflow.applicationProperties.stream.management.metrics.export.influx.db=myinfluxdb
4850
- spring.cloud.dataflow.applicationProperties.stream.management.metrics.export.influx.uri=http://influxdb:8086
51+
- spring.cloud.dataflow.applicationProperties.task.management.metrics.export.influx.enabled=true
52+
- spring.cloud.dataflow.applicationProperties.task.management.metrics.export.influx.db=myinfluxdb
53+
- spring.cloud.dataflow.applicationProperties.task.management.metrics.export.influx.uri=http://influxdb:8086
4954
- spring.cloud.dataflow.grafana-info.url=http://localhost:3000
5055
- SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/dataflow
5156
- SPRING_DATASOURCE_USERNAME=root
5257
- SPRING_DATASOURCE_PASSWORD=rootpw
5358
- SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver
5459
depends_on:
5560
- kafka
56-
entrypoint: "./wait-for-it.sh mysql:3306 -- java -jar /maven/spring-cloud-dataflow-server.jar"
61+
entrypoint: "./wait-for-it.sh -t 120 mysql:3306 -- java -jar /maven/spring-cloud-dataflow-server.jar"
5762

5863
app-import:
5964
image: springcloud/openjdk:latest
@@ -82,10 +87,10 @@ services:
8287
- SPRING_DATASOURCE_USERNAME=root
8388
- SPRING_DATASOURCE_PASSWORD=rootpw
8489
- 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"
90+
entrypoint: "./wait-for-it.sh -t 120 mysql:3306 -- java -Djava.security.egd=file:/dev/./urandom -jar /spring-cloud-skipper-server.jar"
8691

8792
influxdb:
88-
image: influxdb:1.7.5
93+
image: influxdb:1.7.7
8994
container_name: influxdb
9095
ports:
9196
- '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)