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 1969963: Recording rule for builds by strategy #1206

Conversation

adambkaplan
Copy link
Contributor

@adambkaplan adambkaplan commented Jun 9, 2021

Aggregate the number of builds run on a cluster by strategy, and export
the recording rule to Telemeter. This will help the Build API team
determine which build strategies are actively being used on a cluster.

The recording rule will produce a time series with the following
strategy labels:

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

@openshift-ci openshift-ci bot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Jun 9, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2021

@adambkaplan: This pull request references Bugzilla bug 1958367, which is invalid:

  • expected the bug to target the "4.7.z" release, but it targets "4.8.0" instead
  • expected the bug to be in one of the following states: NEW, ASSIGNED, ON_DEV, POST, POST, but it is VERIFIED instead
  • expected Bugzilla bug 1958367 to depend on a bug targeting a release in 4.8.0 and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but no dependents were found

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 1958367: Recording rule for builds by strategy

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 bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jun 9, 2021
@adambkaplan
Copy link
Contributor Author

/retitle Bug 1969963: Recording rule for builds by strategy

@openshift-ci openshift-ci bot changed the title Bug 1958367: Recording rule for builds by strategy Bug 1969963: Recording rule for builds by strategy Jun 9, 2021
@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 Jun 9, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2021

@adambkaplan: This pull request references Bugzilla bug 1969963, 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 NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1958367 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 1958367 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 @xiuwang

In response to this:

Bug 1969963: Recording rule for builds by strategy

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 Jun 9, 2021
@openshift-ci openshift-ci bot requested a review from xiuwang June 9, 2021 15:09
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 9, 2021

@adambkaplan: This pull request references Bugzilla bug 1969963, which is valid.

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 POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1958367 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 1958367 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 @xiuwang

In response to this:

Bug 1969963: Recording rule for builds by strategy

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.

Aggregate the number of builds run on a cluster by strategy, and export
the recording rule to Telemeter. This will help the Build API team
determine which build strategies are actively being used on a cluster.

The recording rule will produce a time series with the following
strategy labels:

- docker
- source
- jenkinspipeline
- custom
@wewang58
Copy link

Verified it in version:4.7.0-0.ci.test-2021-06-10-031605-ci-ln-2cnirrb-latest

@wewang58
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 10, 2021
@wewang58
Copy link

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Jun 10, 2021
@adambkaplan
Copy link
Contributor Author

/assign @dgrisonnet

This metric was previously approved by Clayton in #1136

@dgrisonnet
Copy link
Member

/approve
/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 10, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, dgrisonnet, wewang58

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 Jun 10, 2021
@ecordell ecordell added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 11, 2021
@openshift-merge-robot openshift-merge-robot merged commit d672505 into openshift:release-4.7 Jun 11, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 11, 2021

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

Bugzilla bug 1969963 has been moved to the MODIFIED state.

In response to this:

Bug 1969963: Recording rule for builds by strategy

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.

@adambkaplan
Copy link
Contributor Author

/cherry-pick release-4.6

@openshift-cherrypick-robot

@adambkaplan: #1206 failed to apply on top of branch "release-4.6":

Applying: Bug 1969963: Recording rule for builds by strategy
Using index info to reconstruct a base tree...
M	CHANGELOG.md
M	Documentation/data-collection.md
M	Documentation/sample-metrics.md
M	Documentation/telemeter_query
M	assets/prometheus-k8s/rules.yaml
M	jsonnet/rules.jsonnet
M	manifests/0000_50_cluster-monitoring-operator_04-config.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/0000_50_cluster-monitoring-operator_04-config.yaml
CONFLICT (content): Merge conflict in manifests/0000_50_cluster-monitoring-operator_04-config.yaml
Auto-merging jsonnet/rules.jsonnet
Auto-merging assets/prometheus-k8s/rules.yaml
Auto-merging Documentation/telemeter_query
CONFLICT (content): Merge conflict in Documentation/telemeter_query
Auto-merging Documentation/sample-metrics.md
CONFLICT (content): Merge conflict in Documentation/sample-metrics.md
Auto-merging Documentation/data-collection.md
CONFLICT (content): Merge conflict in Documentation/data-collection.md
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
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 1969963: Recording rule for builds by strategy
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.

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants