Bug 1882730: fix cluster:cpu_core_hyperthreading rule for s390x #953

simonpasquier · 2020-10-09T12:29:26Z

On s390x platforms, the core and package labels of the "node_cpu_info" metric are empty which break some recording rules (namely "node_role_os_version_machine:cpu_capacity_cores:sum").

This commit also introduces rule unit tests so we don't regress in the future.

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

openshift-ci-robot · 2020-10-09T12:29:34Z

@simonpasquier: This pull request references Bugzilla bug 1882730, 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.7.0) matches configured target release for branch (4.7.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

[WIP] Bug 1882730: fix cluster:cpu_core_hyperthreading rule for s390x

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 · 2020-10-09T15:25:04Z

/test e2e

simonpasquier · 2020-10-12T11:28:38Z

/assign @smarterclayton

paulfantom · 2020-10-12T11:48:30Z

lgtm from my side

s-urbaniak · 2020-10-26T08:45:59Z

@simonpasquier let's rebase and merge, this lgtm too from my side.

On s390x platforms, the core and package labels of the "node_cpu_info" metric are empty which break some recording rules (namely "node_role_os_version_machine:cpu_capacity_cores:sum"). This commit also introduces rule unit tests so we don't regress in the future. Signed-off-by: Simon Pasquier <[email protected]>

paulfantom · 2020-10-26T09:30:18Z

Seems like there is an issue with generating bindata.

 func assetsPrometheusK8sRulesYamlBytes() ([]byte, error) {
 	return bindataRead(
@@ -1803,7 +1803,7 @@ func assetsPrometheusK8sRulesYaml() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "assets/prometheus-k8s/rules.yaml", size: 100917, mode: os.FileMode(420), modTime: time.Unix(1, 0)}
+	info := bindataFileInfo{name: "assets/prometheus-k8s/rules.yaml", size: 103208, mode: os.FileMode(420), modTime: time.Unix(1, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }

/hold

Signed-off-by: Simon Pasquier <[email protected]>

simonpasquier · 2020-10-26T10:44:49Z

Seems like there is an issue with generating bindata.

It seems like a stale jsonnet/vendor directory...

simonpasquier · 2020-10-26T10:45:08Z

/unhold

simonpasquier · 2020-10-26T12:36:32Z

/retest

simonpasquier · 2020-10-26T13:30:08Z

/retest

simonpasquier · 2020-10-26T16:31:23Z

/retest

simonpasquier · 2020-10-26T16:56:00Z

/retest

simonpasquier · 2020-10-27T07:52:09Z

/retest

simonpasquier · 2020-10-27T09:53:29Z

/bugzilla refresh

openshift-ci-robot · 2020-10-27T09:53:33Z

@simonpasquier: An error was encountered adding this pull request to the external tracker bugs for bug 1882730 on the Bugzilla server at https://bugzilla.redhat.com:

JSONRPC error 1004: The combination of ext_type_* fields matched more than one External Tracker.
Please contact an administrator to resolve this issue, then request a bug refresh with /bugzilla refresh.

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.

simonpasquier · 2020-10-27T09:54:03Z

/retest

s-urbaniak · 2020-10-27T14:13:01Z

/lgtm

openshift-ci-robot · 2020-10-27T14:13:22Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: s-urbaniak, simonpasquier

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~~ [s-urbaniak,simonpasquier]

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 · 2020-10-27T16:52:52Z

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

openshift/cluster-monitoring-operator#953

Bugzilla bug 1882730 has been moved to the MODIFIED state.

In response to this:

Bug 1882730: fix cluster:cpu_core_hyperthreading rule for s390x

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 · 2020-12-04T11:00:25Z

/cherry-pick release-4.6

openshift-cherrypick-robot · 2020-12-04T11:00:31Z

@simonpasquier: #953 failed to apply on top of branch "release-4.6":

Applying: Bug 1882730: fix cluster:cpu_core_hyperthreading rule for s390x
Applying: assets,pkg: regenerate
Using index info to reconstruct a base tree...
M	assets/prometheus-k8s/rules.yaml
M	pkg/manifests/bindata.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/manifests/bindata.go
CONFLICT (content): Merge conflict in pkg/manifests/bindata.go
Auto-merging assets/prometheus-k8s/rules.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,pkg: 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.6

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 do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. labels Oct 9, 2020

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Oct 9, 2020

openshift-ci-robot requested review from paulfantom and pgier October 9, 2020 12:29

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 9, 2020

simonpasquier force-pushed the bz1882730 branch 3 times, most recently from 8b7d148 to c16db62 Compare October 9, 2020 13:34

openshift-ci-robot assigned smarterclayton Oct 12, 2020

simonpasquier changed the title ~~[WIP] Bug 1882730: fix cluster:cpu_core_hyperthreading rule for s390x~~ Bug 1882730: fix cluster:cpu_core_hyperthreading rule for s390x Oct 12, 2020

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 12, 2020

simonpasquier force-pushed the bz1882730 branch from c16db62 to dadae48 Compare October 14, 2020 10:18

paulfantom mentioned this pull request Oct 22, 2020

Bug 1903464: jsonnet: fix recording rules with many-to-many matching errors #965

Merged

2 tasks

openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 24, 2020

simonpasquier force-pushed the bz1882730 branch from dadae48 to edbd400 Compare October 26, 2020 09:18

openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 26, 2020

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 26, 2020

assets,pkg: regenerate

11a3aa6

Signed-off-by: Simon Pasquier <[email protected]>

simonpasquier force-pushed the bz1882730 branch from edbd400 to 11a3aa6 Compare October 26, 2020 10:44

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 26, 2020

openshift-ci-robot assigned s-urbaniak Oct 27, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 27, 2020

openshift-merge-robot merged commit 7a51132 into openshift:master Oct 27, 2020

simonpasquier deleted the bz1882730 branch October 28, 2020 07:46

simonpasquier mentioned this pull request Dec 4, 2020

Bug 1892706: fix cluster:cpu_core_hyperthreading rule for s390x #1005

Merged

2 tasks

Bug 1882730: fix cluster:cpu_core_hyperthreading rule for s390x #953

Bug 1882730: fix cluster:cpu_core_hyperthreading rule for s390x #953

Uh oh!

Conversation

simonpasquier commented Oct 9, 2020

Uh oh!

openshift-ci-robot commented Oct 9, 2020

Uh oh!

simonpasquier commented Oct 9, 2020

Uh oh!

simonpasquier commented Oct 12, 2020

Uh oh!

paulfantom commented Oct 12, 2020

Uh oh!

s-urbaniak commented Oct 26, 2020

Uh oh!

paulfantom commented Oct 26, 2020

Uh oh!

simonpasquier commented Oct 26, 2020

Uh oh!

simonpasquier commented Oct 26, 2020

Uh oh!

simonpasquier commented Oct 26, 2020

Uh oh!

simonpasquier commented Oct 26, 2020

Uh oh!

simonpasquier commented Oct 26, 2020

Uh oh!

simonpasquier commented Oct 26, 2020

Uh oh!

simonpasquier commented Oct 27, 2020

Uh oh!

simonpasquier commented Oct 27, 2020

Uh oh!

openshift-ci-robot commented Oct 27, 2020

Uh oh!

simonpasquier commented Oct 27, 2020

Uh oh!

s-urbaniak commented Oct 27, 2020

Uh oh!

openshift-ci-robot commented Oct 27, 2020

Uh oh!

openshift-ci-robot commented Oct 27, 2020

Uh oh!

simonpasquier commented Dec 4, 2020

Uh oh!

openshift-cherrypick-robot commented Dec 4, 2020

Uh oh!

Uh oh!