code clean

Signed-off-by: Weifeng Wang <[email protected]>

Imrpove Alloy integrations

Signed-off-by: Weifeng Wang <[email protected]>

go mod tidy

Update README.md

Author: qclaogui

README.md

@@ -7,6 +7,9 @@
 
 A simple command to run Grafana LGTMP Stack in Docker or Kubernetes.
 
+> **NOTE**:
+> This project is not intended for production use and is maintained on a best-effort basis.
+
 ## Usage
 
 An simple use case `compose.yaml` like so:
@@ -110,7 +113,7 @@ The easiest way to run project locally is to use docker compose, these instructi
 
 ***Prerequisites:*** Make sure that you have Docker and Docker Compose installed
 
-> Note:
+> **NOTE**:
 > `include` is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later.
 
 ### [Monolithic mode (单体模式)](./docker-compose/monolithic-mode)

compose.override.yaml

@@ -16,9 +16,9 @@ services:
   loki:
     labels:
       <<: *profiles-labels
-      profiles.grafana.com/service_name: loki
+      logs.grafana.com/scrape: true
       metrics.grafana.com/scrape: true
-      logs.grafana.com/log-format: json
+      profiles.grafana.com/service_name: loki
     environment:
       <<: *jaeger-environment
       JAEGER_TAGS: app=loki
@@ -27,10 +27,10 @@ services:
   grafana:
     labels:
       <<: *profiles-labels
+      logs.grafana.com/scrape: true
+      metrics.grafana.com/scrape: true
       profiles.grafana.com/service_name: grafana
       profiles.grafana.com/port: 6060
-      metrics.grafana.com/scrape: true
-      logs.grafana.com/log-format: logfmt
     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
@@ -45,9 +45,9 @@ services:
   tempo:
     labels:
       <<: *profiles-labels
-      profiles.grafana.com/service_name: tempo
+      logs.grafana.com/scrape: true
       metrics.grafana.com/scrape: true
-      logs.grafana.com/log-format: logfmt
+      profiles.grafana.com/service_name: tempo
     depends_on: { minio: { condition: service_healthy }, mimir: { condition: service_healthy } }
     environment:
       <<: *jaeger-environment
@@ -57,8 +57,9 @@ services:
   mimir:
     labels:
       <<: *profiles-labels
+      logs.grafana.com/scrape: true
+      metrics.grafana.com/scrape: true
       profiles.grafana.com/service_name: mimir
-      logs.grafana.com/log-format: logfmt
     environment:
       <<: *jaeger-environment
       JAEGER_TAGS: app=mimir
@@ -75,8 +76,9 @@ services:
   # override compose.yaml included service pyroscope's labels and environment to enabled traces data collection
   pyroscope:
     labels:
+      logs.grafana.com/scrape: true
       metrics.grafana.com/scrape: true
-      logs.grafana.com/log-format: logfmt
+      profiles.grafana.com/service_name: pyroscope
     environment:
       <<: *jaeger-environment
       JAEGER_TAGS: app=pyroscope

compose.yaml

@@ -52,6 +52,6 @@ services:
       - ./docker-compose/common/config/pyroscope/gateway_pyroscope.conf:/etc/nginx/templates/gateway_pyroscope.conf.template
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8080/ || exit 1" ]
-      interval: 5s
-      timeout: 2s
-      retries: 10
+      interval: 3s
+      timeout: 1s
+      retries: 20

docker-compose/common/compose-include/alloy.yaml

@@ -1,7 +1,5 @@
 services:
   alloy:
-    labels:
-      logs.grafana.com/log-format: logfmt
     depends_on: { gateway: { condition: service_healthy } }
     image: ${ALLOY_IMAGE:-docker.io/grafana/alloy:v1.0.0}
     configs:

docker-compose/common/compose-include/grafana.yaml

@@ -20,7 +20,6 @@ services:
   grafana:
     labels:
       metrics.grafana.com/scrape: false
-      logs.grafana.com/log-format: logfmt
     image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:10.4.1}
     command:
       - --config=/etc/grafana-config/grafana.ini

docker-compose/common/compose-include/loki.yaml

@@ -2,7 +2,6 @@ services:
   loki:
     labels:
       metrics.grafana.com/scrape: false
-      logs.grafana.com/log-format: json
     depends_on: { minio: { condition: service_healthy } }
     image: ${LOKI_IMAGE:-docker.io/grafana/loki:3.0.0}
     volumes:
@@ -13,9 +12,9 @@ services:
       - -config.expand-env=true
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3100/ready || exit 1" ]
-      interval: 3s
-      timeout: 2s
-      retries: 10
+      interval: 2s
+      timeout: 1s
+      retries: 15
     # expose 33100 port so we can directly access loki inside container
     ports:
       - "33100:3100"

docker-compose/common/compose-include/mimir.yaml

@@ -1,6 +1,8 @@
 
 services:
   mimir:
+    labels:
+      metrics.grafana.com/scrape: false
     depends_on: { minio: { condition: service_healthy } }
     image: ${MIMIR_IMAGE:-docker.io/grafana/mimir:2.12.0}
     volumes:
@@ -11,9 +13,9 @@ services:
       - -config.expand-env=true
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8080/ready || exit 1" ]
-      interval: 3s
-      timeout: 2s
-      retries: 10
+      interval: 2s
+      timeout: 1s
+      retries: 15
     # expose 38080 port so we can directly access mimir inside container
     ports:
       - "38080:8080"

docker-compose/common/compose-include/minio.yaml

@@ -32,9 +32,9 @@ services:
       - minio_data:/data:delegated
     healthcheck:
       test: ["CMD-SHELL", "mc ready local"]
-      interval: 3s
-      timeout: 2s
-      retries: 10
+      interval: 2s
+      timeout: 1s
+      retries: 15
     ports:
       - "9001:9001"
 

docker-compose/common/compose-include/pyroscope.yaml

@@ -4,7 +4,6 @@ services:
       metrics.grafana.com/scrape: false
     depends_on: { minio: { condition: service_healthy } }
     image: ${PYROSCOPE_IMAGE:-docker.io/grafana/pyroscope:1.5.0}
-    container_name: pyroscope
     volumes:
       - ../config/pyroscope:/etc/pyroscope
       - pyroscope_data:/data
@@ -15,9 +14,9 @@ services:
       # - -runtime-config.file=/etc/pyroscope/overrides.yaml
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:4040/ready || exit 1" ]
-      interval: 3s
-      timeout: 2s
-      retries: 10
+      interval: 2s
+      timeout: 1s
+      retries: 15
     # expose 34040 port so we can directly access pyroscope inside container
     ports:
       - "34040:4040"

docker-compose/common/compose-include/tempo.yaml

@@ -13,10 +13,10 @@ services:
       - -config.expand-env=true
     healthcheck:
       test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3200/ready || exit 1" ]
-      interval: 3s
-      timeout: 2s
-      retries: 10
-      start_period: 10s
+      interval: 2s
+      timeout: 1s
+      retries: 15
+      # start_period: 10s
     # expose 33200 port so we can directly access tempo inside container
     ports:
       - "33200:3200"