diff --git a/devenv/frontend-service/Tiltfile b/devenv/frontend-service/Tiltfile index f4d3887df3b..b7e6f81eca3 100644 --- a/devenv/frontend-service/Tiltfile +++ b/devenv/frontend-service/Tiltfile @@ -79,6 +79,7 @@ docker_build('grafana-fs-dev', # Paths relative to the docker context (root of the repo) only=[ 'devenv/frontend-service/build/grafana', + 'devenv/frontend-service/provisioning', 'conf/defaults.ini', 'public/emails', 'public/views', @@ -96,6 +97,7 @@ docker_build('grafana-fs-dev', sync('../../public/dashboards', '/grafana/public/dashboards'), sync('../../public/app/plugins', '/grafana/public/app/plugins'), sync('../../public/build/assets-manifest.json', '/grafana/public/build/assets-manifest.json'), + sync('./provisioning', '/ignore/provisioning'), # Just to trigger a restart instead of rebuild restart_container() ] ) diff --git a/devenv/frontend-service/docker-compose.yaml b/devenv/frontend-service/docker-compose.yaml index 1d5c46ba546..17a0ab3c7ef 100644 --- a/devenv/frontend-service/docker-compose.yaml +++ b/devenv/frontend-service/docker-compose.yaml @@ -21,6 +21,9 @@ services: entrypoint: ['bin/grafana', 'server'] volumes: - backend-data:/grafana/data + - ./provisioning/datasources:/grafana/conf/provisioning/datasources + - ./provisioning/dashboards:/grafana/conf/provisioning/dashboards + - ../dev-dashboards:/grafana/conf/dev-dashboards environment: GF_SERVER_CDN_URL: http://localhost:3010 GF_FEATURE_TOGGLES_ENABLE: multiTenantFrontend diff --git a/devenv/frontend-service/provisioning/dashboards/devenv.yaml b/devenv/frontend-service/provisioning/dashboards/devenv.yaml new file mode 100644 index 00000000000..c22f2d90141 --- /dev/null +++ b/devenv/frontend-service/provisioning/dashboards/devenv.yaml @@ -0,0 +1,13 @@ +apiVersion: 1 + +providers: + - name: 'gdev dashboards' + folder: 'gdev dashboards' + folderUid: '' + type: file + allowUiUpdates: false + updateIntervalSeconds: 3600 + options: + # This path is relative to the WORKDIR in the docker container. It is mounted + # in the docker-compose.yml file. + path: conf/dev-dashboards diff --git a/devenv/frontend-service/provisioning/datasources/default.yaml b/devenv/frontend-service/provisioning/datasources/default.yaml new file mode 100644 index 00000000000..a3e3c50f570 --- /dev/null +++ b/devenv/frontend-service/provisioning/datasources/default.yaml @@ -0,0 +1,9 @@ +apiVersion: 1 + +prune: true + +datasources: + # From devenv/datasources.yaml + - name: Testdata + uid: PD8C576611E62080A + type: grafana-testdata-datasource