Skip to content

RHIDP-5653: Reorganize Segment/Telemetry instructions into its own category #1034

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

Conversation

jmagak
Copy link
Member

@jmagak jmagak commented Mar 31, 2025

IMPORTANT: Do Not Merge - To be merged by Docs Team Only

Version(s): 1.3, 1.4, 1.5, 1.6, main

Add the relevant labels to the Pull Request.
Issue: https://issues.redhat.com/browse/RHIDP-5653

Preview link:
telemetry

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Mar 31, 2025

@jmagak jmagak requested a review from kim-tsao March 31, 2025 18:13
@jmagak jmagak added Technical review done ⛅ Any procedure has been succesfully tested and removed Technical review needed 🔩 Test all the procedures labels Apr 1, 2025
Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category
@jmagak jmagak force-pushed the RHIDP-5653-Reorganize-Segment/Telemetry-instructions-into-its-own-category branch from 62e45fe to 7678e0b Compare April 24, 2025 14:22
@jmagak jmagak force-pushed the RHIDP-5653-Reorganize-Segment/Telemetry-instructions-into-its-own-category branch from d7874e7 to f5110d8 Compare April 24, 2025 14:58
@jmagak
Copy link
Member Author

jmagak commented May 5, 2025

/cherry-pick release-1.3

@openshift-cherrypick-robot
Copy link
Contributor

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

In response to this:

/cherry-pick release-1.3

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-sigs/prow repository.

@jmagak
Copy link
Member Author

jmagak commented May 5, 2025

/cherry-pick release-1.4

@openshift-cherrypick-robot
Copy link
Contributor

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

In response to this:

/cherry-pick release-1.4

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-sigs/prow repository.

@jmagak
Copy link
Member Author

jmagak commented May 5, 2025

/cherry-pick release-1.5

@openshift-cherrypick-robot
Copy link
Contributor

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

In response to this:

/cherry-pick release-1.5

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-sigs/prow repository.

@jmagak
Copy link
Member Author

jmagak commented May 5, 2025

/cherry-pick release-1.6

@openshift-cherrypick-robot
Copy link
Contributor

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

In response to this:

/cherry-pick release-1.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-sigs/prow repository.

@hmanwani-rh hmanwani-rh merged commit cd54a2e into redhat-developer:main May 5, 2025
3 checks passed
@openshift-cherrypick-robot
Copy link
Contributor

@jmagak: #1034 failed to apply on top of branch "release-1.4":

Applying: Reorganize Segment/Telemetry instructions into its own category
Applying: Reorganize Segment/Telemetry instructions into its own category
Using index info to reconstruct a base tree...
M	modules/analytics/proc-disabling-telemetry-using-helm.adoc
Falling back to patching base and 3-way merge...
Removing modules/analytics/ref-enabling-telemetry.adoc
Removing modules/analytics/ref-disabling-telemetry.adoc
Removing modules/analytics/ref-customizing-telemetry-segment.adoc
Removing modules/analytics/proc-enabling-telemetry-using-operator.adoc
Removing modules/analytics/proc-enabling-telemetry-using-helm.adoc
Removing modules/analytics/proc-disabling-telemetry-using-operator.adoc
CONFLICT (modify/delete): modules/analytics/proc-disabling-telemetry-using-helm.adoc deleted in Reorganize Segment/Telemetry instructions into its own category and modified in HEAD. Version HEAD of modules/analytics/proc-disabling-telemetry-using-helm.adoc left in tree.
Removing modules/analytics/proc-customizing-telemetry-segment-using-operator.adoc
Removing modules/analytics/proc-customizing-telemetry-segment-using-helm.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 Reorganize Segment/Telemetry instructions into its own category

In response to this:

/cherry-pick release-1.4

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-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Contributor

@jmagak: new pull request created: #1135

In response to this:

/cherry-pick release-1.5

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-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Contributor

@jmagak: new pull request created: #1136

In response to this:

/cherry-pick release-1.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-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Contributor

@jmagak: #1034 failed to apply on top of branch "release-1.3":

Applying: Reorganize Segment/Telemetry instructions into its own category
.git/rebase-apply/patch:312: new blank line at EOF.
+
.git/rebase-apply/patch:367: new blank line at EOF.
+
.git/rebase-apply/patch:432: new blank line at EOF.
+
.git/rebase-apply/patch:486: new blank line at EOF.
+
.git/rebase-apply/patch:503: new blank line at EOF.
+
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	assemblies/assembly-rhdh-telemetry.adoc
M	modules/observe/proc-customizing-telemetry-segment-using-operator.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/analytics/proc-customizing-telemetry-segment-using-operator.adoc
Auto-merging assemblies/assembly-rhdh-telemetry.adoc
CONFLICT (content): Merge conflict in assemblies/assembly-rhdh-telemetry.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Reorganize Segment/Telemetry instructions into its own category

In response to this:

/cherry-pick release-1.3

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-sigs/prow repository.

jmagak added a commit to jmagak/red-hat-developers-documentation-rhdh that referenced this pull request May 5, 2025
…tegory (redhat-developer#1034)

* Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

---------

Co-authored-by: GitHub Actions <github-actions@github.com>
jmagak added a commit to jmagak/red-hat-developers-documentation-rhdh that referenced this pull request May 5, 2025
…tegory (redhat-developer#1034)

* Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

---------

Co-authored-by: GitHub Actions <github-actions@github.com>
jmagak added a commit to jmagak/red-hat-developers-documentation-rhdh that referenced this pull request May 5, 2025
…tegory (redhat-developer#1034)

* Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

---------

Co-authored-by: GitHub Actions <github-actions@github.com>
hmanwani-rh pushed a commit that referenced this pull request May 7, 2025
…tegory (#1034) (#1137)

* Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

---------

Co-authored-by: GitHub Actions <github-actions@github.com>
hmanwani-rh pushed a commit that referenced this pull request May 7, 2025
…tegory (#1034) (#1138)

* Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

* Reorganize Segment/Telemetry instructions into its own category

---------

Co-authored-by: GitHub Actions <github-actions@github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants