Skip to content

Fix Faro configuration on docker composes #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ppcano merged 1 commit into from
Sep 29, 2025
Merged

Fix Faro configuration on docker composes #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions compose.grafana-cloud.microservices.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
image: grafana/alloy:v1.9.1@sha256:b5fc87ff9a8941d6ed3ae5f099d9cb8598b3cd42fef9a8af128ed782258b4017
container_name: alloy
labels:
- "service.type=instrumentation"
- "service.type=instrumentation"
volumes:
- "./alloy/${ALLOY_FILE_NAME:-cloud.alloy}:/config.alloy:Z"
- "${DOCKER_SOCKET:-/var/run/docker.sock}:/var/run/docker.sock"
Expand All @@ -33,9 +33,6 @@ services:
# set only when ALLOY_FILE_NAME=cloud.otlp.alloy
GRAFANA_CLOUD_OTLP_ENDPOINT: "${GRAFANA_CLOUD_OTLP_ENDPOINT:-}"
GRAFANA_CLOUD_INSTANCE_ID: "${GRAFANA_CLOUD_INSTANCE_ID:-}"
# enable Faro integration
QUICKPIZZA_CONF_FARO_URL: "${QUICKPIZZA_CONF_FARO_URL:-}"
QUICKPIZZA_CONF_FARO_APP_NAME: "${QUICKPIZZA_CONF_FARO_APP_NAME:-}"
depends_on:
- catalog
- config
Expand All @@ -48,7 +45,7 @@ services:
image: ${QUICKPIZZA_IMAGE:-ghcr.io/grafana/quickpizza-local:latest@sha256:9067de15119819a3ef17676b3245279937d9d9ef50e81a2ba0a8a30095d7bfce}
container_name: catalog
labels:
- "service.type=application"
- "service.type=application"
environment:
<<: *quickpizza-env-common
QUICKPIZZA_ENABLE_CATALOG_SERVICE: "1"
Expand All @@ -59,17 +56,20 @@ services:
image: ${QUICKPIZZA_IMAGE:-ghcr.io/grafana/quickpizza-local:latest@sha256:9067de15119819a3ef17676b3245279937d9d9ef50e81a2ba0a8a30095d7bfce}
container_name: config
labels:
- "service.type=application"
- "service.type=application"
environment:
<<: *quickpizza-env-common
QUICKPIZZA_ENABLE_CONFIG_SERVICE: "1"
QUICKPIZZA_OTEL_SERVICE_INSTANCE_ID: "config"
QUICKPIZZA_OTEL_SERVICE_NAME: "config"
# enable Faro integration
QUICKPIZZA_CONF_FARO_URL: "${QUICKPIZZA_CONF_FARO_URL:-}"
QUICKPIZZA_CONF_FARO_APP_NAME: "${QUICKPIZZA_CONF_FARO_APP_NAME:-}"
copy:
image: ${QUICKPIZZA_IMAGE:-ghcr.io/grafana/quickpizza-local:latest@sha256:9067de15119819a3ef17676b3245279937d9d9ef50e81a2ba0a8a30095d7bfce}
container_name: copy
labels:
- "service.type=application"
- "service.type=application"
environment:
<<: *quickpizza-env-common
QUICKPIZZA_ENABLE_COPY_SERVICE: "1"
Expand All @@ -80,7 +80,7 @@ services:
image: ${QUICKPIZZA_IMAGE:-ghcr.io/grafana/quickpizza-local:latest@sha256:9067de15119819a3ef17676b3245279937d9d9ef50e81a2ba0a8a30095d7bfce}
container_name: public-api
labels:
- "service.type=application"
- "service.type=application"
ports:
- "3333:3333"
environment:
Expand All @@ -93,7 +93,7 @@ services:
image: ${QUICKPIZZA_IMAGE:-ghcr.io/grafana/quickpizza-local:latest@sha256:9067de15119819a3ef17676b3245279937d9d9ef50e81a2ba0a8a30095d7bfce}
container_name: recommendations
labels:
- "service.type=application"
- "service.type=application"
environment:
<<: *quickpizza-env-common
QUICKPIZZA_ENABLE_RECOMMENDATIONS_SERVICE: "1"
Expand All @@ -104,10 +104,9 @@ services:
image: ${QUICKPIZZA_IMAGE:-ghcr.io/grafana/quickpizza-local:latest@sha256:9067de15119819a3ef17676b3245279937d9d9ef50e81a2ba0a8a30095d7bfce}
container_name: ws
labels:
- "service.type=application"
- "service.type=application"
environment:
<<: *quickpizza-env-common
QUICKPIZZA_ENABLE_WS_SERVICE: "1"
QUICKPIZZA_OTEL_SERVICE_INSTANCE_ID: "ws"
QUICKPIZZA_OTEL_SERVICE_NAME: "ws"

15 changes: 7 additions & 8 deletions compose.grafana-cloud.monolithic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
image: grafana/alloy:v1.9.1@sha256:b5fc87ff9a8941d6ed3ae5f099d9cb8598b3cd42fef9a8af128ed782258b4017
container_name: alloy
labels:
- "service.type=instrumentation"
- "service.type=instrumentation"
volumes:
- "./alloy/${ALLOY_FILE_NAME:-cloud.alloy}:/config.alloy:Z"
- "${DOCKER_SOCKET:-/var/run/docker.sock}:/var/run/docker.sock"
Expand All @@ -22,19 +22,16 @@ services:
# set only when ALLOY_FILE_NAME=cloud.otlp.alloy
GRAFANA_CLOUD_OTLP_ENDPOINT: "${GRAFANA_CLOUD_OTLP_ENDPOINT:-}"
GRAFANA_CLOUD_INSTANCE_ID: "${GRAFANA_CLOUD_INSTANCE_ID:-}"
# enable Faro integration
QUICKPIZZA_CONF_FARO_URL: "${QUICKPIZZA_CONF_FARO_URL:-}"
QUICKPIZZA_CONF_FARO_APP_NAME: "${QUICKPIZZA_CONF_FARO_APP_NAME:-}"
depends_on:
- quickpizza
quickpizza:
# The QUICKPIZZA_IMAGE env. variable enables the use of a locally built image,
# created with `make docker-build`.
image: ${QUICKPIZZA_IMAGE:-ghcr.io/grafana/quickpizza-local:latest@sha256:9067de15119819a3ef17676b3245279937d9d9ef50e81a2ba0a8a30095d7bfce}
# Alloy reads `container_name` to relabel service name in telemetry.
container_name: quickpizza
# Alloy reads `container_name` to relabel service name in telemetry.
container_name: quickpizza
labels:
- "service.type=application"
- "service.type=application"
ports:
- "3333:3333"
environment:
Expand All @@ -43,4 +40,6 @@ services:
QUICKPIZZA_ENABLE_ALL_SERVICES: 1 # 1 for monolithic mode
QUICKPIZZA_OTEL_SERVICE_INSTANCE_ID: "quickpizza"
QUICKPIZZA_OTEL_SERVICE_NAME: "quickpizza"

# enable Faro integration
QUICKPIZZA_CONF_FARO_URL: "${QUICKPIZZA_CONF_FARO_URL:-}"
QUICKPIZZA_CONF_FARO_APP_NAME: "${QUICKPIZZA_CONF_FARO_APP_NAME:-}"