Repository navigation
(withdrawn) - #22384
(withdrawn)#22384robertziel wants to merge 1 commit into
Conversation
…edentials from .env Every deployment-specific value in docker-compose.yml now comes from .env (documented in .env.example) and is required: docker compose fails with 'set <VAR> in .env' instead of silently using a default. - STACK_BIND_IP, ES_PORT, KIBANA_PORT: host bind address and ports - ES_HEAP, ES_LOG_LEVEL - KIBANA_ES_USER/PASS; METRICBEAT_ES_USER/PASS (previously Metricbeat reused KIBANA_ES_USER with a different default) - make system-test loads .env so the tests use the same ports - CI and testing/stack-monitoring.sh create/load .env
|
❌ Author of the following commits did not sign a Contributor Agreement: Please, read and sign the above mentioned agreement if you want to contribute to this project |
🤖 GitHub commentsJust comment with:
|
|
This pull request does not have a backport label. Could you fix it @robertziel? 🙏
|
There was a problem hiding this comment.
🟡 Changes recommended
The .env loaders reject valid Compose syntax and overwrite exported overrides, causing port mismatches, test failures, or aborted monitoring setup.
2 open issues
What changed in this PR
Moves deployment-specific Docker Compose settings into required environment variables, with a documented .env.example, while keeping image tags literal for existing tooling.
Changes:
- Makes bind address, ports, heap size, log level, and service credentials configurable.
- Loads
.envin system-test and monitoring entry points, and creates it in CI. - Documents setup and excludes the local
.envfrom version control.
| File | Description |
|---|---|
testing/stack-monitoring.sh |
Loads .env and uses the configured Kibana port. |
Makefile |
Requires and loads .env for system tests. |
docker-compose.yml |
Replaces hardcoded settings and defaults with required variables. |
dev_docs/TESTING.md |
Documents environment setup and system-test commands. |
.gitignore |
Ignores the root .env file. |
.github/workflows/ci.yml |
Copies example settings before starting CI stacks. |
.env.example |
Documents required settings and provides starter values. |
Review effort: Balanced
| # CGO is disabled when building APM Server binary, so the race detector in this case | ||
| # would only work on the parts that don't involve APM Server binary. | ||
| @(cd systemtest; go test $(GOMODFLAG) $(GOTESTFLAGS) -tags=$(DEFAULT_TAGS),$(GOTAGS) -race -timeout=20m ./...) | ||
| @(set -a && . ./.env && set +a && cd systemtest && go test $(GOMODFLAG) $(GOTESTFLAGS) -tags=$(DEFAULT_TAGS),$(GOTAGS) -race -timeout=20m ./...) |
| # CGO is disabled when building APM Server binary, so the race detector in this case | ||
| # would only work on the parts that don't involve APM Server binary. | ||
| @(cd systemtest; go test $(GOMODFLAG) $(GOTESTFLAGS) -tags=$(DEFAULT_TAGS),$(GOTAGS) -race -timeout=20m ./...) | ||
| @(set -a && . ./.env && set +a && cd systemtest && go test $(GOMODFLAG) $(GOTESTFLAGS) -tags=$(DEFAULT_TAGS),$(GOTAGS) -race -timeout=20m ./...) |

Opened by mistake, withdrawn.