diff --git a/changelog/fragments/1696935756-add-default-host.yaml b/changelog/fragments/1696935756-add-default-host.yaml new file mode 100644 index 00000000000..a497170f3e7 --- /dev/null +++ b/changelog/fragments/1696935756-add-default-host.yaml @@ -0,0 +1,32 @@ +# Kind can be one of: +# - breaking-change: a change to previously-documented behavior +# - deprecation: functionality that is being removed in a later release +# - bug-fix: fixes a problem in a previous version +# - enhancement: extends functionality but does not break or fix existing behavior +# - feature: new functionality +# - known-issue: problems that we are aware of in a given version +# - security: impacts on the security of a product or a user’s deployment. +# - upgrade: important information for someone upgrading from a prior version +# - other: does not fit into any of the other categories +kind: feature + +# Change summary; a 80ish characters long description of the change. +summary: Hints Autodiscovery for Elastic Agent - Add default host for each container in a pod + +# Long description; in case the summary is not enough to describe the change +# this field accommodate a description without length limits. +# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment. +#description: + +# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. +component: elastic-agent + +# PR URL; optional; the PR number that added the changeset. +# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added. +# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number. +# Please provide it if you are adding a fragment for a different PR. +pr: https://github.com/elastic/elastic-agent/pull/3575 + +# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of). +# If not present is automatically filled by the tooling with the issue linked to the PR number. +issue: https://github.com/elastic/elastic-agent/issues/1453 diff --git a/internal/pkg/composable/providers/kubernetes/hints.go b/internal/pkg/composable/providers/kubernetes/hints.go index 934fcaf82e7..eac304b1c8e 100644 --- a/internal/pkg/composable/providers/kubernetes/hints.go +++ b/internal/pkg/composable/providers/kubernetes/hints.go @@ -259,6 +259,8 @@ func GetHintsMapping(k8sMapping map[string]interface{}, logger *logp.Logger, pre composableMapping: mapstr.M{}, processors: []mapstr.M{}, } + cName := "" + cHost := "" ann, ok := k8sMapping["annotations"] if !ok { @@ -266,8 +268,6 @@ func GetHintsMapping(k8sMapping map[string]interface{}, logger *logp.Logger, pre } annotations, _ := ann.(mapstr.M) - cName := "" - cHost := "" // Get the name of the container from the metadata. We need it to extract the hints that affect it directly. // E.g. co.elastic.hints./host: "..." if con, ok := k8sMapping["container"]; ok {