Skip to content

feat(collector): Add a preset for deploying the Supervisor+Collector custom image#217

Merged
povilasv merged 13 commits into
mainfrom
supervisor-preset
Jun 12, 2025
Merged

feat(collector): Add a preset for deploying the Supervisor+Collector custom image#217
povilasv merged 13 commits into
mainfrom
supervisor-preset

Conversation

@douglascamata

Copy link
Copy Markdown
Member

Description

This PRs adds the supervisor preset under the fleetManagement preset.

This preset enables the deployment of the Supervised Collector image from https://hub.docker.com/r/coralogixrepo/otel-supervised-collector.

Tests

  • An example was added for it.
  • Ran it locally.

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Comment thread charts/opentelemetry-collector/templates/configmap-supervisor.yaml Outdated
Comment thread charts/opentelemetry-collector/templates/configmap-supervisor.yaml Outdated
@douglascamata

Copy link
Copy Markdown
Member Author

@povilasv: after our conversation in Slack, I changed the logic a bit of the k8s resource attributes preset and how it interacts with the Supervisor preset. The logic from the k8s resource attributes preset now handle two sets of attributes internally in separated functions: one for k8s attributes and another for what I am calling "fleet attributes" (coming from the fleetManagement preset, unrelated to k8s metadata). The fleet attributes are used in some places even when k8s resource attributes are off. To make it easier to understand I created the table below:

k8s resource attributes fleet-management supervisor Behavior
Enabled Disabled Disabled/Enabled Full set of attributes added to telemetry resource of agent configuration file
Enabled Enabled Disabled Full set of attributes added to telemetry resource of agent configuration file AND to OpAMP extension description
Enabled Enabled Enabled Full set of attributes NOT added to agent configuration file. Instead, added to agent::description section of Supervisor configuration file (converted to resource attributes at runtime)
Disabled Enabled Enabled Only non-k8s attributes (cluster name, agent type, integration ID) added to agent::description section of Supervisor configuration file. K8s-related attributes (k8s.*.name) are excluded
Disabled Enabled False Only non-k8s attributes (cluster name, agent type, integration ID) added to OpAMP extension description of the agent configuration file. K8s-related attributes (k8s.*.name) are excluded

Comment thread charts/opentelemetry-collector/templates/configmap-supervisor.yaml
Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
@povilasv povilasv merged commit 8699fc0 into main Jun 12, 2025
3 checks passed
@povilasv povilasv deleted the supervisor-preset branch June 12, 2025 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants