deployment/docker: follow-up 38b2a5bc44

* Simplify folder structure
* mention datasource in README

Signed-off-by: hagen1778 <roman@victoriametrics.com>
This commit is contained in:
hagen1778 2024-01-22 16:05:44 +01:00
parent 38b2a5bc44
commit 0e5e502b3c
No known key found for this signature in database
GPG key ID: 3BF75F3741CA9640
6 changed files with 20 additions and 10 deletions

View file

@ -188,10 +188,10 @@ docker-single-down:
$(DOCKER_COMPOSE) -f deployment/docker/docker-compose.yml down -v
docker-single-vm-datasource-up:
$(DOCKER_COMPOSE) -f deployment/docker/docker-compose.yml -f deployment/docker/vm-datasource/docker-compose-with-datasource.yml up -d
$(DOCKER_COMPOSE) -f deployment/docker/docker-compose.yml -f deployment/docker/vm-datasource/docker-compose.yml up -d
docker-single-vm-datasource-down:
$(DOCKER_COMPOSE) -f deployment/docker/docker-compose.yml -f deployment/docker/vm-datasource/docker-compose-with-datasource.yml down -v
$(DOCKER_COMPOSE) -f deployment/docker/docker-compose.yml -f deployment/docker/vm-datasource/docker-compose.yml down -v
docker-cluster-up:
$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml up -d
@ -200,7 +200,7 @@ docker-cluster-down:
$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml down -v
docker-cluster-vm-datasource-up:
$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml -f deployment/docker/vm-datasource/docker-compose-cluster-with-datasource.yml up -d
$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml -f deployment/docker/vm-datasource/docker-compose-cluster.yml up -d
docker-cluster-vm-datasource-down:
$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml -f deployment/docker/vm-datasource/docker-compose-cluster-with-datasource.yml down -v
$(DOCKER_COMPOSE) -f deployment/docker/docker-compose-cluster.yml -f deployment/docker/vm-datasource/docker-compose-cluster.yml down -v

View file

@ -27,6 +27,16 @@ To shut down the docker compose environment for cluster version run the followin
make docker-cluster-down
```
Optionally, environment with [VictoriaMetrics Grafana datasource](https://github.com/VictoriaMetrics/grafana-datasource)
can be started with the following commands:
```
make docker-single-vm-datasource-up # start single server
make docker-single-vm-datasource-down # start cluster
make docker-cluster-vm-datasource-up # shut down single server
make docker-cluster-vm-datasource-down # shutdown cluster
```
## VictoriaMetrics single server
VictoriaMetrics will be accessible on the following ports:

View file

@ -8,16 +8,16 @@ services:
ports:
- 3000:3000
entrypoint: ["/bin/bash", "-c"]
command: ["chmod +x /download-vm-datasource.sh && /download-vm-datasource.sh && /run.sh"]
command: ["chmod +x /download.sh && /download.sh && /run.sh"]
volumes:
- grafanadata:/var/lib/grafana
- ./vm-datasource/config:/etc/grafana/provisioning/datasources
- ./provisioning/datasources/victoriametrics-datasource:/etc/grafana/provisioning/datasources
- ./provisioning/dashboards:/etc/grafana/provisioning/dashboards
- ./provisioning/plugins/:/var/lib/grafana/plugins
- ./../../dashboards/vm/victoriametrics-cluster.json:/var/lib/grafana/dashboards/vm.json
- ./../../dashboards/vm/vmagent.json:/var/lib/grafana/dashboards/vmagent.json
- ./../../dashboards/vm/vmalert.json:/var/lib/grafana/dashboards/vmalert.json
- ./vm-datasource/scripts/download-vm-datasource.sh:/download-vm-datasource.sh
- ./vm-datasource/download.sh:/download.sh
environment:
- "GF_ALLOW_LOADING_UNSIGNED_PLUGINS=victoriametrics-datasource"
- "GF_DEFAULT_APP_MODE=development"

View file

@ -8,16 +8,16 @@ services:
ports:
- 3000:3000
entrypoint: [ "/bin/bash", "-c" ]
command: [ "chmod +x /download-vm-datasource.sh && /download-vm-datasource.sh && /run.sh" ]
command: [ "chmod +x /download.sh && /download.sh && /run.sh" ]
volumes:
- grafanadata:/var/lib/grafana
- ./vm-datasource/config:/etc/grafana/provisioning/datasources
- ./provisioning/datasources/victoriametrics-datasource:/etc/grafana/provisioning/datasources
- ./provisioning/dashboards:/etc/grafana/provisioning/dashboards
- ./provisioning/plugins/:/var/lib/grafana/plugins
- ./../../dashboards/vm/victoriametrics.json:/var/lib/grafana/dashboards/vm.json
- ./../../dashboards/vm/vmagent.json:/var/lib/grafana/dashboards/vmagent.json
- ./../../dashboards/vm/vmalert.json:/var/lib/grafana/dashboards/vmalert.json
- ./vm-datasource/scripts/download-vm-datasource.sh:/download-vm-datasource.sh
- ./vm-datasource/download.sh:/download.sh
environment:
- "GF_ALLOW_LOADING_UNSIGNED_PLUGINS=victoriametrics-datasource"
- "GF_DEFAULT_APP_MODE=development"