Skip to content

Commit

Permalink
example: fix dashboard volumes
Browse files Browse the repository at this point in the history
After #228, dashboard started to use non-existing test artifacts
for volumes. This patch fixes the issue.

Follows #228
  • Loading branch information
DifferentialOrange committed Jul 8, 2024
1 parent 9ffc334 commit d267333
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 16 deletions.
8 changes: 2 additions & 6 deletions docker-compose.cartridge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,8 @@ services:
volumes:
- ./example_cluster/grafana/provisioning:/etc/grafana/provisioning
# Map to different folders to prevent name collision.
- ./tests/Prometheus/dashboard_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
- ./tests/Prometheus/dashboard_static_compiled.json:/usr/lib/dashboards/Prometheus-static/dashboard.json
- ./tests/Prometheus/dashboard_static_with_instance_variable_compiled.json:/usr/lib/dashboards/Prometheus-static-var/dashboard.json
- ./tests/InfluxDB/dashboard_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json
- ./tests/InfluxDB/dashboard_static_compiled.json:/usr/lib/dashboards/InfluxDB-static/dashboard.json
- ./tests/InfluxDB/dashboard_static_with_instance_variable_compiled.json:/usr/lib/dashboards/InfluxDB-static-var/dashboard.json
- ./tests/Prometheus/dashboard_cartridge_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
- ./tests/InfluxDB/dashboard_cartridge_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json

networks:
tarantool_dashboard_dev:
Expand Down
4 changes: 0 additions & 4 deletions docker-compose.tdg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,7 @@ services:
- ./example_cluster/grafana/provisioning:/etc/grafana/provisioning
# Map to different folders to prevent name collision.
- ./tests/Prometheus/dashboard_tdg_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
- ./tests/Prometheus/dashboard_tdg_static_compiled.json:/usr/lib/dashboards/Prometheus-static/dashboard.json
- ./tests/Prometheus/dashboard_tdg_static_with_instance_variable_compiled.json:/usr/lib/dashboards/Prometheus-static-var/dashboard.json
- ./tests/InfluxDB/dashboard_tdg_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json
- ./tests/InfluxDB/dashboard_tdg_static_compiled.json:/usr/lib/dashboards/InfluxDB-static/dashboard.json
- ./tests/InfluxDB/dashboard_tdg_static_with_instance_variable_compiled.json:/usr/lib/dashboards/InfluxDB-static-var/dashboard.json

networks:
tarantool_dashboard_dev:
Expand Down
8 changes: 2 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,8 @@ services:
volumes:
- ./example_cluster/grafana/provisioning:/etc/grafana/provisioning
# Map to different folders to prevent name collision.
- ./tests/Prometheus/dashboard_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
- ./tests/Prometheus/dashboard_static_compiled.json:/usr/lib/dashboards/Prometheus-static/dashboard.json
- ./tests/Prometheus/dashboard_static_with_instance_variable_compiled.json:/usr/lib/dashboards/Prometheus-static-var/dashboard.json
- ./tests/InfluxDB/dashboard_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json
- ./tests/InfluxDB/dashboard_static_compiled.json:/usr/lib/dashboards/InfluxDB-static/dashboard.json
- ./tests/InfluxDB/dashboard_static_with_instance_variable_compiled.json:/usr/lib/dashboards/InfluxDB-static-var/dashboard.json
- ./tests/Prometheus/dashboard_tarantool3_compiled.json:/usr/lib/dashboards/Prometheus-common/dashboard.json
- ./tests/InfluxDB/dashboard_tarantool3_compiled.json:/usr/lib/dashboards/InfluxDB-common/dashboard.json

networks:
tarantool_dashboard_dev:
Expand Down

0 comments on commit d267333

Please sign in to comment.