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

Bug 2037513: Fix dashboards having container_fs* metrices in queries #1554

Merged
merged 4 commits into from
Jun 23, 2022

Conversation

slashpai
Copy link
Member

@slashpai slashpai commented Feb 4, 2022

container_fs_.* metrics doesn't have "container" label after
/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. Dropped the dashboard
"Kubernetes / Compute Resources / Pod" since Prometheus doesn't collect the
per-container fs metrics (discussed in #1685 (comment))

Had added deviceDeviceSelector in container_fs* queries as part of
kubernetes-monitoring/kubernetes-mixin#737 since diskDeviceSelector
includes only node_exporter label values updated disDeviceSelector
to include cadvisor devices too (/dev)

More Details:
Bugzilla Comment 9
Bugzilla Comment 10

cc: @arajkumar @philipgough

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

@openshift-ci openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Feb 4, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 4, 2022

@slashpai: This pull request references Bugzilla bug 2037513, which is invalid:

  • expected the bug to target the "4.11.0" release, but it targets "---" instead

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

In response to this:

Bug 2037513: 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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 4, 2022
@slashpai
Copy link
Member Author

slashpai commented Feb 4, 2022

/bugzilla refresh

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 4, 2022

@slashpai: This pull request references Bugzilla bug 2037513, which is invalid:

  • expected the bug to target the "4.11.0" release, but it targets "---" instead

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

In response to this:

/bugzilla 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 Feb 4, 2022

Looks like d72bec8#diff-08daaad7f1c27b41ec86bee6cb6af0259066e38448b11e5389412c720813b255R25-R32 included more changes than expected

jsonnet/jsonnetfile.json Outdated Show resolved Hide resolved
assets/prometheus-k8s/cluster-role.yaml Outdated Show resolved Hide resolved
assets/prometheus-user-workload/cluster-role-binding.yaml Outdated Show resolved Hide resolved
@slashpai
Copy link
Member Author

slashpai commented Feb 9, 2022

/bugzilla refresh

@openshift-ci openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Feb 9, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 9, 2022

@slashpai: This pull request references Bugzilla bug 2037513, which is valid. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.11.0) matches configured target release for branch (4.11.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @juzhao

In response to this:

/bugzilla 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 openshift-ci bot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Feb 9, 2022
@openshift-ci openshift-ci bot requested a review from juzhao February 9, 2022 10:32
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 9, 2022

@slashpai: This pull request references Bugzilla bug 2037513, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.11.0) matches configured target release for branch (4.11.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @juzhao

In response to this:

Bug 2037513: 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

slashpai commented Feb 9, 2022

I will create a separate PR for kube-prometheus sync and generate to avoid confusion

@slashpai
Copy link
Member Author

slashpai commented Feb 9, 2022

/hold I have created #1556 to update dependencies. I will rebase this branch once thats merged

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 9, 2022
@slashpai
Copy link
Member Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 23, 2022
@slashpai
Copy link
Member Author

/retest

@slashpai
Copy link
Member Author

cc: @arajkumar @philipgough PTAL when you get a chance
I have added description why we needed this change

@slashpai
Copy link
Member Author

/retest

@slashpai
Copy link
Member Author

/hold Testing this change locally

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2022
@slashpai
Copy link
Member Author

slashpai commented Mar 3, 2022

Had added deviceDeviceSelector in container_fs* queries as part of kubernetes-mixin PR since diskDeviceSelector includes only node_exporter label values figuring out what all need to be updated to make it work for cadvisor label values as well

Because dashboard still gives no datapoints as there is no matching regex for diskDeviceSelector

Had added deviceDeviceSelector in container_fs* queries as part of
kubernetes-monitoring/kubernetes-mixin#737 since diskDeviceSelector
includes only node_exporter label values updated disDeviceSelector
to include cadvisor devices too (/dev)
@slashpai slashpai force-pushed the fix_dashboards branch 4 times, most recently from ff7c393 to 9981ce6 Compare June 21, 2022 09:59
Since Prometheus doesn't collect the per-container fs metrics
dropping this dashboard instead of showing no datapoints

Signed-off-by: Jayapriya Pai <[email protected]>
Copy link
Contributor

@raptorsun raptorsun left a comment

Choose a reason for hiding this comment

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

/lgtm

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

openshift-ci bot commented Jun 22, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: raptorsun, 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

@simonpasquier
Copy link
Contributor

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 22, 2022
@simonpasquier
Copy link
Contributor

/skip

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 2 against base HEAD cb4084c and 8 for PR HEAD c399d8f in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 1 against base HEAD cb4084c and 7 for PR HEAD c399d8f in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD cb4084c and 6 for PR HEAD c399d8f in total

@slashpai
Copy link
Member Author

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 22, 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/e2e-aws-single-node c399d8f link false /test e2e-aws-single-node

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.

@slashpai
Copy link
Member Author

/retest

@openshift-ci openshift-ci bot merged commit 97b7888 into openshift:master Jun 23, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 23, 2022

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

Bugzilla bug 2037513 has been moved to the MODIFIED state.

In response to this:

Bug 2037513: 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 we have dropped two rows in Kubernetes / Compute Resources / Pod" 'Storage IO - Distribution(Containers)' and 'Storage IO - Distribution'

@slashpai slashpai deleted the fix_dashboards branch October 13, 2022 17:02
@slashpai
Copy link
Member Author

/cherry-pick 4.10

@openshift-cherrypick-robot

@slashpai: cannot checkout 4.10: error checking out 4.10: exit status 1. output: error: pathspec '4.10' did not match any file(s) known to git

In response to this:

/cherry-pick 4.10

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

/cherry-pick release-4.10

@openshift-cherrypick-robot

@slashpai: #1554 failed to apply on top of branch "release-4.10":

Applying: jsonnet/main.jsonnet: Override containerfsSelector
Using index info to reconstruct a base tree...
M	jsonnet/main.jsonnet
Falling back to patching base and 3-way merge...
Auto-merging jsonnet/main.jsonnet
Applying: assets/manifests: regenerate
Using index info to reconstruct a base tree...
M	assets/grafana/dashboard-definitions.yaml
M	manifests/0000_90_cluster-monitoring-operator_01-dashboards.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/0000_90_cluster-monitoring-operator_01-dashboards.yaml
CONFLICT (content): Merge conflict in manifests/0000_90_cluster-monitoring-operator_01-dashboards.yaml
Auto-merging assets/grafana/dashboard-definitions.yaml
CONFLICT (content): Merge conflict in assets/grafana/dashboard-definitions.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 assets/manifests: regenerate
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.10

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
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium 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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants