Merge pull request #75 from qclaogui/fix-services-override

qclaogui · Mar 29, 2024 · da66c71 · da66c71
2 parents 2dd001c + 3776310
commit da66c71
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -5,7 +5,7 @@ on:
     # branches to consider in the event; optional, defaults to all
     branches:
       - main
-  workflow_dispatch: {}
+  workflow_dispatch: {} # Allow manual triggering
 
 jobs:
   update_release_draft:

diff --git a/docker-compose/microservices-mode/logs/compose.yaml b/docker-compose/microservices-mode/logs/compose.yaml
@@ -6,11 +6,14 @@ version: '3.9'
 
 # Note: 
 # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later.
+# docs: https://docs.docker.com/compose/multiple-compose-files/include/#include-and-overrides
 include:
   - path: ../../common/compose-include/minio.yaml
   - path: ../../common/compose-include/memcached.yaml
   - path: ../../common/compose-include/mimir.yaml
-  - path: ../../common/compose-include/grafana-agent.yaml
+  - path:
+      - ../../common/compose-include/grafana-agent.yaml
+      - ./compose.override.yaml  # Microservices Mode services override
   - path: ../../common/compose-include/grafana.yaml
 
 # https://github.com/qclaogui/codelab-monitoring/blob/main/docker-compose/common/config/agent-flow/modules/docker/README.md

diff --git a/docker-compose/microservices-mode/profiles/compose.yaml b/docker-compose/microservices-mode/profiles/compose.yaml
@@ -6,11 +6,14 @@ version: '3.9'
 
 # Note: 
 # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later.
+# docs: https://docs.docker.com/compose/multiple-compose-files/include/#include-and-overrides
 include:
   - path: ../../common/compose-include/minio.yaml
   - path: ../../common/compose-include/memcached.yaml
   - path: ../../common/compose-include/mimir.yaml
-  - path: ../../common/compose-include/grafana-agent.yaml
+  - path:
+      - ../../common/compose-include/grafana-agent.yaml
+      - ./compose.override.yaml  # Microservices Mode services override
   - path: ../../common/compose-include/grafana.yaml
 
 # https://github.com/qclaogui/codelab-monitoring/blob/main/docker-compose/common/config/agent-flow/modules/docker/README.md

diff --git a/docker-compose/microservices-mode/traces/compose.yaml b/docker-compose/microservices-mode/traces/compose.yaml
@@ -6,12 +6,15 @@ version: '3.9'
 
 # Note: 
 # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later.
+# docs: https://docs.docker.com/compose/multiple-compose-files/include/#include-and-overrides
 include:
   - path: ../../common/compose-include/minio.yaml
   - path: ../../common/compose-include/memcached.yaml
   - path: ../../common/compose-include/mimir.yaml
   - path: ../../common/compose-include/loki.yaml
-  - path: ../../common/compose-include/grafana-agent.yaml
+  - path:
+      - ../../common/compose-include/grafana-agent.yaml
+      - ./compose.override.yaml  # Microservices Mode services override
   - path: ../../common/compose-include/grafana.yaml
 
 x-environment: &jaeger-environment

diff --git a/docker-compose/read-write-mode/logs/compose.yaml b/docker-compose/read-write-mode/logs/compose.yaml
@@ -6,11 +6,14 @@ version: '3.9'
 
 # Note: 
 # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later.
+# docs: https://docs.docker.com/compose/multiple-compose-files/include/#include-and-overrides
 include:
   - path: ../../common/compose-include/minio.yaml
   - path: ../../common/compose-include/memcached.yaml
   - path: ../../common/compose-include/mimir.yaml
-  - path: ../../common/compose-include/grafana-agent.yaml
+  - path:
+      - ../../common/compose-include/grafana-agent.yaml
+      - ./compose.override.yaml  # Read-Write Mode services override
   - path: ../../common/compose-include/grafana.yaml
 
 x-labels: &loki-labels

diff --git a/examples/github-exporter/compose.yaml b/examples/github-exporter/compose.yaml
@@ -8,13 +8,19 @@
 
 # Note:
 # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later.
+# docs: https://docs.docker.com/compose/multiple-compose-files/include/#include-and-overrides
 include:
 # - path: https://github.com/qclaogui/codelab-monitoring.git#main:docker-compose/monolithic-mode/all-in-one/compose.yaml  # All in one(Logs Traces Metrics Profiles)
 # - path: https://github.com/qclaogui/codelab-monitoring.git#main:docker-compose/monolithic-mode/metrics/compose.yaml     # Metrics
 - path: https://github.com/qclaogui/codelab-monitoring.git#main:docker-compose/monolithic-mode/logs/compose.yaml        # Metrics and Logs
 # - path: https://github.com/qclaogui/codelab-monitoring.git#main:docker-compose/monolithic-mode/traces/compose.yaml      # Metrics and Traces
 # - path: https://github.com/qclaogui/codelab-monitoring.git#main:docker-compose/monolithic-mode/profiles/compose.yaml    # Metrics and Profiles
 
+# Local
+# - path: ../../docker-compose/monolithic-mode/logs/compose.yaml
+# - path: ../../docker-compose/read-write-mode/logs/compose.yaml
+# - path: ../../docker-compose/microservices-mode/logs/compose.yaml
+
 services:
   github-exporter:
     # https://github.com/qclaogui/codelab-monitoring/blob/main/docker-compose/common/config/agent-flow/modules/docker/README.md