Closed simonpasquier closed 1 month ago
@simonpasquier: This pull request references Jira Issue OCPBUGS-39246, 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.
/jira refresh
@simonpasquier: This pull request references Jira Issue OCPBUGS-39246, which is valid. The bug has been moved to the POST state.
Requesting review from QA contact: /cc @juzhao
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: machine424, simonpasquier
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/retest-required
Remaining retests: 0 against base HEAD 4588b559aa2d15b84f3975cfb61b762d1403d5c5 and 2 for PR HEAD 9cf5341b055d308857459dcfe057034fddae800d in total
@simonpasquier: all tests passed!
Full PR test history. Your PR dashboard.
@simonpasquier: Jira Issue OCPBUGS-39246: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-39246 has been moved to the MODIFIED state.
[ART PR BUILD NOTIFIER]
Distgit: cluster-monitoring-operator This PR has been included in build cluster-monitoring-operator-container-v4.18.0-202409122110.p0.g1e0ad4e.assembly.stream.el9. All builds following this will include this PR.
/cherrypick release-4.17 release-4.16 release-4.15 release-4.14
@simonpasquier: #2466 failed to apply on top of branch "release-4.17":
Applying: OCPBUGS-39246: filter alerts sent to Telemeter
Using index info to reconstruct a base tree...
M Documentation/data-collection.md
M Documentation/sample-metrics.md
M Documentation/telemetry/telemeter_query
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
Auto-merging Documentation/telemetry/telemeter_query
CONFLICT (content): Merge conflict in Documentation/telemetry/telemeter_query
Auto-merging Documentation/sample-metrics.md
CONFLICT (content): Merge conflict in Documentation/sample-metrics.md
Auto-merging Documentation/data-collection.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 OCPBUGS-39246: filter alerts sent to Telemeter
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".
/jira backport release-4.17 release-4.16 release-4.15 release-4.14
This change ensures that only alerts with a valid severity value are sent to Telemeter.
Valid severities are defined in https://github.com/openshift/enhancements/blob/master/enhancements/monitoring/alerting-consistency.md