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.

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

Drop deprecated cadvisor metric labels #80376

Merged
merged 1 commit into from Aug 14, 2019

Conversation

@ehashman
Copy link
Member

commented Jul 19, 2019

What type of PR is this?

/kind api-change
/kind cleanup

What this PR does / why we need it:

Updates exported cadvisor metric labels to match the Kubernetes instrumentation guidelines. Duplicate labels were included in the 1.14 and 1.15 releases; for 1.16, I'd like to drop the deprecated labels.

Which issue(s) this PR fixes:

Addresses #66790.

Special notes for your reviewer:

See also #69099 which introduced the duplicate labels.

/sig instrumentation
/sig node
/cc @brancz

Does this PR introduce a user-facing change?:

Removed cadvisor metric labels `pod_name` and `container_name` to match instrumentation guidelines.

Action required: any Prometheus queries that match `pod_name` and `container_name` labels (e.g. cadvisor or kubelet probe metrics) must be updated to use `pod` and `container` instead.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

- [KEP]: https://github.com/kubernetes/enhancements/blob/28d0f41a30b32bceb01e0d4ae338f91ede195005/keps/sig-instrumentation/20181106-kubernetes-metrics-overhaul.md#cadvisor-instrumentation-changes
These labels were deprecated in 1.14 (#69099) and should no longer be
used in metric queries.
@fejta-bot

This comment has been minimized.

Copy link

commented Jul 19, 2019

This PR may require API review.

If so, when the changes are ready, complete the pre-review checklist and request an API review.

Status of requested reviews is tracked in the API Review project.

@brancz

This comment has been minimized.

Copy link
Member

commented Jul 20, 2019

/lgtm

@ehashman

This comment has been minimized.

Copy link
Member Author

commented Jul 22, 2019

/cc @dchen1107

This is the cadvisor metric label change I mentioned on behalf of SIG Instrumentation at the Jul. 9 and 16 SIG Node meetings 😄

@k8s-ci-robot k8s-ci-robot requested a review from dchen1107 Jul 22, 2019
@logicalhan

This comment has been minimized.

Copy link
Contributor

commented Jul 25, 2019

/assign @x13n

@ehashman

This comment has been minimized.

Copy link
Member Author

commented Jul 25, 2019

/cc @dashpole @derekwaynecarr

Derek, I think you were the SIG Node approver for the duplicate label change on #69099.

@k8s-ci-robot k8s-ci-robot requested review from dashpole and derekwaynecarr Jul 25, 2019
@dashpole

This comment has been minimized.

Copy link
Contributor

commented Jul 25, 2019

/lgtm

@x13n

This comment has been minimized.

Copy link
Member

commented Jul 26, 2019

I remember @jiayingz was looking at these metrics, so:
/cc @jiayingz
just to double-check. I think it's should be ok to remove them.

@jiayingz

This comment has been minimized.

Copy link
Member

commented Aug 8, 2019

/lgtm

@derekwaynecarr

This comment has been minimized.

Copy link
Member

commented Aug 9, 2019

/approve

@brancz

This comment has been minimized.

Copy link
Member

commented Aug 9, 2019

@x13n I think we're ready to go :)

@piosz

This comment has been minimized.

Copy link
Member

commented Aug 14, 2019

/approve

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

commented Aug 14, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, ehashman, piosz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@fejta-bot

This comment has been minimized.

Copy link

commented Aug 14, 2019

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit f6a70ef into kubernetes:master Aug 14, 2019
23 checks passed
23 checks passed
cla/linuxfoundation ehashman authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-conformance-image-test Skipped.
pull-kubernetes-cross Skipped.
pull-kubernetes-dependencies Job succeeded.
Details
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-csi-serial Skipped.
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gce-iscsi Skipped.
pull-kubernetes-e2e-gce-iscsi-serial Skipped.
pull-kubernetes-e2e-gce-storage-slow Skipped.
pull-kubernetes-godeps Skipped.
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped.
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-node-e2e-containerd Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
pull-publishing-bot-validate Skipped.
tide In merge pool.
Details
@k8s-ci-robot k8s-ci-robot added this to the v1.16 milestone Aug 14, 2019
@ehashman ehashman deleted the ehashman:issue-66790-2 branch Aug 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.