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

Add CRI-O metrics collectors configuration #2678

Merged

Conversation

saschagrunert
Copy link
Member

- What I did
We now can configure metrics by referencing the collector since
cri-o/cri-o#5061 has been merged.

This patch adds the default CRI-O metrics collectors and reflects the
previously overwritten state from the Cluster Monitoring Operator (CMO).

- How to verify it
Verify that the configured metrics are being served.

- Description for the changelog
Added CRI-O metrics_collectors configuration.

@saschagrunert
Copy link
Member Author

@saschagrunert
Copy link
Member Author

/retest

2 similar comments
@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@QiWang19
Copy link
Member

Do we also need add the same to templates/worker/01-worker-container-runtime/_base/files/crio.yaml?

We now can configure metrics by referencing the collector since
cri-o/cri-o#5061 has been merged.

This patch adds the default CRI-O metrics collectors and reflects the
previously overwritten state from the Cluster Monitoring Operator (CMO).

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@saschagrunert
Copy link
Member Author

Do we also need add the same to templates/worker/01-worker-container-runtime/_base/files/crio.yaml?

Yes, sure. Thank you for the hint. Updated the PR as suggested.

Copy link
Member

@QiWang19 QiWang19 left a comment

Choose a reason for hiding this comment

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

LGTM

@saschagrunert
Copy link
Member Author

PTAL @yuqi-zhang @kikisdeliveryservice

@kikisdeliveryservice
Copy link
Contributor

As MCO doesn't own these templates, would like one of the SMEs to look:

/assign @umohnani8 @mtrmac @haircommander

@haircommander
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2021
Copy link
Contributor

@kikisdeliveryservice kikisdeliveryservice left a comment

Choose a reason for hiding this comment

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

This seemed generally fine and since an SME weighted in, let's merge.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 22, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, kikisdeliveryservice, saschagrunert

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:
  • OWNERS [kikisdeliveryservice]

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 22, 2021
@mrunalp
Copy link
Member

mrunalp commented Jul 22, 2021

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 23, 2021

@saschagrunert: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-upgrade-single-node e785649 link /test e2e-aws-upgrade-single-node
ci/prow/e2e-aws-single-node e785649 link /test e2e-aws-single-node
ci/prow/e2e-aws-techpreview-featuregate e785649 link /test e2e-aws-techpreview-featuregate
ci/prow/e2e-aws-workers-rhel7 e785649 link /test e2e-aws-workers-rhel7
ci/prow/e2e-ovn-step-registry e785649 link /test e2e-ovn-step-registry
ci/prow/e2e-vsphere-upgrade e785649 link /test e2e-vsphere-upgrade
ci/prow/e2e-aws-disruptive e785649 link /test e2e-aws-disruptive

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 06a176c into openshift:master Jul 23, 2021
@saschagrunert saschagrunert deleted the crio-metrics-collectors branch July 23, 2021 06:40
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants