From 67aa0219b5583119a640561cf8c8f6ca0266a222 Mon Sep 17 00:00:00 2001 From: adel121 Date: Fri, 27 Dec 2024 09:55:51 +0100 Subject: [PATCH 1/3] Fix repetitive warning logs with log file tailer --- comp/core/autodiscovery/listeners/container.go | 2 +- comp/core/autodiscovery/listeners/kubelet.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/comp/core/autodiscovery/listeners/container.go b/comp/core/autodiscovery/listeners/container.go index 46bb7db2b2d5d0..907c9202299a36 100644 --- a/comp/core/autodiscovery/listeners/container.go +++ b/comp/core/autodiscovery/listeners/container.go @@ -41,7 +41,7 @@ func NewContainerListener(options ServiceListernerDeps) (ServiceListener, error) const name = "ad-containerlistener" l := &ContainerListener{} filter := workloadmeta.NewFilterBuilder(). - SetSource(workloadmeta.SourceAll). + SetSource(workloadmeta.SourceRuntime). AddKind(workloadmeta.KindContainer).Build() wmetaInstance, ok := options.Wmeta.Get() diff --git a/comp/core/autodiscovery/listeners/kubelet.go b/comp/core/autodiscovery/listeners/kubelet.go index e0e57207f64d47..15a83e96bfb6a4 100644 --- a/comp/core/autodiscovery/listeners/kubelet.go +++ b/comp/core/autodiscovery/listeners/kubelet.go @@ -36,7 +36,7 @@ func NewKubeletListener(options ServiceListernerDeps) (ServiceListener, error) { l := &KubeletListener{} filter := workloadmeta.NewFilterBuilder(). - SetSource(workloadmeta.SourceAll). + SetSource(workloadmeta.SourceNodeOrchestrator). AddKind(workloadmeta.KindKubernetesPod). Build() From dfd91db40d12023542e6210fa5f78ace7ddd64da Mon Sep 17 00:00:00 2001 From: adel121 Date: Fri, 27 Dec 2024 10:57:12 +0100 Subject: [PATCH 2/3] add release note --- ...8s-cronjob-tailer-warning-0644e93093a020c4.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 releasenotes/notes/fix-k8s-cronjob-tailer-warning-0644e93093a020c4.yaml diff --git a/releasenotes/notes/fix-k8s-cronjob-tailer-warning-0644e93093a020c4.yaml b/releasenotes/notes/fix-k8s-cronjob-tailer-warning-0644e93093a020c4.yaml new file mode 100644 index 00000000000000..9a16af36b5a218 --- /dev/null +++ b/releasenotes/notes/fix-k8s-cronjob-tailer-warning-0644e93093a020c4.yaml @@ -0,0 +1,14 @@ +# Each section from every release note are combined when the +# CHANGELOG.rst is rendered. So the text needs to be worded so that +# it does not depend on any information only available in another +# section. This may mean repeating some details, but each section +# must be readable independently of the other. +# +# Each section note must be formatted as reStructuredText. +--- +fixes: + - | + Fixes an issue in the Agent where it could potentially try to make a new file tailer + for a cronjob pod container that has already completed and has already been processed + by the log agent. When this happens, warnings are emitted indicating that the agent + failed to make a file tailer for the container log file. From 813c810b7553e62eee5b50cafe27e5eaebd93369 Mon Sep 17 00:00:00 2001 From: adel121 Date: Fri, 27 Dec 2024 14:04:45 +0100 Subject: [PATCH 3/3] set container listener filter source to SourceAll --- comp/core/autodiscovery/listeners/container.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp/core/autodiscovery/listeners/container.go b/comp/core/autodiscovery/listeners/container.go index 907c9202299a36..46bb7db2b2d5d0 100644 --- a/comp/core/autodiscovery/listeners/container.go +++ b/comp/core/autodiscovery/listeners/container.go @@ -41,7 +41,7 @@ func NewContainerListener(options ServiceListernerDeps) (ServiceListener, error) const name = "ad-containerlistener" l := &ContainerListener{} filter := workloadmeta.NewFilterBuilder(). - SetSource(workloadmeta.SourceRuntime). + SetSource(workloadmeta.SourceAll). AddKind(workloadmeta.KindContainer).Build() wmetaInstance, ok := options.Wmeta.Get()