diff --git a/.env.dist b/.env.dist index 4a0aa99..f88b826 100644 --- a/.env.dist +++ b/.env.dist @@ -26,7 +26,7 @@ REDISINSIGHT_PORT=8032 POSTGRES_PORT=5432 POSTGRES_PASSWORD=opencodeco -PGADMIN_PORT=8034 +PGADMIN_PORT=8039 PGADMIN_EMAIL="opencodeco@domain.com" PGADMIN_PASSWORD="opencodeco" diff --git a/.gitignore b/.gitignore index 4c49bd7..b1b2586 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .env +*/docker-compose.override.yml \ No newline at end of file diff --git a/o11y/otelcol-config.yml b/o11y/otelcol-config.yml index d59ad1d..c016797 100644 --- a/o11y/otelcol-config.yml +++ b/o11y/otelcol-config.yml @@ -12,7 +12,7 @@ receivers: http: exporters: - logging: + debug: verbosity: detailed prometheus: endpoint: 0.0.0.0:9090 @@ -28,7 +28,7 @@ service: pipelines: traces: receivers: [otlp, jaeger] - exporters: [logging, otlp/jaeger] + exporters: [debug, otlp/jaeger] metrics: receivers: [otlp, statsd] - exporters: [logging, prometheus] + exporters: [debug, prometheus] diff --git a/stack b/stack index 5d5d1ab..1ea08ad 100755 --- a/stack +++ b/stack @@ -105,4 +105,10 @@ if [ ! -f "${COMPONENT}/docker-compose.yml" ]; then fi CMD="${@:2}" -$CONTAINER_COMPOSE -f "${COMPONENT}/docker-compose.yml" ${CMD:-up -d} + +COMPOSE_FILES="-f ${COMPONENT}/docker-compose.yml" +if [ -f "${COMPONENT}/docker-compose.override.yml" ]; then + COMPOSE_FILES="${COMPOSE_FILES} -f ${COMPONENT}/docker-compose.override.yml" +fi + +$CONTAINER_COMPOSE $COMPOSE_FILES ${CMD:-up -d}