search

openshift / cluster-monitoring-operator

Manage the OpenShift monitoring stack
Apache License 2.0
247 stars 360 forks source link

[release-4.16] OCPBUGS-36482: add runbook_url annotations #2404

Closed openshift-cherrypick-robot closed 2 months ago

openshift-cherrypick-robot commented 2 months ago

This is an automated cherry-pick of #2401

/assign simonpasquier

openshift-ci-robot commented 2 months ago

@openshift-cherrypick-robot: Jira Issue OCPBUGS-36406 has been cloned as Jira Issue OCPBUGS-36482. Will retitle bug to link to clone. /retitle [release-4.16] OCPBUGS-36482: add runbook_url annotations

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2404): >This is an automated cherry-pick of #2401 > >/assign simonpasquier Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-ci-robot commented 2 months ago

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-36482, which is invalid:

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2404): >This is an automated cherry-pick of #2401 > >/assign simonpasquier Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
juzhao commented 2 months ago

/jira refresh

openshift-ci-robot commented 2 months ago

@juzhao: This pull request references Jira Issue OCPBUGS-36482, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.16.z) matches configured target version for branch (4.16.z) * bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-36406](https://issues.redhat.com//browse/OCPBUGS-36406) is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA)) * dependent [Jira Issue OCPBUGS-36406](https://issues.redhat.com//browse/OCPBUGS-36406) targets the "4.17.0" version, which is one of the valid target versions: 4.17.0 * bug has dependents

Requesting review from QA contact: /cc @juzhao

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2404#issuecomment-2205709227): >/jira refresh Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
juzhao commented 2 months ago

/label cherry-pick-approved /label qe-approved

openshift-ci-robot commented 2 months ago

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-36482, which is valid.

7 validation(s) were run on this bug * bug is open, matching expected state (open) * bug target version (4.16.z) matches configured target version for branch (4.16.z) * bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST) * release note text is set and does not match the template * dependent bug [Jira Issue OCPBUGS-36406](https://issues.redhat.com//browse/OCPBUGS-36406) is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA)) * dependent [Jira Issue OCPBUGS-36406](https://issues.redhat.com//browse/OCPBUGS-36406) targets the "4.17.0" version, which is one of the valid target versions: 4.17.0 * bug has dependents

Requesting review from QA contact: /cc @juzhao

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2404): >This is an automated cherry-pick of #2401 > >/assign simonpasquier Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
juzhao commented 2 months ago

/test e2e-aws-ovn-techpreview

openshift-ci[bot] commented 2 months ago

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
slashpai commented 2 months ago

/lgtm

openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

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

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](https://github.com/openshift/cluster-monitoring-operator/blob/release-4.16/OWNERS)~~ [slashpai] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
simonpasquier commented 2 months ago

/label backport-risk-assessed

simonpasquier commented 2 months ago

/cherry-pick release-4.15

openshift-cherrypick-robot commented 2 months ago

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

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2404#issuecomment-2208312696): >/cherry-pick release-4.15 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-ci-robot commented 2 months ago

@openshift-cherrypick-robot: Jira Issue OCPBUGS-36482: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-36482 has been moved to the MODIFIED state.

In response to [this](https://github.com/openshift/cluster-monitoring-operator/pull/2404): >This is an automated cherry-pick of #2401 > >/assign simonpasquier Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fcluster-monitoring-operator). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
openshift-cherrypick-robot commented 2 months ago

@simonpasquier: #2404 failed to apply on top of branch "release-4.15":

Applying: OCPBUGS-36406: add runbook_url annotations
Using index info to reconstruct a base tree...
M   assets/prometheus-k8s/prometheus-rule.yaml
M   assets/prometheus-operator/prometheus-rule.yaml
M   jsonnet/utils/sanitize-rules.libsonnet
Falling back to patching base and 3-way merge...
Auto-merging jsonnet/utils/sanitize-rules.libsonnet
CONFLICT (content): Merge conflict in jsonnet/utils/sanitize-rules.libsonnet
Auto-merging assets/prometheus-operator/prometheus-rule.yaml
Auto-merging assets/prometheus-k8s/prometheus-rule.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OCPBUGS-36406: add runbook_url annotations
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](https://github.com/openshift/cluster-monitoring-operator/pull/2404#issuecomment-2208312696): >/cherry-pick release-4.15 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
openshift-bot commented 2 months ago

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-monitoring-operator-container-v4.16.0-202407040837.p0.g08c82d0.assembly.stream.el9 for distgit cluster-monitoring-operator. All builds following this will include this PR.

openshift-merge-robot commented 2 months ago

Fix included in accepted release 4.16.0-0.nightly-2024-07-04-133225