-
Notifications
You must be signed in to change notification settings - Fork 926
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: Refactor garafana and prometheus deployment stuff (#646)
<!-- ELLIPSIS_HIDDEN --> > [!IMPORTANT] > Refactor Grafana and Prometheus deployment by consolidating configurations into a single `monitoring` directory and updating related `docker-compose` setups. > > - **Refactoring**: > - Consolidate Grafana and Prometheus configurations into `monitoring` directory. > - Remove `grafana/docker-compose.yml` and `prometheus/docker-compose.yml`. > - Update `docker-compose.yml` to include `monitoring/docker-compose.yml` instead of separate Grafana and Prometheus files. > - **File Moves**: > - Move `grafana/provisioning/datasources/datasource.yml` to `monitoring/grafana/provisioning/datasources/datasource.yml`. > - Move `prometheus/config/prometheus.yml` to `monitoring/prometheus/config/prometheus.yml`. > - **Configuration Changes**: > - Update `monitoring/docker-compose.yml` to include both Grafana and Prometheus services with shared volume configurations. > - Add `depends_on` condition for Prometheus service in `monitoring/docker-compose.yml`. > > <sup>This description was created by </sup>[<img alt="Ellipsis" src="https://img.shields.io/badge/Ellipsis-blue?color=175173">](https://www.ellipsis.dev?ref=julep-ai%2Fjulep&utm_source=github&utm_medium=referral)<sup> for cb36d21. It will automatically update as commits are pushed.</sup> <!-- ELLIPSIS_HIDDEN -->
- Loading branch information
1 parent
d803b9a
commit a20285e
Showing
9 changed files
with
35 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,39 +1,39 @@ | ||
name: julep-monitoring | ||
|
||
services: | ||
portainer: | ||
image: portainer/portainer-ce:latest | ||
container_name: portainer | ||
restart: unless-stopped | ||
ports: | ||
- "9000:8000" | ||
- "9443:9443" | ||
volumes: | ||
- portainer_data:/data | ||
- /var/run/docker.sock:/var/run/docker.sock | ||
|
||
prometheus: | ||
image: prom/prometheus | ||
container_name: prometheus | ||
command: | ||
- "--config.file=/etc/prometheus/prometheus.yml" | ||
restart: unless-stopped | ||
profiles: | ||
- multi-tenant | ||
|
||
volumes: | ||
- ./prometheus:/etc/prometheus | ||
- prom_data:/prometheus | ||
- ./config/prometheus.yml:/etc/prometheus/prometheus.yml | ||
- prometheus_data:/prometheus | ||
|
||
depends_on: | ||
agents-api-multi-tenant: | ||
condition: service_started | ||
|
||
command: | ||
- '--config.file=/etc/prometheus/prometheus.yml' | ||
|
||
grafana: | ||
image: grafana/grafana | ||
environment: | ||
- GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD} | ||
- GF_SECURITY_ADMIN_USER=${GRAFANA_ADMIN_USER} | ||
container_name: grafana | ||
ports: | ||
- 3000:3000 | ||
restart: unless-stopped | ||
environment: | ||
- GF_SECURITY_ADMIN_USER=admin | ||
- GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD} | ||
volumes: | ||
- ./grafana:/etc/grafana/provisioning/datasources | ||
- grafana_data:/var/lib/grafana | ||
- ./provisioning:/etc/grafana/provisioning | ||
profiles: | ||
- multi-tenant | ||
|
||
volumes: | ||
prom_data: | ||
portainer_data: | ||
prometheus_data: | ||
external: true | ||
grafana_data: | ||
external: true |
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.