Skip to content

fix(concourse): ship worker journald units to Loki #6414

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ardiea wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(concourse): ship worker journald units to Loki #6414

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
7 changes: 4 additions & 3 deletions src/bilder/images/concourse/deploy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,10 @@
consul_configuration = {Path("00-default.json"): ConsulConfig()}

vector_config = VectorConfig()
# Both node types: workers carry the spot/lifecycle/preflight helper units.
vector_config.configuration_templates[
TEMPLATES_DIRECTORY.joinpath("vector", "concourse_logs.yaml")
] = {}


if concourse_config._node_type == CONCOURSE_WEB_NODE_TYPE: # noqa: SLF001
Expand Down Expand Up @@ -351,9 +355,6 @@
traefik_config_changed = configure_traefik(traefik_config)

# Add vector configurations specific to concourse web nodes
vector_config.configuration_templates[
TEMPLATES_DIRECTORY.joinpath("vector", "concourse_logs.yaml")
] = {}
vector_config.configuration_templates[
TEMPLATES_DIRECTORY.joinpath("vector", "concourse_metrics.yaml")
] = {"concourse_prometheus_port": concourse_config.prometheus_bind_port}
Expand Down
7 changes: 5 additions & 2 deletions src/bilder/images/concourse/templates/vector/concourse_logs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@ transforms:
if event != null {
.,err = merge(., event)
.@timestamp = .timestamp
.labels = ["concourse", "${ENVIRONMENT}"]
.environment = "${ENVIRONMENT}"
}
.labels = ["concourse", "${ENVIRONMENT}"]
.environment = "${ENVIRONMENT}"
# concourse-web or concourse-worker; the sink's application label is
# shared by both node types.
.node_application = "${APPLICATION}"

drop_unwanted_logs:
type: remap
Expand Down
Loading