Closed bparees closed 6 months ago
@bparees: This pull request references OLS-117 which is a valid jira issue.
Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.
/hold
going to change this to a recording rule
@bparees: This pull request references OLS-117 which is a valid jira issue.
Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.
@bparees: all tests passed!
Full PR test history. Your PR dashboard.
/cc @jan--f /cc @simonpasquier
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: bparees, jan--f
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/hold cancel /cherry-pick release-4.16 /cherry-pick release-4.15
@bparees: once the present PR merges, I will cherry-pick it on top of release-4.16 in a new PR and assign it to you.
@bparees: new pull request created: #2311
@bparees: #2300 failed to apply on top of branch "release-4.15":
Applying: OLS-117: Add OLS metrics to telemetry whitelist
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 OLS-117: Add OLS metrics to telemetry whitelist
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".
[ART PR BUILD NOTIFIER]
This PR has been included in build cluster-monitoring-operator-container-v4.16.0-202404101645.p0.gfe093ae.assembly.stream.el9 for distgit cluster-monitoring-operator. All builds following this will include this PR.
did not see other changelog entries for this sort of change, let me know if one is needed
https://github.com/openshift/lightspeed-operator/pull/86 is the PR that is introducing the recording rules.