Bug 1952149: oc adm top reporting unknown status for Windows node #1130

mansikulkarni96 · 2021-04-21T22:00:28Z

This PR overrides the nodeQueries in the prometheus-adapter config-map to include windows_exporter queries in order to retrieve resource metrics: CPU and memory for Windows nodes.
This fix has been merged upstream in kube-prometheus
Ran commands:
make generate

This PR has been opened in an effort to merge this fix into release-4.7 since it is not included in release-0.7 of kube-prometheus.

I added CHANGELOG entry for this change.

No user facing changes, so no entry in CHANGELOG was needed.

openshift-ci-robot · 2021-04-21T22:00:33Z

@mansikulkarni96: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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 · 2021-04-21T22:04:19Z

@mansikulkarni96: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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.

aravindhp · 2021-04-21T22:43:56Z

/cc @dgrisonnet

openshift-ci-robot · 2021-04-21T23:21:02Z

@mansikulkarni96: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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.

dgrisonnet · 2021-04-22T08:16:02Z

jsonnet/main.jsonnet

@@ -96,6 +96,35 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') +
               },
               prometheusAdapter+:: {
                 prometheusURL: 'https://prometheus-k8s.openshift-monitoring.svc:9091',
+                 config: {


In jsonnet you can actually override deeply nested fields with +:. In your case since you only want to modify the node queries, you can do something like that:

config+: { resourceRules+: { cpu+: { nodeQuery: 'your change', }, }, },

thanks for the tip @dgrisonnet , that definitely reduces the code duplication here, I have pushed the changes PTAL.

This commit overrides the nodeQueries in the prometheus-adapter config to include windows_exporter queries in order to retrieve resource metrics: CPU and memory for Windows nodes. This fix has been merged upstream in kube-prometheus prometheus-operator/kube-prometheus#1058 Signed-off-by: Mansi Kulkarni <mankulka@redhat.com>

dgrisonnet · 2021-04-22T14:52:21Z

/lgtm
/approve

Thank you for taking care of this @mansikulkarni96 🙂

openshift-ci-robot · 2021-04-22T14:52:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgrisonnet, mansikulkarni96

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~~ [dgrisonnet]

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

openshift-bot · 2021-04-23T01:00:44Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-04-23T01:00:48Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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 · 2021-04-24T01:01:06Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-04-24T01:01:09Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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 · 2021-04-25T01:00:11Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-04-25T01:00:15Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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 · 2021-04-26T01:00:25Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-04-26T01:00:36Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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 · 2021-04-27T01:00:55Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-04-27T01:00:59Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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 · 2021-04-28T01:01:13Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-04-28T01:01:17Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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 · 2021-04-29T01:01:06Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-04-29T01:01:10Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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 · 2021-04-30T01:00:34Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-04-30T01:00:38Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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 · 2021-05-01T01:00:40Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-05-01T01:00:43Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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 · 2021-05-02T01:00:38Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-05-02T01:00:41Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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 · 2021-05-03T01:00:19Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-05-03T01:00:24Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is POST 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:

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 · 2021-05-04T01:00:26Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-05-04T01:00:41Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA 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:

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 · 2021-05-05T01:01:08Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-05-05T01:01:12Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA 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:

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 · 2021-05-06T01:01:11Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci-robot · 2021-05-06T01:01:15Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA 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:

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 · 2021-05-07T01:01:06Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2021-05-07T01:01:09Z

@openshift-bot: This pull request references Bugzilla bug 1952149, which is invalid:

expected dependent Bugzilla bug 1920903 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA 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:

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.

simonpasquier · 2021-05-07T08:51:13Z

/bugzilla refresh

openshift-ci · 2021-05-07T08:51:29Z

@simonpasquier: This pull request references Bugzilla bug 1952149, 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.7.z) matches configured target release for branch (4.7.z)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
dependent bug Bugzilla bug 1920903 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
dependent Bugzilla bug 1920903 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
bug has dependents

Requesting review from QA contact:
/cc @juzhao

In response to this:

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.

aravindhp · 2021-05-14T02:30:37Z

/test e2e-agnostic

openshift-bot · 2021-05-14T03:53:44Z

/retest

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

openshift-ci · 2021-05-14T04:00:39Z

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

openshift/cluster-monitoring-operator#1130

Bugzilla bug 1952149 has been moved to the MODIFIED state.

In response to this:

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 added bugzilla/severity-high Referenced Bugzilla bug's severity is high 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 Apr 21, 2021

openshift-ci-robot requested review from s-urbaniak and simonpasquier April 21, 2021 22:00

mansikulkarni96 mentioned this pull request Apr 21, 2021

Bug 1946865: Update kube prometheus and related assets #1127

Merged

2 tasks

openshift-ci-robot requested a review from dgrisonnet April 21, 2021 22:44

dgrisonnet reviewed Apr 22, 2021

View reviewed changes

mansikulkarni96 force-pushed the backport-windows branch from 4950f0d to 1c9b296 Compare April 22, 2021 14:29

openshift-ci-robot assigned dgrisonnet Apr 22, 2021

openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 22, 2021

openshift-ci bot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 7, 2021

openshift-ci bot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label May 7, 2021

openshift-ci bot requested a review from juzhao May 7, 2021 08:51

mrunalp added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 14, 2021

openshift-merge-robot merged commit b73649a into openshift:release-4.7 May 14, 2021

Bug 1952149: oc adm top reporting unknown status for Windows node #1130

Bug 1952149: oc adm top reporting unknown status for Windows node #1130

Conversation

mansikulkarni96 commented Apr 21, 2021 • edited

openshift-ci-robot commented Apr 21, 2021

openshift-ci-robot commented Apr 21, 2021

aravindhp commented Apr 21, 2021

openshift-ci-robot commented Apr 21, 2021

dgrisonnet Apr 22, 2021

Choose a reason for hiding this comment

mansikulkarni96 Apr 22, 2021

Choose a reason for hiding this comment

dgrisonnet commented Apr 22, 2021

openshift-ci-robot commented Apr 22, 2021

openshift-bot commented Apr 23, 2021

openshift-ci-robot commented Apr 23, 2021

openshift-bot commented Apr 24, 2021

openshift-ci-robot commented Apr 24, 2021

openshift-bot commented Apr 25, 2021

openshift-ci-robot commented Apr 25, 2021

openshift-bot commented Apr 26, 2021

openshift-ci-robot commented Apr 26, 2021

openshift-bot commented Apr 27, 2021

openshift-ci-robot commented Apr 27, 2021

openshift-bot commented Apr 28, 2021

openshift-ci-robot commented Apr 28, 2021

openshift-bot commented Apr 29, 2021

openshift-ci-robot commented Apr 29, 2021

openshift-bot commented Apr 30, 2021

openshift-ci-robot commented Apr 30, 2021

openshift-bot commented May 1, 2021

openshift-ci-robot commented May 1, 2021

openshift-bot commented May 2, 2021

openshift-ci-robot commented May 2, 2021

openshift-bot commented May 3, 2021

openshift-ci-robot commented May 3, 2021

openshift-bot commented May 4, 2021

openshift-ci-robot commented May 4, 2021

openshift-bot commented May 5, 2021

openshift-ci-robot commented May 5, 2021

openshift-bot commented May 6, 2021

openshift-ci-robot commented May 6, 2021

openshift-bot commented May 7, 2021

openshift-ci bot commented May 7, 2021

simonpasquier commented May 7, 2021

openshift-ci bot commented May 7, 2021

aravindhp commented May 14, 2021

openshift-bot commented May 14, 2021

openshift-ci bot commented May 14, 2021

mansikulkarni96 commented Apr 21, 2021 •

edited