From c966884a854f09bae7bc4f0ca7016cd1a835eec4 Mon Sep 17 00:00:00 2001 From: Weifeng Wang Date: Mon, 15 Apr 2024 22:30:09 +0800 Subject: [PATCH] Update README.md Signed-off-by: Weifeng Wang --- compose.override.yaml | 8 +++++--- .../common/compose-include/grafana.yaml | 3 +-- .../common/compose-include/mimir.yaml | 2 -- .../common/compose-include/tempo.yaml | 1 - .../common/config/alloy/all-in-one.alloy | 18 +++++++++--------- docker-compose/common/config/alloy/logs.alloy | 10 +++++----- .../common/config/alloy/metrics.alloy | 8 ++++---- .../config/alloy/modules/provider/README.md | 12 ++++++------ .../alloy/modules/provider/self_hosted.alloy | 4 ++-- .../common/config/alloy/profiles.alloy | 10 +++++----- .../common/config/alloy/traces.alloy | 14 +++++++------- .../microservices-mode/logs/README.md | 4 ++-- .../microservices-mode/logs/compose.yaml | 2 +- .../microservices-mode/metrics/README.md | 4 ++-- .../microservices-mode/metrics/compose.yaml | 2 +- .../microservices-mode/profiles/README.md | 4 ++-- .../microservices-mode/profiles/compose.yaml | 2 +- .../microservices-mode/traces/README.md | 4 ++-- .../microservices-mode/traces/compose.yaml | 4 +--- .../monolithic-mode/all-in-one/compose.yaml | 8 +++----- docker-compose/monolithic-mode/logs/README.md | 8 ++++---- .../monolithic-mode/metrics/README.md | 8 ++++---- .../monolithic-mode/profiles/README.md | 4 ++-- .../monolithic-mode/traces/README.md | 8 ++++---- docker-compose/read-write-mode/logs/README.md | 4 ++-- .../read-write-mode/logs/compose.yaml | 2 +- .../read-write-mode/metrics/README.md | 4 ++-- .../read-write-mode/metrics/compose.yaml | 2 +- examples/ghe-with-mixin/compose.yaml | 11 ++++++++--- .../ghe-with-simple-dashboards/compose.yaml | 11 ++++++++--- examples/github-exporter/compose.yaml | 8 ++++---- examples/grafana-oncall/compose.yaml | 11 ++++++++--- kubernetes/microservices-mode/logs/README.md | 4 ++-- .../microservices-mode/metrics/README.md | 4 ++-- .../microservices-mode/profiles/README.md | 4 ++-- kubernetes/microservices-mode/traces/README.md | 4 ++-- kubernetes/monolithic-mode/logs/README.md | 8 ++++---- kubernetes/monolithic-mode/metrics/README.md | 8 ++++---- kubernetes/monolithic-mode/profiles/README.md | 4 ++-- kubernetes/monolithic-mode/traces/README.md | 8 ++++---- kubernetes/read-write-mode/logs/README.md | 4 ++-- kubernetes/read-write-mode/metrics/README.md | 4 ++-- 42 files changed, 133 insertions(+), 124 deletions(-) diff --git a/compose.override.yaml b/compose.override.yaml index 9b8bb234..363d0a3e 100644 --- a/compose.override.yaml +++ b/compose.override.yaml @@ -32,9 +32,10 @@ services: profiles.grafana.com/service_name: grafana profiles.grafana.com/port: 6060 volumes: - - ./monitoring-mixins/pyroscope-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/pyroscope-mixin - ./monitoring-mixins/loki-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/loki-mixin - ./monitoring-mixins/tempo-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/tempo-mixin + - ./monitoring-mixins/mimir-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/mimir-mixin + - ./monitoring-mixins/pyroscope-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/pyroscope-mixin environment: GF_LOG_LEVEL: ${GF_LOG_LEVEL:-warn} GF_DIAGNOSTICS_PROFILING_ENABLED: true @@ -69,10 +70,11 @@ services: volumes: - ./monitoring-mixins/loki-mixin/deploy/loki-mixin-rules.yaml:/rules/loki-mixin-rules.yaml - ./monitoring-mixins/loki-mixin/deploy/loki-mixin-alerts.yaml:/rules/loki-mixin-alerts.yaml - - ./monitoring-mixins/pyroscope-mixin/deploy/pyroscope-mixin-rules.yaml:/rules/pyroscope-mixin-rules.yaml - ./monitoring-mixins/tempo-mixin/deploy/tempo-mixin-rules.yaml:/rules/tempo-mixin-rules.yaml - ./monitoring-mixins/tempo-mixin/deploy/tempo-mixin-alerts.yaml:/rules/tempo-mixin-alerts.yaml - + - ./monitoring-mixins/mimir-mixin/deploy/mimir-mixin-rules.yaml:/rules/mimir-mixin-rules.yaml + - ./monitoring-mixins/mimir-mixin/deploy/mimir-mixin-alerts.yaml:/rules/mimir-mixin-alerts.yaml + - ./monitoring-mixins/pyroscope-mixin/deploy/pyroscope-mixin-rules.yaml:/rules/pyroscope-mixin-rules.yaml # override compose.yaml included service pyroscope's labels and environment to enabled traces data collection pyroscope: labels: diff --git a/docker-compose/common/compose-include/grafana.yaml b/docker-compose/common/compose-include/grafana.yaml index 48739afb..ff83b992 100644 --- a/docker-compose/common/compose-include/grafana.yaml +++ b/docker-compose/common/compose-include/grafana.yaml @@ -28,9 +28,8 @@ services: - ../config/grafana/dashboards:/var/lib/grafana/dashboards - ../config/grafana/provisioning:/etc/grafana/provisioning - ../../../monitoring-mixins/alloy-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/alloy-mixin - - ../../../monitoring-mixins/go-runtime-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/go-runtime-mixin - - ../../../monitoring-mixins/mimir-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/mimir-mixin - ../../../monitoring-mixins/memcached-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/memcached-mixin + - ../../../monitoring-mixins/go-runtime-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/go-runtime-mixin environment: GF_FEATURE_TOGGLES_ENABLE: traceqlEditor tracesEmbeddedFlameGraph traceqlSearch correlations metricsSummary traceToMetrics traceToProfiles GF_SMTP_ENABLED: true diff --git a/docker-compose/common/compose-include/mimir.yaml b/docker-compose/common/compose-include/mimir.yaml index f7946ddf..f7ef800b 100644 --- a/docker-compose/common/compose-include/mimir.yaml +++ b/docker-compose/common/compose-include/mimir.yaml @@ -32,8 +32,6 @@ services: - ../../../monitoring-mixins/crontab:/etc/crontabs/root - ../../../monitoring-mixins/alloy-mixin/deploy/alloy-mixin-alerts.yaml:/rules/alloy-mixin-alerts.yaml - ../../../monitoring-mixins/memcached-mixin/deploy/memcached-mixin-alerts.yaml:/rules/memcached-mixin-alerts.yaml - - ../../../monitoring-mixins/mimir-mixin/deploy/mimir-mixin-rules.yaml:/rules/mimir-mixin-rules.yaml - - ../../../monitoring-mixins/mimir-mixin/deploy/mimir-mixin-alerts.yaml:/rules/mimir-mixin-alerts.yaml environment: - MIMIR_ADDRESS=http://gateway:8080 - MIMIR_TENANT_ID=anonymous diff --git a/docker-compose/common/compose-include/tempo.yaml b/docker-compose/common/compose-include/tempo.yaml index d56df21d..95774c35 100644 --- a/docker-compose/common/compose-include/tempo.yaml +++ b/docker-compose/common/compose-include/tempo.yaml @@ -16,7 +16,6 @@ services: interval: 2s timeout: 1s retries: 15 - # start_period: 10s # expose 33200 port so we can directly access tempo inside container ports: - "33200:3200" diff --git a/docker-compose/common/config/alloy/all-in-one.alloy b/docker-compose/common/config/alloy/all-in-one.alloy index a139171a..eb310e32 100644 --- a/docker-compose/common/config/alloy/all-in-one.alloy +++ b/docker-compose/common/config/alloy/all-in-one.alloy @@ -11,7 +11,7 @@ import.file "provider" { } // get self hosted receivers provider -provider.self_hosted "compose" { +provider.self_hosted_stack "compose" { logs_endpoint_url = "http://gateway:3100/loki/api/v1/push" metrics_endpoint_url = "http://gateway:8080/api/v1/push" traces_endpoint_url = "http://gateway:4318" @@ -27,17 +27,17 @@ import.file "metrics" { metrics.labels_scrape "all" { label_prefix = "metrics.grafana.com" - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } metrics.jobs_scrape "all" { - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } metrics.integrations_scrape "all" { - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } @@ -55,7 +55,7 @@ logs.labels_scrape "all" { // logs Processing And Transformation logs.keep_labels "default" { - forward_to = [provider.self_hosted.compose.logs_receiver] + forward_to = [provider.self_hosted_stack.compose.logs_receiver] } /******************************************** @@ -67,9 +67,9 @@ import.file "traces" { // traces Processing And Transformation traces.pat "all" { - metrics_forward_to = [provider.self_hosted.compose.metrics_receiver] - logs_forward_to = [provider.self_hosted.compose.logs_receiver] - traces_forward_to = [provider.self_hosted.compose.traces_receiver] + metrics_forward_to = [provider.self_hosted_stack.compose.metrics_receiver] + logs_forward_to = [provider.self_hosted_stack.compose.logs_receiver] + traces_forward_to = [provider.self_hosted_stack.compose.traces_receiver] } tracing { @@ -89,5 +89,5 @@ import.file "profiles" { profiles.labels_scrape "all" { label_prefix = "profiles.grafana.com" - forward_to = [provider.self_hosted.compose.profiles_receiver] + forward_to = [provider.self_hosted_stack.compose.profiles_receiver] } diff --git a/docker-compose/common/config/alloy/logs.alloy b/docker-compose/common/config/alloy/logs.alloy index 70180b88..015f930d 100644 --- a/docker-compose/common/config/alloy/logs.alloy +++ b/docker-compose/common/config/alloy/logs.alloy @@ -11,7 +11,7 @@ import.file "provider" { } // get lgtmp receivers provider -provider.self_hosted "compose" { +provider.self_hosted_stack "compose" { logs_endpoint_url = "http://gateway:3100/loki/api/v1/push" metrics_endpoint_url = "http://gateway:8080/api/v1/push" } @@ -30,7 +30,7 @@ logs.labels_scrape "all" { // logs Processing And Transformation logs.keep_labels "default" { - forward_to = [provider.self_hosted.compose.logs_receiver] + forward_to = [provider.self_hosted_stack.compose.logs_receiver] } /******************************************** @@ -42,16 +42,16 @@ import.file "metrics" { metrics.labels_scrape "all" { label_prefix = "metrics.grafana.com" - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } metrics.jobs_scrape "all" { - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } metrics.integrations_scrape "all" { - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } diff --git a/docker-compose/common/config/alloy/metrics.alloy b/docker-compose/common/config/alloy/metrics.alloy index 9da1e0bf..13c640db 100644 --- a/docker-compose/common/config/alloy/metrics.alloy +++ b/docker-compose/common/config/alloy/metrics.alloy @@ -11,7 +11,7 @@ import.file "provider" { } // get lgtmp receivers provider -provider.self_hosted "compose" { +provider.self_hosted_stack "compose" { metrics_endpoint_url = "http://gateway:8080/api/v1/push" } @@ -24,16 +24,16 @@ import.file "metrics" { metrics.labels_scrape "all" { label_prefix = "metrics.grafana.com" - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } metrics.jobs_scrape "all" { - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } metrics.integrations_scrape "all" { - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } diff --git a/docker-compose/common/config/alloy/modules/provider/README.md b/docker-compose/common/config/alloy/modules/provider/README.md index b7d697fb..18dabd01 100644 --- a/docker-compose/common/config/alloy/modules/provider/README.md +++ b/docker-compose/common/config/alloy/modules/provider/README.md @@ -4,10 +4,10 @@ Provide the receivers of the collected data(`logs` `metrics` `traces` `profiles` ## Components -- [self_hosted](#self_hosted) +- [self_hosted_stack](#self_hosted_stack) - [grafana_cloud](#grafana_cloud) -### `self_hosted` +### `self_hosted_stack` Module to configure receivers for Self Hosted LGTMP Stack. @@ -40,12 +40,12 @@ import.git "provider" { } // get the receivers from provider -provider.self_hosted "compose" { +provider.self_hosted_stack "compose" { metrics_endpoint_url = "http://mimir:8080/api/v1/push" } // get the receivers from provider -provider.self_hosted "kubernetes" { +provider.self_hosted_stack "kubernetes" { metrics_endpoint_url = "http://mimir.monitoring-system.svc.cluster.local:8080/api/v1/push" } @@ -56,8 +56,8 @@ prometheus.scrape "default" { ] forward_to = [ - provider.self_hosted.compose.metrics_receiver, - provider.self_hosted.kubernetes.metrics_receiver, + provider.self_hosted_stack.compose.metrics_receiver, + provider.self_hosted_stack.kubernetes.metrics_receiver, ] } ``` diff --git a/docker-compose/common/config/alloy/modules/provider/self_hosted.alloy b/docker-compose/common/config/alloy/modules/provider/self_hosted.alloy index 6b0f5cde..03b8cc7a 100644 --- a/docker-compose/common/config/alloy/modules/provider/self_hosted.alloy +++ b/docker-compose/common/config/alloy/modules/provider/self_hosted.alloy @@ -1,9 +1,9 @@ /************************************************ -* Component: self_hosted +* Component: self_hosted_stack * Description: Self Hosteded Receiver Provider *************************************************/ -declare "self_hosted" { +declare "self_hosted_stack" { /******************************************** * ARGUMENTS diff --git a/docker-compose/common/config/alloy/profiles.alloy b/docker-compose/common/config/alloy/profiles.alloy index 9788b28e..047596b0 100644 --- a/docker-compose/common/config/alloy/profiles.alloy +++ b/docker-compose/common/config/alloy/profiles.alloy @@ -11,7 +11,7 @@ import.file "provider" { } // get lgtmp receivers provider -provider.self_hosted "compose" { +provider.self_hosted_stack "compose" { metrics_endpoint_url = "http://gateway:8080/api/v1/push" profiles_endpoint_url = "http://gateway:4040" } @@ -25,7 +25,7 @@ import.file "profiles" { profiles.labels_scrape "all" { label_prefix = "profiles.grafana.com" - forward_to = [provider.self_hosted.compose.profiles_receiver] + forward_to = [provider.self_hosted_stack.compose.profiles_receiver] } /******************************************** @@ -37,16 +37,16 @@ import.file "metrics" { metrics.labels_scrape "all" { label_prefix = "metrics.grafana.com" - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } metrics.jobs_scrape "all" { - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } metrics.integrations_scrape "all" { - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } diff --git a/docker-compose/common/config/alloy/traces.alloy b/docker-compose/common/config/alloy/traces.alloy index 58016919..e544509f 100644 --- a/docker-compose/common/config/alloy/traces.alloy +++ b/docker-compose/common/config/alloy/traces.alloy @@ -11,7 +11,7 @@ import.file "provider" { } // get lgtmp receivers provider -provider.self_hosted "compose" { +provider.self_hosted_stack "compose" { logs_endpoint_url = "http://gateway:3100/loki/api/v1/push" metrics_endpoint_url = "http://gateway:8080/api/v1/push" traces_endpoint_url = "http://gateway:4318" @@ -26,9 +26,9 @@ import.file "traces" { // traces Processing And Transformation traces.pat "all" { - metrics_forward_to = [provider.self_hosted.compose.metrics_receiver] - logs_forward_to = [provider.self_hosted.compose.logs_receiver] - traces_forward_to = [provider.self_hosted.compose.traces_receiver] + metrics_forward_to = [provider.self_hosted_stack.compose.metrics_receiver] + logs_forward_to = [provider.self_hosted_stack.compose.logs_receiver] + traces_forward_to = [provider.self_hosted_stack.compose.traces_receiver] } tracing { @@ -48,16 +48,16 @@ import.file "metrics" { metrics.labels_scrape "all" { label_prefix = "metrics.grafana.com" - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } metrics.jobs_scrape "all" { - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } metrics.integrations_scrape "all" { - forward_to = [provider.self_hosted.compose.metrics_receiver] + forward_to = [provider.self_hosted_stack.compose.metrics_receiver] scrape_interval = "15s" } diff --git a/docker-compose/microservices-mode/logs/README.md b/docker-compose/microservices-mode/logs/README.md index 4d6b0b1f..1923d421 100644 --- a/docker-compose/microservices-mode/logs/README.md +++ b/docker-compose/microservices-mode/logs/README.md @@ -27,8 +27,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/docker-compose/microservices-mode/logs/compose.yaml b/docker-compose/microservices-mode/logs/compose.yaml index 362f422f..0f174c99 100644 --- a/docker-compose/microservices-mode/logs/compose.yaml +++ b/docker-compose/microservices-mode/logs/compose.yaml @@ -21,7 +21,7 @@ x-labels: &loki-labels # Configure a check that's run to determine whether or not containers for this service are "healthy". # docs: https://docs.docker.com/compose/compose-file/compose-file-v3/#healthcheck x-healthcheck: &status-healthcheck - interval: 3s + interval: 5s timeout: 2s retries: 10 diff --git a/docker-compose/microservices-mode/metrics/README.md b/docker-compose/microservices-mode/metrics/README.md index 8a39f721..1a1efd83 100644 --- a/docker-compose/microservices-mode/metrics/README.md +++ b/docker-compose/microservices-mode/metrics/README.md @@ -33,8 +33,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/docker-compose/microservices-mode/metrics/compose.yaml b/docker-compose/microservices-mode/metrics/compose.yaml index 63f97103..161735d4 100644 --- a/docker-compose/microservices-mode/metrics/compose.yaml +++ b/docker-compose/microservices-mode/metrics/compose.yaml @@ -15,7 +15,7 @@ include: # Configure a check that's run to determine whether or not containers for this service are "healthy". # docs: https://docs.docker.com/compose/compose-file/compose-file-v3/#healthcheck x-healthcheck: &status-healthcheck - interval: 3s + interval: 5s timeout: 2s retries: 10 diff --git a/docker-compose/microservices-mode/profiles/README.md b/docker-compose/microservices-mode/profiles/README.md index 3a550acd..57982cf3 100644 --- a/docker-compose/microservices-mode/profiles/README.md +++ b/docker-compose/microservices-mode/profiles/README.md @@ -17,8 +17,8 @@ flowchart LR M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/docker-compose/microservices-mode/profiles/compose.yaml b/docker-compose/microservices-mode/profiles/compose.yaml index 1876b2a0..75e936ff 100644 --- a/docker-compose/microservices-mode/profiles/compose.yaml +++ b/docker-compose/microservices-mode/profiles/compose.yaml @@ -23,7 +23,7 @@ x-labels: &profiles-labels # Configure a check that's run to determine whether or not containers for this service are "healthy". # docs: https://docs.docker.com/compose/compose-file/compose-file-v3/#healthcheck x-healthcheck: &status-healthcheck - interval: 3s + interval: 5s timeout: 2s retries: 10 diff --git a/docker-compose/microservices-mode/traces/README.md b/docker-compose/microservices-mode/traces/README.md index 5c75f7ab..4bf1575e 100644 --- a/docker-compose/microservices-mode/traces/README.md +++ b/docker-compose/microservices-mode/traces/README.md @@ -14,8 +14,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/docker-compose/microservices-mode/traces/compose.yaml b/docker-compose/microservices-mode/traces/compose.yaml index c39634b9..63844084 100644 --- a/docker-compose/microservices-mode/traces/compose.yaml +++ b/docker-compose/microservices-mode/traces/compose.yaml @@ -24,7 +24,7 @@ x-environment: &jaeger-environment # Configure a check that's run to determine whether or not containers for this service are "healthy". # docs: https://docs.docker.com/compose/compose-file/compose-file-v3/#healthcheck x-healthcheck: &status-healthcheck - interval: 3s + interval: 5s timeout: 2s retries: 10 @@ -74,7 +74,6 @@ services: healthcheck: test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3200/ready || exit 1" ] <<: *status-healthcheck - start_period: 10s ingester: depends_on: { minio: { condition: service_healthy } } @@ -91,7 +90,6 @@ services: healthcheck: test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3200/ready || exit 1" ] <<: *status-healthcheck - start_period: 10s deploy: replicas: 3 networks: diff --git a/docker-compose/monolithic-mode/all-in-one/compose.yaml b/docker-compose/monolithic-mode/all-in-one/compose.yaml index 84a6b74e..814e050d 100644 --- a/docker-compose/monolithic-mode/all-in-one/compose.yaml +++ b/docker-compose/monolithic-mode/all-in-one/compose.yaml @@ -28,9 +28,9 @@ x-environment: &jaeger-environment # Configure a check that's run to determine whether or not containers for this service are "healthy". # docs: https://docs.docker.com/compose/compose-file/compose-file-v3/#healthcheck x-healthcheck: &status-healthcheck - interval: 2s - timeout: 1s - retries: 15 + interval: 3s + timeout: 2s + retries: 10 configs: alloy_config_file: @@ -144,8 +144,6 @@ services: - ../../../monitoring-mixins/crontab:/etc/crontabs/root - ../../../monitoring-mixins/alloy-mixin/deploy/alloy-mixin-alerts.yaml:/rules/alloy-mixin-alerts.yaml - ../../../monitoring-mixins/memcached-mixin/deploy/memcached-mixin-alerts.yaml:/rules/memcached-mixin-alerts.yaml - - ../../../monitoring-mixins/mimir-mixin/deploy/mimir-mixin-rules.yaml:/rules/mimir-mixin-rules.yaml - - ../../../monitoring-mixins/mimir-mixin/deploy/mimir-mixin-alerts.yaml:/rules/mimir-mixin-alerts.yaml environment: - MIMIR_ADDRESS=http://gateway:8080 - MIMIR_TENANT_ID=anonymous diff --git a/docker-compose/monolithic-mode/logs/README.md b/docker-compose/monolithic-mode/logs/README.md index d6e7bfd9..81633d71 100644 --- a/docker-compose/monolithic-mode/logs/README.md +++ b/docker-compose/monolithic-mode/logs/README.md @@ -12,8 +12,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") @@ -50,8 +50,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/docker-compose/monolithic-mode/metrics/README.md b/docker-compose/monolithic-mode/metrics/README.md index 07898c8d..4eaf0815 100644 --- a/docker-compose/monolithic-mode/metrics/README.md +++ b/docker-compose/monolithic-mode/metrics/README.md @@ -14,8 +14,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") @@ -54,8 +54,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/docker-compose/monolithic-mode/profiles/README.md b/docker-compose/monolithic-mode/profiles/README.md index cb1da635..98443ea8 100644 --- a/docker-compose/monolithic-mode/profiles/README.md +++ b/docker-compose/monolithic-mode/profiles/README.md @@ -12,8 +12,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/docker-compose/monolithic-mode/traces/README.md b/docker-compose/monolithic-mode/traces/README.md index 1adf4e37..b65ec89b 100644 --- a/docker-compose/monolithic-mode/traces/README.md +++ b/docker-compose/monolithic-mode/traces/README.md @@ -12,8 +12,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") @@ -53,8 +53,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/docker-compose/read-write-mode/logs/README.md b/docker-compose/read-write-mode/logs/README.md index b03a4654..a2e8c7b1 100644 --- a/docker-compose/read-write-mode/logs/README.md +++ b/docker-compose/read-write-mode/logs/README.md @@ -27,8 +27,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/docker-compose/read-write-mode/logs/compose.yaml b/docker-compose/read-write-mode/logs/compose.yaml index 7bb47b79..a866320b 100644 --- a/docker-compose/read-write-mode/logs/compose.yaml +++ b/docker-compose/read-write-mode/logs/compose.yaml @@ -17,7 +17,7 @@ include: # Configure a check that's run to determine whether or not containers for this service are "healthy". # docs: https://docs.docker.com/compose/compose-file/compose-file-v3/#healthcheck x-healthcheck: &status-healthcheck - interval: 3s + interval: 5s timeout: 2s retries: 10 diff --git a/docker-compose/read-write-mode/metrics/README.md b/docker-compose/read-write-mode/metrics/README.md index 898e5117..65ab887e 100644 --- a/docker-compose/read-write-mode/metrics/README.md +++ b/docker-compose/read-write-mode/metrics/README.md @@ -32,8 +32,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/docker-compose/read-write-mode/metrics/compose.yaml b/docker-compose/read-write-mode/metrics/compose.yaml index 11441aa6..81c90354 100644 --- a/docker-compose/read-write-mode/metrics/compose.yaml +++ b/docker-compose/read-write-mode/metrics/compose.yaml @@ -15,7 +15,7 @@ include: # Configure a check that's run to determine whether or not containers for this service are "healthy". # docs: https://docs.docker.com/compose/compose-file/compose-file-v3/#healthcheck x-healthcheck: &status-healthcheck - interval: 3s + interval: 5s timeout: 2s retries: 10 diff --git a/examples/ghe-with-mixin/compose.yaml b/examples/ghe-with-mixin/compose.yaml index fa8f0d35..e1fb7e4c 100644 --- a/examples/ghe-with-mixin/compose.yaml +++ b/examples/ghe-with-mixin/compose.yaml @@ -10,9 +10,14 @@ # 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: -# use git remote -- path: https://github.com/qclaogui/codelab-monitoring.git#main:docker-compose/monolithic-mode/logs/compose.yaml -# use local path +# # use git remote +# - 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 + +# # use local path # - path: ../../docker-compose/monolithic-mode/logs/compose.yaml services: diff --git a/examples/ghe-with-simple-dashboards/compose.yaml b/examples/ghe-with-simple-dashboards/compose.yaml index fa8f0d35..e1fb7e4c 100644 --- a/examples/ghe-with-simple-dashboards/compose.yaml +++ b/examples/ghe-with-simple-dashboards/compose.yaml @@ -10,9 +10,14 @@ # 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: -# use git remote -- path: https://github.com/qclaogui/codelab-monitoring.git#main:docker-compose/monolithic-mode/logs/compose.yaml -# use local path +# # use git remote +# - 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 + +# # use local path # - path: ../../docker-compose/monolithic-mode/logs/compose.yaml services: diff --git a/examples/github-exporter/compose.yaml b/examples/github-exporter/compose.yaml index cf69c690..2015b608 100644 --- a/examples/github-exporter/compose.yaml +++ b/examples/github-exporter/compose.yaml @@ -10,15 +10,15 @@ # 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: -# use git remote +# # use git remote # - 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/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 -# use local path -- path: ../../docker-compose/monolithic-mode/logs/compose.yaml +# # use local path +# - 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 diff --git a/examples/grafana-oncall/compose.yaml b/examples/grafana-oncall/compose.yaml index 67e31783..a7a491ed 100644 --- a/examples/grafana-oncall/compose.yaml +++ b/examples/grafana-oncall/compose.yaml @@ -10,9 +10,14 @@ # 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: -# use git remote -- path: https://github.com/qclaogui/codelab-monitoring.git#main:docker-compose/monolithic-mode/logs/compose.yaml -# use local path +# # use git remote +# - 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 + +# # use local path # - path: ../../docker-compose/monolithic-mode/logs/compose.yaml x-environment: &oncall-environment diff --git a/kubernetes/microservices-mode/logs/README.md b/kubernetes/microservices-mode/logs/README.md index c1e0cd61..bc46de0c 100644 --- a/kubernetes/microservices-mode/logs/README.md +++ b/kubernetes/microservices-mode/logs/README.md @@ -28,8 +28,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/kubernetes/microservices-mode/metrics/README.md b/kubernetes/microservices-mode/metrics/README.md index 9a810bd7..7e98e074 100644 --- a/kubernetes/microservices-mode/metrics/README.md +++ b/kubernetes/microservices-mode/metrics/README.md @@ -33,8 +33,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/kubernetes/microservices-mode/profiles/README.md b/kubernetes/microservices-mode/profiles/README.md index ded23652..48e981d6 100644 --- a/kubernetes/microservices-mode/profiles/README.md +++ b/kubernetes/microservices-mode/profiles/README.md @@ -17,8 +17,8 @@ flowchart LR M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/kubernetes/microservices-mode/traces/README.md b/kubernetes/microservices-mode/traces/README.md index 73d56074..f75a1182 100644 --- a/kubernetes/microservices-mode/traces/README.md +++ b/kubernetes/microservices-mode/traces/README.md @@ -14,8 +14,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/kubernetes/monolithic-mode/logs/README.md b/kubernetes/monolithic-mode/logs/README.md index 3d4cbe3e..6f567f3a 100644 --- a/kubernetes/monolithic-mode/logs/README.md +++ b/kubernetes/monolithic-mode/logs/README.md @@ -12,8 +12,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") @@ -50,8 +50,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/kubernetes/monolithic-mode/metrics/README.md b/kubernetes/monolithic-mode/metrics/README.md index 276d68af..6606179f 100644 --- a/kubernetes/monolithic-mode/metrics/README.md +++ b/kubernetes/monolithic-mode/metrics/README.md @@ -14,8 +14,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") @@ -54,8 +54,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/kubernetes/monolithic-mode/profiles/README.md b/kubernetes/monolithic-mode/profiles/README.md index dbb1cb46..dcd6429a 100644 --- a/kubernetes/monolithic-mode/profiles/README.md +++ b/kubernetes/monolithic-mode/profiles/README.md @@ -12,8 +12,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/kubernetes/monolithic-mode/traces/README.md b/kubernetes/monolithic-mode/traces/README.md index 33b7eee0..dfa305d4 100644 --- a/kubernetes/monolithic-mode/traces/README.md +++ b/kubernetes/monolithic-mode/traces/README.md @@ -12,8 +12,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") @@ -53,8 +53,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/kubernetes/read-write-mode/logs/README.md b/kubernetes/read-write-mode/logs/README.md index 6918e9ec..dc789285 100644 --- a/kubernetes/read-write-mode/logs/README.md +++ b/kubernetes/read-write-mode/logs/README.md @@ -27,8 +27,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana") diff --git a/kubernetes/read-write-mode/metrics/README.md b/kubernetes/read-write-mode/metrics/README.md index 74332142..659b2b21 100644 --- a/kubernetes/read-write-mode/metrics/README.md +++ b/kubernetes/read-write-mode/metrics/README.md @@ -32,8 +32,8 @@ flowchart LR subgraph Minio M{"Object Storage"} end - subgraph Agent["Grafana Agent"] - A("agent") + subgraph Agent["Grafana Alloy"] + A("alloy") end subgraph Grafana G("grafana")