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

Enable Kubernetes objects to be reported just once in a cluster #3274

Merged
merged 8 commits into from
Oct 19, 2018
Merged

Enable Kubernetes objects to be reported just once in a cluster #3274

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dd21a55
Refactor: implement kubernetes tagger in separate struct
bboreham Jul 20, 2018
88049b0
Add option for Kubernetes tagging when kubernetes probing disabled
bboreham Jul 20, 2018
38ea862
Check if dockerBridge is nonblank before using it
bboreham Jul 20, 2018
98d52bd
Allow kubelet port to be disabled
bboreham Jul 22, 2018
1279a02
Stop tagging pods with host ID
bboreham Jul 22, 2018
78eaf93
Make flag names easier to understand
bboreham Oct 11, 2018
fb96fe0
Turn everything else off in Kubernetes cluster probe
bboreham Oct 12, 2018
0c394e6
Fix pod host propagation
bboreham Oct 12, 2018
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
Next Next commit
Refactor: implement kubernetes tagger in separate struct
  • Loading branch information
@bboreham
bboreham committed Oct 11, 2018
commit dd21a55a1e6c6f59a6dd61dc36a5559b77399ee6
9 changes: 8 additions & 1 deletion probe/kubernetes/reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,15 @@ func isPauseContainer(n report.Node, rpt report.Report) bool {
return false
}

// Tagger adds pod parents to container nodes.
type Tagger struct {
}

// Name of this tagger, for metrics gathering
func (Tagger) Name() string { return "K8s" }

// Tag adds pod parents to container nodes.
func (r *Reporter) Tag(rpt report.Report) (report.Report, error) {
func (r *Tagger) Tag(rpt report.Report) (report.Report, error) {
for id, n := range rpt.Container.Nodes {
uid, ok := n.Latest.Lookup(docker.LabelPrefix + "io.kubernetes.pod.uid")
if !ok {
Expand Down
3 changes: 1 addition & 2 deletions probe/kubernetes/reporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,7 @@ func TestTagger(t *testing.T) {
docker.LabelPrefix + "io.kubernetes.pod.uid": "123456",
}))

hr := controls.NewDefaultHandlerRegistry()
rpt, err := kubernetes.NewReporter(newMockClient(), nil, "", "", nil, hr, "", 0).Tag(rpt)
rpt, err := (&kubernetes.Tagger{}).Tag(rpt)
if err != nil {
t.Errorf("Unexpected error: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion prog/probe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ func probeMain(flags probeFlags, targets []appclient.Target) {
reporter := kubernetes.NewReporter(client, clients, probeID, hostID, p, handlerRegistry, flags.kubernetesNodeName, flags.kubernetesKubeletPort)
defer reporter.Stop()
p.AddReporter(reporter)
p.AddTagger(reporter)
p.AddTagger(&kubernetes.Tagger{})
} else {
log.Errorf("Kubernetes: failed to start client: %v", err)
log.Errorf("Kubernetes: make sure to run Scope inside a POD with a service account or provide valid probe.kubernetes.* flags")
Expand Down