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

metrics: etcd_object_counts->apiserver_storage_object_counts(stable) #99785

Merged
merged 1 commit into from Mar 9, 2021

Conversation

erain
Copy link
Contributor

@erain erain commented Mar 4, 2021

What type of PR is this?

/kind feature

What this PR does / why we need it:

#98270 (comment)

Which issue(s) this PR fixes:

Fixes #98270

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Rename metrics `etcd_object_counts` to `apiserver_storage_object_counts` and mark it as stable. The original `etcd_object_counts` metrics name is marked as "Deprecated" and will be removed in the future. 

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

- [KEP]: https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/1209-metrics-stability

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. kind/feature Categorizes issue or PR as related to a new feature. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 4, 2021
@erain
Copy link
Contributor Author

erain commented Mar 4, 2021

/assign @logicalhan

@erain
Copy link
Contributor Author

erain commented Mar 4, 2021

/sig instrumentation api-machinery

@k8s-ci-robot k8s-ci-robot added sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. area/apiserver and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 4, 2021
@k8s-ci-robot k8s-ci-robot added area/test sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Mar 4, 2021
@erain
Copy link
Contributor Author

erain commented Mar 4, 2021

Thanks for the review @logicalhan ! All comments addressed.

@erain
Copy link
Contributor Author

erain commented Mar 4, 2021

/retest

@caesarxuchao
Copy link
Member

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Mar 4, 2021
@logicalhan
Copy link
Member

@brancz wants this to be named apiserver_storage_objects but actually I am okay with apiserver_storage_object_counts as a convention for gauge counters.

/hold
(wait on @brancz's reply)

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 6, 2021
@k8s-ci-robot k8s-ci-robot removed do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Mar 8, 2021
@erain
Copy link
Contributor Author

erain commented Mar 8, 2021

@erain, can you amend the commit message? It seems that # is forbidden in commit messages.

Thanks. I've updated the commit message and also rebased on master. (It seems another stable metrics got merged before this one :D)

Copy link
Member

@logicalhan logicalhan left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve
/hold

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 8, 2021
- rename etcd_object_counts to apiserver_storage_object_counts

CONTEXT kubernetes#98270
FIXES kubernetes#98270
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 8, 2021
@logicalhan
Copy link
Member

/priority important-soon
/hold cancel

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 9, 2021
Copy link
Member

@logicalhan logicalhan left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 9, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: erain, logicalhan

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

@k8s-ci-robot k8s-ci-robot merged commit afca3da into kubernetes:master Mar 9, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Mar 9, 2021
@erain erain deleted the issue/98270 branch March 9, 2021 23:49
nkinkade added a commit to m-lab/prometheus-support that referenced this pull request Jul 26, 2022
kubernetes/kubernetes#99785

The PR says the new metric name will be apiserver_storage_object_counts,
but on a running v1.21.14 control plane node, the metric is actually
named apiserver_storage_ojects.
nkinkade added a commit to m-lab/prometheus-support that referenced this pull request Jul 26, 2022
* Changes etcd_object_counts to apiserver_storage_objects

kubernetes/kubernetes#99785

The PR says the new metric name will be apiserver_storage_object_counts,
but on a running v1.21.14 control plane node, the metric is actually
named apiserver_storage_ojects.

* Fixes datasource uid value on EtcdOverview
ack-bot pushed a commit to aws-controllers-k8s/test-infra that referenced this pull request Nov 17, 2022
#261)

Motivation:  noticed when running soak tests that the `ACK Resource Count` graph was blank.  After some digging, determined that the metric `etc_object_counts` is now deprecated upstream in favor of `apiserver_storage_objects`.

See:

- https://github.com/kubernetes/apiserver/blob/464f2d738348f8048b8791f4c6a7bf51144c1ac7/pkg/storage/etcd3/metrics/metrics.go#L50
- kubernetes/kubernetes#98270 
- kubernetes/kubernetes#99785 
- https://access.redhat.com/solutions/6969249

Before:
![image](https://user-images.githubusercontent.com/115744412/202563586-912f5428-dfb4-4e99-8ef4-45b32356d42d.png)

After:
![image](https://user-images.githubusercontent.com/115744412/202563659-0f732fe2-4af9-46ff-a261-3758832df132.png)


Description of changes:
Change the default Grafana dashboard used to monitor ACK soak tests to use this new metric.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Create a stable version of etcd_object_counts
4 participants