diff --git a/docker-compose.yml b/docker-compose.yml index 7b6edb2..b1d402e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: image: docker.io/otel/opentelemetry-collector:0.92.0 command: ["--config=/etc/otel-collector-config.yaml"] volumes: - - ./config/otel-collector-config.yaml:/etc/otel-collector-config.yaml:z + - ./grafana/otel-collector-config.yaml:/etc/otel-collector-config.yaml:z ports: - "1888:1888" # pprof extension - "8888:8888" # Prometheus metrics exposed by the collector @@ -38,7 +38,7 @@ services: restart: unless-stopped image: docker.io/prom/prometheus:v2.48.1 volumes: - - ./config/prometheus.yaml:/etc/prometheus/prometheus.yml:z + - ./grafana/prometheus.yaml:/etc/prometheus/prometheus.yml:z ports: - "9091:9090" networks: @@ -53,11 +53,11 @@ services: restart: unless-stopped image: docker.io/grafana/grafana:10.2.3 volumes: - - ./config/grafana.ini:/etc/grafana/grafana.ini - - ./config/grafana-datasources.yml:/etc/grafana/provisioning/datasources/datasource.yaml - - ./config/grafana-dashboards.yaml:/etc/grafana/provisioning/dashboards/default.yaml - - ./config/grafana-dashboard-servers.json:/var/lib/grafana/dashboards/servers.json - - ./config/grafana-dashboard-switches.json:/var/lib/grafana/dashboards/switches.json + - ./grafana/grafana.ini:/etc/grafana/grafana.ini + - ./grafana/grafana-datasources.yml:/etc/grafana/provisioning/datasources/datasource.yaml + - ./grafana/grafana-dashboards.yaml:/etc/grafana/provisioning/dashboards/default.yaml + - ./grafana/grafana-dashboard-servers.json:/var/lib/grafana/dashboards/servers.json + - ./grafana/grafana-dashboard-switches.json:/var/lib/grafana/dashboards/switches.json ports: - "3000:3000" networks: diff --git a/config/grafana-dashboard-servers.json b/grafana/grafana-dashboard-servers.json similarity index 100% rename from config/grafana-dashboard-servers.json rename to grafana/grafana-dashboard-servers.json diff --git a/config/grafana-dashboard-switches.json b/grafana/grafana-dashboard-switches.json similarity index 100% rename from config/grafana-dashboard-switches.json rename to grafana/grafana-dashboard-switches.json diff --git a/config/grafana-dashboards.yaml b/grafana/grafana-dashboards.yaml similarity index 100% rename from config/grafana-dashboards.yaml rename to grafana/grafana-dashboards.yaml diff --git a/config/grafana-datasources.yml b/grafana/grafana-datasources.yml similarity index 100% rename from config/grafana-datasources.yml rename to grafana/grafana-datasources.yml diff --git a/config/grafana.ini b/grafana/grafana.ini similarity index 100% rename from config/grafana.ini rename to grafana/grafana.ini diff --git a/config/otel-collector-config.yaml b/grafana/otel-collector-config.yaml similarity index 100% rename from config/otel-collector-config.yaml rename to grafana/otel-collector-config.yaml diff --git a/config/prometheus.yaml b/grafana/prometheus.yaml similarity index 100% rename from config/prometheus.yaml rename to grafana/prometheus.yaml