Skip to content

add network plugin metrics#7858

Merged
fuweid merged 1 commit intocontainerd:mainfrom
aojea:network_metrics
Dec 26, 2022
Merged

add network plugin metrics#7858
fuweid merged 1 commit intocontainerd:mainfrom
aojea:network_metrics

Conversation

@aojea
Copy link
Contributor

@aojea aojea commented Dec 22, 2022

Add network plugin metrics.

The metrics are the same that were used in dockershim/kubelet until it was deprecated in kubernetes 1.23

https://github.com/kubernetes/kubernetes/blob/release-1.23/pkg/kubelet/dockershim/network/metrics/metrics.go

Fixes: #7801

Signed-off-by: Antonio Ojea [email protected]

@k8s-ci-robot
Copy link

k8s-ci-robot commented Dec 22, 2022

Hi @aojea. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@aojea
Copy link
Contributor Author

aojea commented Dec 22, 2022

/assign @mikebrow @MikeZappa87 @MrHohn

@k8s-ci-robot
Copy link

k8s-ci-robot commented Dec 22, 2022

@aojea: GitHub didn't allow me to assign the following users: MrHohn.

Note that only containerd members with read permissions, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

Details

In response to this:

/assign @mikebrow @MikeZappa87 @MrHohn

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@aojea
add network plugin metrics
ba0a718 
Add network plugin metrics.

The metrics are the same that were used in dockershim/kubelet until
it was deprecated in kubernetes 1.23

https://github.com/kubernetes/kubernetes/blob/release-1.23/pkg/kubelet/dockershim/network/metrics/metrics.go

Signed-off-by: Antonio Ojea <[email protected]>
@samuelkarp
Copy link
Member

samuelkarp commented Dec 23, 2022

/ok-to-test

@samuelkarp samuelkarp added area/cri Container Runtime Interface (CRI) impact/changelog kind/enhancement labels Dec 23, 2022
@samuelkarp samuelkarp self-assigned this Dec 23, 2022
dcantah
dcantah approved these changes Dec 24, 2022
View reviewed changes
Copy link
Member

@dcantah dcantah left a comment

Choose a reason for hiding this comment

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

LGTM

fuweid
fuweid approved these changes Dec 25, 2022
View reviewed changes
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

Lgtm on green

mikebrow
mikebrow approved these changes Dec 25, 2022
View reviewed changes
Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid fuweid merged commit 4c3eb5f into containerd:main Dec 26, 2022
MrHohn
MrHohn reviewed Dec 27, 2022
View reviewed changes
Copy link

@MrHohn MrHohn left a comment

Choose a reason for hiding this comment

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

Retrospectively LGTM, thanks @aojea !

@dmcgowan dmcgowan mentioned this pull request Jan 3, 2023
Merged
@dmcgowan dmcgowan mentioned this pull request Jan 28, 2023
Merged
@aojea
Copy link
Contributor Author

aojea commented Jan 28, 2023

@mikebrow @fuweid are you open to backport this metrics to 1.6?

@fuweid
Copy link
Member

fuweid commented Jan 28, 2023

are you open to backport this metrics to 1.6?

Yes, please~

@aojea
Copy link
Contributor Author

aojea commented Jan 28, 2023

Thanks

#8018

@fuweid fuweid added cherry-pick/1.6.x cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch and removed cherry-pick/1.6.x labels Jan 28, 2023
@fuweid fuweid mentioned this pull request Jan 29, 2023
Merged
@dmcgowan dmcgowan mentioned this pull request Feb 15, 2023
Merged
This was referenced Feb 25, 2023
Merged
Merged
This was referenced Mar 7, 2023
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mikebrow mikebrow mikebrow approved these changes

@fuweid fuweid fuweid approved these changes

@dcantah dcantah dcantah approved these changes

+1 more reviewer

@MrHohn MrHohn MrHohn left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@samuelkarp samuelkarp

@mikebrow mikebrow

@MikeZappa87 MikeZappa87

Labels

area/cri Container Runtime Interface (CRI) cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch impact/changelog kind/enhancement ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

CNI operation metrics

8 participants

@aojea @k8s-ci-robot @samuelkarp @fuweid @MrHohn @mikebrow @dcantah @MikeZappa87