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.

Sign up for GitHub

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

Jump to bottom

OCPBUGS-2623: Fix dashboards having container_fs* metrices in queries #1798

Merged
merged 3 commits into from
Nov 15, 2022
Merged

OCPBUGS-2623: Fix dashboards having container_fs* metrices in queries #1798

merged 3 commits into from
Nov 15, 2022

Conversation

slashpai
Copy link
Member

Backport of #1554

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 17, 2022

@slashpai: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

WIP: Fix dashboards having container_fs* metrices in queries

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.

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 17, 2022
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 17, 2022
@slashpai slashpai changed the title WIP: Fix dashboards having container_fs* metrices in queries OCPBUGS-2623: WIP: Fix dashboards having container_fs* metrices in queries Oct 20, 2022
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 20, 2022
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Oct 20, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 20, 2022

@slashpai: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

OCPBUGS-2623: WIP: Fix dashboards having container_fs* metrices in queries

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.

@openshift-ci-robot
Copy link
Contributor

@slashpai: This pull request references Jira Issue OCPBUGS-2623, which is invalid:

  • expected the bug to target the "4.10.z" version, but no target version was set
  • expected Jira Issue OCPBUGS-2623 to depend on a bug targeting a version in 4.11.0, 4.11.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Backport of #1554

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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.

@slashpai
Copy link
Member Author

slashpai commented Nov 4, 2022

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@slashpai: This pull request references Jira Issue OCPBUGS-2623, which is invalid:

  • expected the bug to target the "4.10.z" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@slashpai
Copy link
Member Author

slashpai commented Nov 4, 2022

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Nov 4, 2022
@openshift-ci-robot
Copy link
Contributor

@slashpai: This pull request references Jira Issue OCPBUGS-2623, which is valid. The bug has been moved to the POST state.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.10.z) matches configured target version for branch (4.10.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
  • dependent bug Bugzilla Bug 2037513 is in the state CLOSED (ERRATA), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE))
  • dependent Bugzilla Bug 2037513 targets the "4.11.0" version, which is one of the valid target versions: 4.11.0, 4.11.z
  • bug has dependents

Requesting review from QA contact:
/cc @juzhao

In response to this:

/jira refresh

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.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 4, 2022
@openshift-ci openshift-ci bot requested a review from juzhao November 4, 2022 17:01
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 15, 2022
@slashpai
container_fs_.* metrics doesn't have container label after
3e42112 
openshift/pull/1402 which caused regression
for dashboards using container label since it gives empty datapoints
for all queries using container label in queries containing
container_fs_.* metrices.

Inorder to fix the dashboards added containerfsSelector in
kubernetes-monitoring/kubernetes-mixin/pull/737 and overrided the containerfsSelector
default value from  container!= to harmless id!= in this commit.
We really don't need that selector since we dropped the container label
in OCP for container_fs_.* metrices but we need to override the
selector for the queries involving container_fs_.* to work.

Signed-off-by: Jayapriya Pai <janantha@redhat.com>
@slashpai
jsonnet: run make update
be2685c
@slashpai
assets: regenerate
ed22f98
@slashpai slashpai force-pushed the fix_dashboards_4.10 branch from a0a4e22 to ed22f98 Compare November 15, 2022 10:20
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 15, 2022
@slashpai slashpai changed the title OCPBUGS-2623: WIP: Fix dashboards having container_fs* metrices in queries OCPBUGS-2623: Fix dashboards having container_fs* metrices in queries Nov 15, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 15, 2022

@slashpai: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

Retaining the bugzilla/valid-bug label as it was manually added.

In response to this:

OCPBUGS-2623: Fix dashboards having container_fs* metrices in queries

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.

@slashpai
Copy link
Member Author

@juzhao Could you please in reviewing this?

@juzhao
Copy link
Contributor

juzhao commented Nov 15, 2022

tested with PR, all "Storage IO" graphs can show data correctly
/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 15, 2022
@juzhao
Copy link
Contributor

juzhao commented Nov 15, 2022

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Nov 15, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 15, 2022

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

Test name Commit Details Required Rerun command
ci/prow/versions ed22f98 link false /test versions

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.

jan--f
jan--f approved these changes Nov 15, 2022
View reviewed changes
Copy link
Contributor

@jan--f jan--f left a comment

Choose a reason for hiding this comment

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

Nice, Thanks JP!
/lgtm
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Nov 15, 2022
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 15, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 15, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jan--f, slashpai

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

@openshift-merge-robot openshift-merge-robot merged commit 06d75ab into openshift:release-4.10 Nov 15, 2022
@openshift-ci-robot
Copy link
Contributor

@slashpai: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-2623 has been moved to the MODIFIED state.

In response to this:

Backport of #1554

  • I added CHANGELOG entry for this change.
  • No user facing changes, so no entry in CHANGELOG was needed.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jan--f jan--f jan--f approved these changes

@simonpasquier simonpasquier Awaiting requested review from simonpasquier

@juzhao juzhao Awaiting requested review from juzhao

Assignees

@jan--f jan--f

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@slashpai @openshift-ci-robot @juzhao @jan--f @openshift-merge-robot