From 7f627aee17954fb995f226d8461b7aca3007be7c Mon Sep 17 00:00:00 2001 From: iTrooz Date: Sat, 13 Sep 2025 17:05:42 +0200 Subject: [PATCH] move files around --- examples/compose-with-grafana/docker-compose.yml | 6 +++--- .../{ => grafana}/dashboards/rest-server.json | 0 .../compose-with-grafana/{ => grafana}/grafana.ini | 0 .../grafana/provisioning/dashboards/dashboards.yml | 13 +++++++++++++ .../grafana/provisioning/datasources/datasource.yml | 8 ++++++++ 5 files changed, 24 insertions(+), 3 deletions(-) rename examples/compose-with-grafana/{ => grafana}/dashboards/rest-server.json (100%) rename examples/compose-with-grafana/{ => grafana}/grafana.ini (100%) create mode 100644 examples/compose-with-grafana/grafana/provisioning/dashboards/dashboards.yml create mode 100644 examples/compose-with-grafana/grafana/provisioning/datasources/datasource.yml diff --git a/examples/compose-with-grafana/docker-compose.yml b/examples/compose-with-grafana/docker-compose.yml index a34427a..d87b568 100644 --- a/examples/compose-with-grafana/docker-compose.yml +++ b/examples/compose-with-grafana/docker-compose.yml @@ -3,8 +3,9 @@ version: '2' services: restserver: - # NOTE: You must run `make docker_build` in the repo root first + # NOTE: Use `docker compose up --build -d` to build the image locally # If you want to run this in production, you want auth and tls! + image: restic/rest-server:latest build: context: ../.. dockerfile: Dockerfile @@ -34,8 +35,7 @@ services: image: grafana/grafana volumes: - grafanadata:/var/lib/grafana - - ./dashboards:/dashboards - - ./grafana.ini:/etc/grafana/grafana.ini + - ./grafana:/etc/grafana ports: - "127.0.0.1:8030:3000" environment: diff --git a/examples/compose-with-grafana/dashboards/rest-server.json b/examples/compose-with-grafana/grafana/dashboards/rest-server.json similarity index 100% rename from examples/compose-with-grafana/dashboards/rest-server.json rename to examples/compose-with-grafana/grafana/dashboards/rest-server.json diff --git a/examples/compose-with-grafana/grafana.ini b/examples/compose-with-grafana/grafana/grafana.ini similarity index 100% rename from examples/compose-with-grafana/grafana.ini rename to examples/compose-with-grafana/grafana/grafana.ini diff --git a/examples/compose-with-grafana/grafana/provisioning/dashboards/dashboards.yml b/examples/compose-with-grafana/grafana/provisioning/dashboards/dashboards.yml new file mode 100644 index 0000000..29a0e39 --- /dev/null +++ b/examples/compose-with-grafana/grafana/provisioning/dashboards/dashboards.yml @@ -0,0 +1,13 @@ +apiVersion: 1 + +providers: + - name: 'default' + orgId: 1 + folder: '' + type: file + disableDeletion: false + editable: true + allowUiUpdates: true + options: + # Path to dashboard files on disk + path: /etc/grafana/dashboards diff --git a/examples/compose-with-grafana/grafana/provisioning/datasources/datasource.yml b/examples/compose-with-grafana/grafana/provisioning/datasources/datasource.yml new file mode 100644 index 0000000..86fd346 --- /dev/null +++ b/examples/compose-with-grafana/grafana/provisioning/datasources/datasource.yml @@ -0,0 +1,8 @@ +apiVersion: 1 + +datasources: + - name: Prometheus + type: prometheus + access: proxy + url: http://prometheus:9090 + isDefault: true