933e7256e3
# What this PR does As part of #1953, I wanted to be able to easily locally modify my Grafana instance's access control provisioning configuration. In the `grafana` container in `docker-compose-developer.yml`, we already have this: ```yml volumes: - ./provisioning:/etc/grafana/provisioning ``` The `dev` directory has a `.gitignore` setup which is better suited for what I would like to do. By default, if I add `./dev/grafana/provisioning/access-control/custom-roles.yml`, it will be git-ignored. This would've not been the case with the `./provisioning` directory *Other stuff* - create `./dev/grafana` folder. This folder contains resources that are volume mounted into the `grafana` container in `docker-compose-developer.yml`. - We already had a `./dev/grafana.dev.ini` file, relocated this here. - Relocated `./provisioning` to `./dev/grafana/provisioning`. - consolidate `./examples/terraform` into `./terraform` directory ## Checklist - [ ] Unit, integration, and e2e (if applicable) tests updated (N/A) - [ ] Documentation added (or `pr:no public docs` PR label added if not required) (N/A) - [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required) (N/A)
20 lines
402 B
Text
20 lines
402 B
Text
# Ignore everything
|
|
*
|
|
|
|
# Except
|
|
!.env.dev.example
|
|
!.env.mysql.dev
|
|
!.env.postgres.dev
|
|
!.env.sqlite.dev
|
|
!add_env_var.sh
|
|
!prometheus.yml
|
|
!README.md
|
|
!scripts/
|
|
!scripts/*
|
|
|
|
# only source control grafana/provisioning/datasources/automatic.yml
|
|
# any other files under ./grafana will be ignored
|
|
!grafana/
|
|
!grafana/provisioning/
|
|
!grafana/provisioning/datasources/
|
|
!grafana/provisioning/datasources/automatic.yml
|