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

[release-4.9] Bug 2020000: Fix resource metrics 403 errors for project admin users #10396

Merged
merged 1 commit into from Nov 16, 2021
Merged

[release-4.9] Bug 2020000: Fix resource metrics 403 errors for project admin users #10396

merged 1 commit into from Nov 16, 2021

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #10344

/assign TheRealJon

@TheRealJon
Bug 2015806: Fix resource metrics 403 errors for project admin users
3fe33a4 
- Add namespace prop to QueryBrowser in ResourceMetricsDashboardCard component, which causes all queries to be run as namespace-scoped thanos tenancy requests.
- Remove namespace from all PromQL queries defined in `frontend/packages/console-shared/src/promql/resource-metrics.ts`. These queries will always be run as namespace-scoped tenancy endpoint requests, so including the namespace in the PromQL query is redundant.
- Adjust dev console top workload metrics "Recieve bandwidth" PromQL query to use `namespace=` rather than `namespace=~`. This was causing a `400: Bad Request` on tenancy requests witn `namespace` in the URL query parameters.
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Nov 3, 2021
Merged
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 3, 2021

@openshift-cherrypick-robot: Detected clone of Bugzilla bug 2015806 with correct target release. Retitling PR to link to clone:
/retitle [release-4.9] Bug 2020000: Fix resource metrics 403 errors for project admin users

In response to this:

[release-4.9] Bug 2015806: Fix resource metrics 403 errors for project admin users

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 changed the title [release-4.9] Bug 2015806: Fix resource metrics 403 errors for project admin users [release-4.9] Bug 2020000: Fix resource metrics 403 errors for project admin users Nov 3, 2021
@openshift-ci openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high 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 3, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 3, 2021

@openshift-cherrypick-robot: This pull request references Bugzilla bug 2020000, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.9.z) matches configured target release for branch (4.9.z)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 2015806 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 2015806 targets the "4.10.0" release, which is one of the valid target releases: 4.10.0
  • bug has dependents

Requesting review from QA contact:
/cc @yapei

In response to this:

[release-4.9] Bug 2020000: Fix resource metrics 403 errors for project admin users

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 component/core Related to console core functionality component/dev-console Related to dev-console component/shared Related to console-shared labels Nov 3, 2021
@yapei
Copy link
Contributor

yapei commented Nov 4, 2021

@schituku Could you help test it?

@schituku
Copy link

schituku commented Nov 5, 2021

/lgtm

@schituku
Copy link

schituku commented Nov 5, 2021

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Nov 5, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 5, 2021
@TheRealJon
Copy link
Member

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 9, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, schituku, TheRealJon

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 9, 2021
@yapei
Copy link
Contributor

yapei commented Nov 12, 2021

/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 12, 2021
@jhadvig
Copy link
Member

jhadvig commented Nov 16, 2021

/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 16, 2021
@TheRealJon
Copy link
Member

/cherry-pick release-4.8

@openshift-cherrypick-robot
Copy link
Author

@TheRealJon: once the present PR merges, I will cherry-pick it on top of release-4.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.8

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-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

5 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 8159a10 into openshift:release-4.9 Nov 16, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 16, 2021

@openshift-cherrypick-robot: All pull requests linked via external trackers have merged:

Bugzilla bug 2020000 has been moved to the MODIFIED state.

In response to this:

[release-4.9] Bug 2020000: Fix resource metrics 403 errors for project admin users

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-cherrypick-robot
Copy link
Author

@TheRealJon: #10396 failed to apply on top of branch "release-4.8":

Applying: Bug 2015806: Fix resource metrics 403 errors for project admin users
Using index info to reconstruct a base tree...
M	frontend/packages/console-shared/src/promql/resource-metrics.ts
M	frontend/packages/dev-console/src/components/monitoring/queries.ts
M	frontend/public/components/utils/resource-metrics.tsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/public/components/utils/resource-metrics.tsx
CONFLICT (content): Merge conflict in frontend/public/components/utils/resource-metrics.tsx
Auto-merging frontend/packages/dev-console/src/components/monitoring/queries.ts
Auto-merging frontend/packages/console-shared/src/promql/resource-metrics.ts
CONFLICT (content): Merge conflict in frontend/packages/console-shared/src/promql/resource-metrics.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bug 2015806: Fix resource metrics 403 errors for project admin users
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.8

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.

@jerolimov jerolimov mentioned this pull request Jan 6, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yapei yapei Awaiting requested review from yapei

@christianvogt christianvogt Awaiting requested review from christianvogt

@jeff-phillips-18 jeff-phillips-18 Awaiting requested review from jeff-phillips-18

Assignees

@schituku schituku

@TheRealJon TheRealJon

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/severity-high Referenced Bugzilla bug's severity is high 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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. component/core Related to console core functionality component/dev-console Related to dev-console component/shared Related to console-shared 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.

None yet
7 participants
@openshift-cherrypick-robot @yapei @schituku @TheRealJon @jhadvig @openshift-bot @openshift-merge-robot