Improve grafana datasources config

Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Aug 10, 2023 · 7dc74f4 · 7dc74f4
1 parent 60f5a2d
commit 7dc74f4
Show file tree

Hide file tree

Showing 22 changed files with 0 additions and 88 deletions.
diff --git a/...logs/config/grafana/datasources/logs.yaml → ...rafana/provisioning/datasources/logs.yaml b/...logs/config/grafana/datasources/logs.yaml → ...rafana/provisioning/datasources/logs.yaml
diff --git a/...s/config/grafana/datasources/metrics.yaml → ...ana/provisioning/datasources/metrics.yaml b/...s/config/grafana/datasources/metrics.yaml → ...ana/provisioning/datasources/metrics.yaml
diff --git a/...es/config/grafana/datasources/traces.yaml → ...fana/provisioning/datasources/traces.yaml b/...es/config/grafana/datasources/traces.yaml → ...fana/provisioning/datasources/traces.yaml
diff --git a/docker-compose/microservices-mode/logs/docker-compose.yaml b/docker-compose/microservices-mode/logs/docker-compose.yaml
@@ -162,7 +162,6 @@ services:
       - ../../common/config/grafana/grafana.ini:/etc/grafana-config/grafana.ini
       - ../../common/config/grafana/dashboards:/var/lib/grafana/dashboards
       - ../../common/config/grafana/provisioning:/etc/grafana/provisioning
-      - ./config/grafana/datasources:/etc/grafana/provisioning/datasources
     environment:
       - GF_LOG_LEVEL=error
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}

diff --git a/docker-compose/microservices-mode/metrics/config/grafana/datasources/logs.yaml b/docker-compose/microservices-mode/metrics/config/grafana/datasources/logs.yaml
diff --git a/docker-compose/microservices-mode/metrics/docker-compose.yaml b/docker-compose/microservices-mode/metrics/docker-compose.yaml
@@ -243,7 +243,6 @@ services:
       - ../../common/config/grafana/grafana.ini:/etc/grafana-config/grafana.ini
       - ../../common/config/grafana/dashboards:/var/lib/grafana/dashboards
       - ../../common/config/grafana/provisioning:/etc/grafana/provisioning
-      - ./config/grafana/datasources:/etc/grafana/provisioning/datasources
       - ../../../monitoring-mixins/mimir-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/mimir-mixin # load dashboards
     environment:
       - GF_LOG_LEVEL=error

diff --git a/docker-compose/microservices-mode/traces/config/.keep b/docker-compose/microservices-mode/traces/config/.keep
diff --git a/docker-compose/microservices-mode/traces/config/grafana/.keep b/docker-compose/microservices-mode/traces/config/grafana/.keep
diff --git a/docker-compose/microservices-mode/traces/docker-compose.yaml b/docker-compose/microservices-mode/traces/docker-compose.yaml
@@ -141,7 +141,6 @@ services:
       - ../../common/config/grafana/grafana.ini:/etc/grafana-config/grafana.ini
       - ../../common/config/grafana/dashboards:/var/lib/grafana/dashboards
       - ../../common/config/grafana/provisioning:/etc/grafana/provisioning
-      - ./config/grafana/datasources:/etc/grafana/provisioning/datasources
     environment:
       - GF_LOG_LEVEL=error
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}

diff --git a/docker-compose/monolithic-mode/logs/config/grafana/datasources/logs.yaml b/docker-compose/monolithic-mode/logs/config/grafana/datasources/logs.yaml
diff --git a/docker-compose/monolithic-mode/logs/docker-compose.yaml b/docker-compose/monolithic-mode/logs/docker-compose.yaml
@@ -80,7 +80,6 @@ services:
       - ../../common/config/grafana/grafana.ini:/etc/grafana-config/grafana.ini
       - ../../common/config/grafana/dashboards:/var/lib/grafana/dashboards
       - ../../common/config/grafana/provisioning:/etc/grafana/provisioning
-      - ./config/grafana/datasources:/etc/grafana/provisioning/datasources
     environment:
       - GF_LOG_LEVEL=warn
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}

diff --git a/docker-compose/monolithic-mode/metrics/config/.keep b/docker-compose/monolithic-mode/metrics/config/.keep
diff --git a/docker-compose/monolithic-mode/metrics/config/grafana/.keep b/docker-compose/monolithic-mode/metrics/config/grafana/.keep
diff --git a/docker-compose/monolithic-mode/metrics/config/grafana/datasources/metrics.yaml b/docker-compose/monolithic-mode/metrics/config/grafana/datasources/metrics.yaml
diff --git a/docker-compose/monolithic-mode/metrics/docker-compose.yaml b/docker-compose/monolithic-mode/metrics/docker-compose.yaml
@@ -95,7 +95,6 @@ services:
       - ../../common/config/grafana/grafana.ini:/etc/grafana-config/grafana.ini
       - ../../common/config/grafana/dashboards:/var/lib/grafana/dashboards
       - ../../common/config/grafana/provisioning:/etc/grafana/provisioning
-      - ./config/grafana/datasources:/etc/grafana/provisioning/datasources
       - ../../../monitoring-mixins/mimir-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/mimir-mixin # load dashboards
     environment:
       - GF_LOG_LEVEL=error

diff --git a/docker-compose/monolithic-mode/profiles/docker-compose.yaml b/docker-compose/monolithic-mode/profiles/docker-compose.yaml
@@ -56,7 +56,6 @@ services:
       - ../../common/config/grafana/grafana.ini:/etc/grafana-config/grafana.ini
       - ../../common/config/grafana/dashboards:/var/lib/grafana/dashboards
       - ../../common/config/grafana/provisioning:/etc/grafana/provisioning
-      - ./config/grafana/datasources:/etc/grafana/provisioning/datasources
     environment:
       - GF_LOG_LEVEL=error
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}

diff --git a/docker-compose/monolithic-mode/traces/config/grafana/datasources/traces.yaml b/docker-compose/monolithic-mode/traces/config/grafana/datasources/traces.yaml
diff --git a/docker-compose/monolithic-mode/traces/docker-compose.yaml b/docker-compose/monolithic-mode/traces/docker-compose.yaml
@@ -79,7 +79,6 @@ services:
       - ../../common/config/grafana/grafana.ini:/etc/grafana-config/grafana.ini
       - ../../common/config/grafana/dashboards:/var/lib/grafana/dashboards
       - ../../common/config/grafana/provisioning:/etc/grafana/provisioning
-      - ./config/grafana/datasources:/etc/grafana/provisioning/datasources
     environment:
       - GF_LOG_LEVEL=error
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}

diff --git a/docker-compose/read-write-mode/logs/config/grafana/datasources/logs.yaml b/docker-compose/read-write-mode/logs/config/grafana/datasources/logs.yaml
diff --git a/docker-compose/read-write-mode/logs/docker-compose.yaml b/docker-compose/read-write-mode/logs/docker-compose.yaml
@@ -129,7 +129,6 @@ services:
       - ../../common/config/grafana/grafana.ini:/etc/grafana-config/grafana.ini
       - ../../common/config/grafana/dashboards:/var/lib/grafana/dashboards
       - ../../common/config/grafana/provisioning:/etc/grafana/provisioning
-      - ./config/grafana/datasources:/etc/grafana/provisioning/datasources
     environment:
       - GF_LOG_LEVEL=warn
       - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD:-admin_password}

diff --git a/docker-compose/read-write-mode/metrics/config/grafana/datasources/metrics.yaml b/docker-compose/read-write-mode/metrics/config/grafana/datasources/metrics.yaml
diff --git a/docker-compose/read-write-mode/metrics/docker-compose.yaml b/docker-compose/read-write-mode/metrics/docker-compose.yaml
@@ -130,7 +130,6 @@ services:
       - ../../common/config/grafana/grafana.ini:/etc/grafana-config/grafana.ini
       - ../../common/config/grafana/dashboards:/var/lib/grafana/dashboards
       - ../../common/config/grafana/provisioning:/etc/grafana/provisioning
-      - ./config/grafana/datasources:/etc/grafana/provisioning/datasources
       - ../../../monitoring-mixins/mimir-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/mimir-mixin # load dashboards
     environment:
       - GF_LOG_LEVEL=error