Skip to content

Commit 62456a7

Browse files
example: fix Grafana volumes
After #228, Grafana started to use non-existing test artifacts for startup volumes. This patch fixes the issue. Follows #228
1 parent 9ffc334 commit 62456a7

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

docker-compose.cartridge.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,8 @@ services:
7272
volumes:
7373
- ./example_cluster/grafana/provisioning:/etc/grafana/provisioning
7474
# Map to different folders to prevent name collision.
75-
- ./tests/Prometheus/dashboard_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
76-
- ./tests/Prometheus/dashboard_static_compiled.json:/usr/lib/dashboards/Prometheus-static/dashboard.json
77-
- ./tests/Prometheus/dashboard_static_with_instance_variable_compiled.json:/usr/lib/dashboards/Prometheus-static-var/dashboard.json
78-
- ./tests/InfluxDB/dashboard_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json
79-
- ./tests/InfluxDB/dashboard_static_compiled.json:/usr/lib/dashboards/InfluxDB-static/dashboard.json
80-
- ./tests/InfluxDB/dashboard_static_with_instance_variable_compiled.json:/usr/lib/dashboards/InfluxDB-static-var/dashboard.json
75+
- ./tests/Prometheus/dashboard_cartridge_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
76+
- ./tests/InfluxDB/dashboard_cartridge_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json
8177

8278
networks:
8379
tarantool_dashboard_dev:

docker-compose.tdg.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,7 @@ services:
8080
- ./example_cluster/grafana/provisioning:/etc/grafana/provisioning
8181
# Map to different folders to prevent name collision.
8282
- ./tests/Prometheus/dashboard_tdg_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
83-
- ./tests/Prometheus/dashboard_tdg_static_compiled.json:/usr/lib/dashboards/Prometheus-static/dashboard.json
84-
- ./tests/Prometheus/dashboard_tdg_static_with_instance_variable_compiled.json:/usr/lib/dashboards/Prometheus-static-var/dashboard.json
8583
- ./tests/InfluxDB/dashboard_tdg_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json
86-
- ./tests/InfluxDB/dashboard_tdg_static_compiled.json:/usr/lib/dashboards/InfluxDB-static/dashboard.json
87-
- ./tests/InfluxDB/dashboard_tdg_static_with_instance_variable_compiled.json:/usr/lib/dashboards/InfluxDB-static-var/dashboard.json
8884

8985
networks:
9086
tarantool_dashboard_dev:

docker-compose.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,8 @@ services:
7272
volumes:
7373
- ./example_cluster/grafana/provisioning:/etc/grafana/provisioning
7474
# Map to different folders to prevent name collision.
75-
- ./tests/Prometheus/dashboard_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
76-
- ./tests/Prometheus/dashboard_static_compiled.json:/usr/lib/dashboards/Prometheus-static/dashboard.json
77-
- ./tests/Prometheus/dashboard_static_with_instance_variable_compiled.json:/usr/lib/dashboards/Prometheus-static-var/dashboard.json
78-
- ./tests/InfluxDB/dashboard_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json
79-
- ./tests/InfluxDB/dashboard_static_compiled.json:/usr/lib/dashboards/InfluxDB-static/dashboard.json
80-
- ./tests/InfluxDB/dashboard_static_with_instance_variable_compiled.json:/usr/lib/dashboards/InfluxDB-static-var/dashboard.json
75+
- ./tests/Prometheus/dashboard_tarantool3_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
76+
- ./tests/InfluxDB/dashboard_tarantool3_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json
8177

8278
networks:
8379
tarantool_dashboard_dev:

0 commit comments

Comments
 (0)