Skip to content
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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(promtail): Fix API level node filtering of Kubernetes SD to only fetch pod metadata for pods of the current node #14267

Merged
merged 3 commits into from
Jan 10, 2025
Merged

fix(promtail): Fix API level node filtering of Kubernetes SD to only fetch pod metadata for pods of the current node #14267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a218cb
fix: Correct loop in kube pod selector
LashaJini Sep 26, 2024
6295cc9
Merge branch 'main' into correctly-loop-over-k8s-selectors
chaudum Dec 13, 2024
7df0600
Merge branch 'main' into correctly-loop-over-k8s-selectors
chaudum Dec 13, 2024
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
12 changes: 6 additions & 6 deletions clients/pkg/promtail/targets/file/filetargetmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,13 +264,13 @@ func (tm *FileTargetManager) fulfillKubePodSelector(selectors []kubernetes.Selec
return []kubernetes.SelectorConfig{{Role: kubernetes.RolePod, Field: nodeSelector}}
}

for _, selector := range selectors {
if selector.Field == "" {
selector.Field = nodeSelector
} else if !strings.Contains(selector.Field, nodeSelector) {
selector.Field += "," + nodeSelector
for i := range selectors {
if selectors[i].Field == "" {
selectors[i].Field = nodeSelector
} else if !strings.Contains(selectors[i].Field, nodeSelector) {
selectors[i].Field += "," + nodeSelector
}
selector.Role = kubernetes.RolePod
selectors[i].Role = kubernetes.RolePod
}

return selectors
Expand Down
68 changes: 68 additions & 0 deletions clients/pkg/promtail/targets/file/filetargetmanager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/go-kit/log"
"github.com/prometheus/common/model"
"github.com/prometheus/prometheus/discovery"
"github.com/prometheus/prometheus/discovery/kubernetes"
"github.com/prometheus/prometheus/discovery/targetgroup"

"github.com/grafana/loki/v3/clients/pkg/promtail/api"
Expand Down Expand Up @@ -594,3 +595,70 @@ func TestLabelSetUpdate(t *testing.T) {
require.Equal(t, 0, len(syncer.fileEventWatchers))

}

func TestFulfillKubePodSelector(t *testing.T) {
w := log.NewSyncWriter(os.Stderr)
logger := log.NewLogfmtLogger(w)
logDirName := newTestLogDirectories(t)

positionsFileName := filepath.Join(logDirName, "positions.yml")
ps, err := newTestPositions(logger, positionsFileName)
if err != nil {
t.Fatal(err)
}

client := fake.New(func() {})
defer client.Stop()

ftm, err := newTestFileTargetManager(logger, client, ps, logDirName+"/*")
assert.NoError(t, err)
Copy link
Contributor Author

@LashaJini LashaJini Sep 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add the missing err assertion to satisfy the linter


host := "test-host"

// empty selectors
selectors := []kubernetes.SelectorConfig{}
expected := []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: fmt.Sprintf("%s=%s", kubernetesPodNodeField, host)},
}

result := ftm.fulfillKubePodSelector(selectors, host)
require.Equal(t, expected, result)

// non-empty selectors with empty field
selectors = []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: ""},
}
expected = []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: fmt.Sprintf("%s=%s", kubernetesPodNodeField, host)},
}

result = ftm.fulfillKubePodSelector(selectors, host)
require.Equal(t, expected, result)

// non-empty selectors with existing field without nodeSelector
selectors = []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: "app=frontend"},
}
expectedField := "app=frontend," + fmt.Sprintf("%s=%s", kubernetesPodNodeField, host)
expected = []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: expectedField},
}

result = ftm.fulfillKubePodSelector(selectors, host)
require.Equal(t, expected, result)

// non-empty selectors with existing Field containing nodeSelector
nodeSelector := fmt.Sprintf("%s=%s", kubernetesPodNodeField, host)
selectors = []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: nodeSelector},
}
expected = []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: nodeSelector},
}

result = ftm.fulfillKubePodSelector(selectors, host)
require.Equal(t, expected, result)

ftm.Stop()
ps.Stop()
}
Loading