Add filtering by job in stat, tap, top; fix panic #1904
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Filtering by Kubernetes job was not supported. Also filtering by any unknown type caused a panic. Add filtering support by Kubernetes job, with special case mapping `job` to `k8s_job`, to not conflict with Prometheus' job label. Fix panic when unknown type specified as a `--from` or `--to` flag. Fix `job` label from `linkerd-proxy` overwriting Prometheus `job` label at collection time. This caused all metrics collected by proxy sidecars in Kubernetes jobs to be collected into an incorrect Prometheus job, rather than the expected `linkerd-proxy` Prometheus job. Fix `unsupported resource type` tap error message incorrectly printing the target resource rather than the destination. Set `--controller-log-level debug` in `install_test.go` for easier debugging. Expose `slow-cooker`'s metrics via a k8s service in the tap integration test, to validate proxy requests with a job as destination. Fixes #1872 Part of #627 Signed-off-by: Andrew Seigner <siggy@buoyant.io>
klingerf
approved these changes
Dec 3, 2018
cli/cmd/tap.go
Outdated
| * deployments | ||
| * namespaces | ||
| * pods | ||
| * replicationcontrollers | ||
| * services (only supported as a "--to" resource)`, | ||
| * services (only supported as a --to resource) | ||
| * jobs (only supported as a --from or --to)`, |
There was a problem hiding this comment.
For consistency with the services wording, I'd write this as:
- jobs (only supported as a --from or --to resource)
There was a problem hiding this comment.
Hmm, on closer inspection, it looks like tap and top only support a --to flag.
bin/linkerd -l kltest top deploy -n kltest-tap-test --from job/slow-cooker
Error: unknown flag: --from
Offhand it seems like it should be possible for them to support a --from flag, but I don't think we should implement that as part of this PR. In the meantime, can you change this to:
- jobs (only supported as a --to resource)
| @@ -491,6 +491,9 @@ data: | |||
| - source_labels: [__meta_kubernetes_pod_label_linkerd_io_proxy_job] | |||
| action: replace | |||
| target_label: k8s_job | |||
| # drop __meta_kubernetes_pod_label_linkerd_io_proxy_job | |||
| - action: labeldrop | |||
| regex: __meta_kubernetes_pod_label_linkerd_io_proxy_job | |||
cli/cmd/top.go
Outdated
| * deployments | ||
| * namespaces | ||
| * pods | ||
| * replicationcontrollers | ||
| * services (only supported as a "--to" resource)`, | ||
| * services (only supported as a --to resource) | ||
| * jobs (only supported as a --from or --to)`, |
There was a problem hiding this comment.
Same comment here as in tap.go:
- jobs (only supported as a --to resource)
| if err != nil { | ||
| return pb.Resource{}, err | ||
| } | ||
|
|
||
| return res[0], err |
Signed-off-by: Andrew Seigner <siggy@buoyant.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Filtering by Kubernetes job was not supported. Also filtering by any unknown
type caused a panic.
Add filtering support by Kubernetes job, with special case mapping
jobtok8s_job, to not conflict with Prometheus' job label.Fix panic when unknown type specified as a
--fromor--toflag.Fix
joblabel fromlinkerd-proxyoverwriting Prometheusjoblabel atcollection time. This caused all metrics collected by proxy sidecars in
Kubernetes jobs to be collected into an incorrect Prometheus job, rather than
the expected
linkerd-proxyPrometheus job.Fix
unsupported resource typetap error message incorrectly printing thetarget resource rather than the destination.
Set
--controller-log-level debugininstall_test.gofor easier debugging.Expose
slow-cooker's metrics via a k8s service in the tap integration test, tovalidate proxy requests with a job as destination.
Fixes #1872
Part of #627
Signed-off-by: Andrew Seigner siggy@buoyant.io
Validating commands
Deploy integration tests
bin/fast-build bin/test-run `pwd`/bin/linkerdSend traffic to a Kubernetes job
View traffic to/from Kubernetes job