From b7e64705a2e84741477b95bd2ec810deddf395c3 Mon Sep 17 00:00:00 2001 From: Weifeng Wang Date: Tue, 5 Mar 2024 16:16:15 +0800 Subject: [PATCH] update docker-compose.yaml Signed-off-by: Weifeng Wang --- docker-compose/microservices-mode/logs/docker-compose.yaml | 5 ++++- .../microservices-mode/metrics/docker-compose.yaml | 5 ++++- .../microservices-mode/profiles/docker-compose.yaml | 5 ++++- docker-compose/microservices-mode/traces/docker-compose.yaml | 5 ++++- .../monolithic-mode/all-in-one/docker-compose.yaml | 5 ++++- docker-compose/monolithic-mode/logs/docker-compose.yaml | 5 ++++- docker-compose/monolithic-mode/metrics/docker-compose.yaml | 5 ++++- docker-compose/monolithic-mode/profiles/docker-compose.yaml | 5 ++++- docker-compose/monolithic-mode/traces/docker-compose.yaml | 5 ++++- docker-compose/read-write-mode/logs/docker-compose.yaml | 5 ++++- docker-compose/read-write-mode/metrics/docker-compose.yaml | 5 ++++- 11 files changed, 44 insertions(+), 11 deletions(-) diff --git a/docker-compose/microservices-mode/logs/docker-compose.yaml b/docker-compose/microservices-mode/logs/docker-compose.yaml index 144f5030..12cf74d8 100644 --- a/docker-compose/microservices-mode/logs/docker-compose.yaml +++ b/docker-compose/microservices-mode/logs/docker-compose.yaml @@ -1,12 +1,15 @@ version: '3.9' +# ============================================================================ # +# Microservices Mode - Logs +# ============================================================================ # + # Note: # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later. include: - path: ../../common/compose-include/minio.yaml - path: ../../common/compose-include/agent-collect-logs.yaml -# Microservices mode (Logs) services: gateway: depends_on: diff --git a/docker-compose/microservices-mode/metrics/docker-compose.yaml b/docker-compose/microservices-mode/metrics/docker-compose.yaml index dd38156b..a384b707 100644 --- a/docker-compose/microservices-mode/metrics/docker-compose.yaml +++ b/docker-compose/microservices-mode/metrics/docker-compose.yaml @@ -1,5 +1,9 @@ version: '3.9' +# ============================================================================ # +# Microservices Mode - Metrics +# ============================================================================ # + # Note: # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later. include: @@ -7,7 +11,6 @@ include: - path: ../../common/compose-include/agent-collect-metrics.yaml - path: ../../common/compose-include/load-mimir-rule.yaml -# Microservices mode (Metrics) services: gateway: depends_on: diff --git a/docker-compose/microservices-mode/profiles/docker-compose.yaml b/docker-compose/microservices-mode/profiles/docker-compose.yaml index 6d6bad1d..7db8c3b8 100644 --- a/docker-compose/microservices-mode/profiles/docker-compose.yaml +++ b/docker-compose/microservices-mode/profiles/docker-compose.yaml @@ -1,12 +1,15 @@ version: '3.9' +# ============================================================================ # +# Microservices Mode - Profiles +# ============================================================================ # + # Note: # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later. include: - path: ../../common/compose-include/minio.yaml - path: ../../common/compose-include/agent-collect-profiles.yaml -# Microservices mode (Profiles) services: gateway: depends_on: diff --git a/docker-compose/microservices-mode/traces/docker-compose.yaml b/docker-compose/microservices-mode/traces/docker-compose.yaml index 6d4fb4de..a4af1260 100644 --- a/docker-compose/microservices-mode/traces/docker-compose.yaml +++ b/docker-compose/microservices-mode/traces/docker-compose.yaml @@ -1,5 +1,9 @@ version: '3.9' +# ============================================================================ # +# Microservices Mode - Traces +# ============================================================================ # + # Note: # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later. include: @@ -8,7 +12,6 @@ include: - path: ../../common/compose-include/load-mimir-rule.yaml - path: ../../common/compose-include/load-tempo-rule.yaml -# Microservices mode (Traces) services: gateway: depends_on: diff --git a/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml b/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml index 0908532b..858c9213 100644 --- a/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml +++ b/docker-compose/monolithic-mode/all-in-one/docker-compose.yaml @@ -1,11 +1,14 @@ version: '3.9' +# ============================================================================ # +# Monolithic Mode - All in one +# ============================================================================ # + # Note: # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later. include: - path: ../../common/compose-include/minio.yaml -# Monolithic mode (Metrics + Logs + Traces + Profiles) services: agent: depends_on: diff --git a/docker-compose/monolithic-mode/logs/docker-compose.yaml b/docker-compose/monolithic-mode/logs/docker-compose.yaml index 89d492c1..3dd26a16 100644 --- a/docker-compose/monolithic-mode/logs/docker-compose.yaml +++ b/docker-compose/monolithic-mode/logs/docker-compose.yaml @@ -1,12 +1,15 @@ version: '3.9' +# ============================================================================ # +# Monolithic Mode - Logs +# ============================================================================ # + # Note: # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later. include: - path: ../../common/compose-include/minio.yaml - path: ../../common/compose-include/agent-collect-logs.yaml -# Monolithic mode (Logs) services: gateway: depends_on: diff --git a/docker-compose/monolithic-mode/metrics/docker-compose.yaml b/docker-compose/monolithic-mode/metrics/docker-compose.yaml index 4411a22b..5fe83048 100644 --- a/docker-compose/monolithic-mode/metrics/docker-compose.yaml +++ b/docker-compose/monolithic-mode/metrics/docker-compose.yaml @@ -1,5 +1,9 @@ version: '3.9' +# ============================================================================ # +# Monolithic Mode - Metrics +# ============================================================================ # + # Note: # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later. include: @@ -7,7 +11,6 @@ include: - path: ../../common/compose-include/agent-collect-metrics.yaml - path: ../../common/compose-include/load-mimir-rule.yaml -# Monolithic mode (Metrics) services: gateway: depends_on: diff --git a/docker-compose/monolithic-mode/profiles/docker-compose.yaml b/docker-compose/monolithic-mode/profiles/docker-compose.yaml index de955db8..db3973d5 100644 --- a/docker-compose/monolithic-mode/profiles/docker-compose.yaml +++ b/docker-compose/monolithic-mode/profiles/docker-compose.yaml @@ -1,5 +1,9 @@ version: '3.9' +# ============================================================================ # +# Monolithic Mode - Profiles +# ============================================================================ # + # Note: # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later. include: @@ -12,7 +16,6 @@ include: # - https://github.com/qclaogui/codelab-monitoring.git#main:docker-compose/common/compose-include/minio.yaml # - https://github.com/qclaogui/codelab-monitoring.git#main:docker-compose/common/compose-include/agent-collect-profiles.yaml -# Monolithic mode (Profiles) services: gateway: depends_on: diff --git a/docker-compose/monolithic-mode/traces/docker-compose.yaml b/docker-compose/monolithic-mode/traces/docker-compose.yaml index 37f6a64c..7d442dd5 100644 --- a/docker-compose/monolithic-mode/traces/docker-compose.yaml +++ b/docker-compose/monolithic-mode/traces/docker-compose.yaml @@ -1,5 +1,9 @@ version: '3.9' +# ============================================================================ # +# Monolithic Mode - Traces +# ============================================================================ # + # Note: # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later. include: @@ -8,7 +12,6 @@ include: - path: ../../common/compose-include/load-mimir-rule.yaml - path: ../../common/compose-include/load-tempo-rule.yaml -# Monolithic mode (Traces) services: gateway: depends_on: diff --git a/docker-compose/read-write-mode/logs/docker-compose.yaml b/docker-compose/read-write-mode/logs/docker-compose.yaml index 1e0df0b2..71bf076b 100644 --- a/docker-compose/read-write-mode/logs/docker-compose.yaml +++ b/docker-compose/read-write-mode/logs/docker-compose.yaml @@ -1,12 +1,15 @@ version: '3.9' +# ============================================================================ # +# Read-Write Mode - Logs +# ============================================================================ # + # Note: # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later. include: - path: ../../common/compose-include/minio.yaml - path: ../../common/compose-include/agent-collect-logs.yaml -# Read-Write mode (Logs) services: gateway: depends_on: diff --git a/docker-compose/read-write-mode/metrics/docker-compose.yaml b/docker-compose/read-write-mode/metrics/docker-compose.yaml index 65655cd9..767bbb7e 100644 --- a/docker-compose/read-write-mode/metrics/docker-compose.yaml +++ b/docker-compose/read-write-mode/metrics/docker-compose.yaml @@ -1,5 +1,9 @@ version: '3.9' +# ============================================================================ # +# Read-Write Mode - Metrics +# ============================================================================ # + # Note: # include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later. include: @@ -7,7 +11,6 @@ include: - path: ../../common/compose-include/agent-collect-metrics.yaml - path: ../../common/compose-include/load-mimir-rule.yaml -# Read-Write mode (Metrics) services: gateway: depends_on: