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 1810002: Fix Prometheus query on VMI utilization graphs #4623

Merged

Conversation

danielBelenky
Copy link

@danielBelenky danielBelenky commented Mar 4, 2020

We should not specify the namespace label on the PromQL query because it
is being overwritten anyway by prom-query-proxy to whatever we set in
the namespace query param.

** Related PR on KubeVirt **: (ensures that the labels on our metrics are honored)
kubevirt/kubevirt#3125

Signed-off-by: Daniel Belenky dbelenky@redhat.com

@openshift-ci-robot openshift-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 4, 2020
@openshift-ci-robot
Copy link
Contributor

Hi @danielBelenky. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 4, 2020
@openshift-ci-robot openshift-ci-robot added the component/kubevirt Related to kubevirt-plugin label Mar 4, 2020
@rawagner
Copy link
Contributor

rawagner commented Mar 4, 2020

/ok-to-test

@openshift-ci-robot openshift-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 4, 2020
@danielBelenky danielBelenky changed the title Fix Prometheus query on VMI utilization graphs Bug 1810002: Fix Prometheus query on VMI utilization graphs Mar 4, 2020
@openshift-ci-robot
Copy link
Contributor

@danielBelenky: This pull request references Bugzilla bug 1810002, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is MODIFIED 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 1810002: Fix Prometheus query on VMI utilization graphs

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 added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Mar 4, 2020
@rawagner
Copy link
Contributor

rawagner commented Mar 4, 2020

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Mar 4, 2020
@openshift-ci-robot
Copy link
Contributor

@rawagner: This pull request references Bugzilla bug 1810002, 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.

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

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-robot openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Mar 4, 2020
@kyoto
Copy link
Member

kyoto commented Mar 4, 2020

FYI @openshift/openshift-team-monitoring

@@ -10,28 +10,29 @@ export enum VMQueries {
}

const queries = {
// We don't set namespace explicitly in the PromQL template because it is
// being injected anyway by prom-label-proxy when we query Thanos.
Copy link
Contributor

Choose a reason for hiding this comment

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

fwiw you could potentially still leave it here for clarity, although being a no-op.

Copy link
Author

Choose a reason for hiding this comment

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

I don't mind adding it, but I think that it causes confusion where you specify the namespace in the query and it doesn't really being used... especially in cases where there will be a conflict between what is rendered here and what is present in the query param...

Copy link
Contributor

Choose a reason for hiding this comment

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

sounds good 👍

@rawagner
Copy link
Contributor

rawagner commented Mar 5, 2020

@danielBelenky please fix the linting issues - frontend tests are failing.

We should not specify the namespace label on the PromQL query because it
is being overwritten anyway by prom-query-proxy to whatever we set in
the namespace query param.

Signed-off-by: Daniel Belenky <dbelenky@redhat.com>
@danielBelenky
Copy link
Author

@danielBelenky please fix the linting issues - frontend tests are failing.

Done 👍

@rawagner
Copy link
Contributor

rawagner commented Mar 5, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 5, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danielBelenky, rawagner

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 5, 2020
@rawagner
Copy link
Contributor

rawagner commented Mar 5, 2020

/cherry-pick release-4.4

@openshift-cherrypick-robot

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

In response to this:

/cherry-pick release-4.4

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-merge-robot openshift-merge-robot merged commit ed31f4a into openshift:master Mar 5, 2020
@openshift-ci-robot
Copy link
Contributor

@danielBelenky: All pull requests linked via external trackers have merged. Bugzilla bug 1810002 has been moved to the MODIFIED state.

In response to this:

Bug 1810002: Fix Prometheus query on VMI utilization graphs

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

@rawagner: new pull request created: #4664

In response to this:

/cherry-pick release-4.4

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/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/kubevirt Related to kubevirt-plugin lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants