Skip to content

OBSDOCS-1629: Flatten the Distributed tracing docs structure #92944

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

Merged
merged 1 commit into from
May 15, 2025

Conversation

max-cx
Copy link
Contributor

@max-cx max-cx commented May 2, 2025

⚠️
This PR changes the nav structure of the affected book, adds admonitions, alters and adds some metadata and cross-reference paths, but does not introduce any new modules or pages (the green file has just been moved and misidentified as new by Git). The affected links have been added to the Redirects Register for OpenShift Docs doc.

Version(s): 4.12, 4.13, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18, 4.19

Issue: https://issues.redhat.com/browse/OBSDOCS-1629

Link to docs preview: https://92944--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/distr_tracing/distr-tracing-rn

image

QE review: N/A

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 2, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 2, 2025

@max-cx: This pull request references OBSDOCS-1629 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 task to target the "4.20.0" version, but no target version was set.

In response to this:

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 2, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 2, 2025

@max-cx: This pull request references OBSDOCS-1629 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 task to target the "4.20.0" version, but no target version was set.

In response to this:

Version(s): 4.12, 4.13, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18, 4.19

Issue: https://issues.redhat.com/browse/OBSDOCS-1629

Link to docs preview:

QE review:

  • N/A

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented May 2, 2025

@max-cx: This pull request references OBSDOCS-1629 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 task to target the "4.20.0" version, but no target version was set.

In response to this:

Version(s): 4.12, 4.13, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18, 4.19

Issue: https://issues.redhat.com/browse/OBSDOCS-1629

Link to docs preview:

QE review:

  • N/A

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented May 2, 2025

@max-cx: This pull request references OBSDOCS-1629 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 task to target the "4.20.0" version, but no target version was set.

In response to this:

Version(s): 4.12, 4.13, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18, 4.19

Issue: https://issues.redhat.com/browse/OBSDOCS-1629

Link to docs preview:

QE review: N/A

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 openshift-eng/jira-lifecycle-plugin repository.

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented May 2, 2025

🤖 Wed May 14 09:37:32 - Prow CI generated the docs preview:
https://92944--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@max-cx max-cx force-pushed the OBSDOCS-1629 branch 7 times, most recently from c029634 to 0d894c4 Compare May 2, 2025 16:58
@max-cx max-cx force-pushed the OBSDOCS-1629 branch 4 times, most recently from 71df7e3 to 3ccb16e Compare May 5, 2025 12:19
@max-cx max-cx force-pushed the OBSDOCS-1629 branch 2 times, most recently from 9ce1c3d to 23705f5 Compare May 5, 2025 18:05
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 7, 2025

@max-cx: This pull request references OBSDOCS-1629 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 task to target the "4.20.0" version, but no target version was set.

In response to this:

Version(s): 4.12, 4.13, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18, 4.19

Issue: https://issues.redhat.com/browse/OBSDOCS-1629

Link to docs preview: https://92944--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/distr_tracing/distr-tracing-rn

image

QE review: N/A

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 openshift-eng/jira-lifecycle-plugin repository.

@max-cx
Copy link
Contributor Author

max-cx commented May 7, 2025

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label May 7, 2025
@mburke5678 mburke5678 added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label May 8, 2025
Copy link

openshift-ci bot commented May 14, 2025

@max-cx: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@max-cx
Copy link
Contributor Author

max-cx commented May 14, 2025

@jeana-redhat, I finally committed the last changes that you requested (about updating the top-of-the-page TIP text to include "information about").
I checked the previews, it's there now.
IMHO, this PR is now ready for the merge.
🙂 In any case, I'm prepared to take the sole responsibility for anything that may go wrong.

@jeana-redhat jeana-redhat merged commit 231f54d into openshift:main May 15, 2025
2 checks passed
@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16
/cherrypick enterprise-4.15
/cherrypick enterprise-4.14
/cherrypick enterprise-4.13
/cherrypick enterprise-4.12

@openshift-cherrypick-robot

@jeana-redhat: #92944 failed to apply on top of branch "enterprise-4.12":

Applying: OBSDOCS-1629: Flatten the Distributed tracing docs structure
.git/rebase-apply/patch:680: trailing whitespace.
* xref:../../security/certificate_types_descriptions/service-ca-certificates.adoc#cert-types-service-ca-certificates[Service CA certificates] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
M	observability/distr_tracing/distr-tracing-rn.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc
M	observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring.adoc
M	observability/overview/index.adoc
M	service_mesh/v2x/ossm-observability.adoc
M	welcome/learn_more_about_openshift.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/learn_more_about_openshift.adoc
CONFLICT (content): Merge conflict in welcome/learn_more_about_openshift.adoc
Auto-merging service_mesh/v2x/ossm-observability.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/ossm-observability.adoc
Auto-merging observability/overview/index.adoc
Removing observability/distr_tracing/distr_tracing_tempo/snippets
Removing observability/distr_tracing/distr_tracing_tempo/modules
Removing observability/distr_tracing/distr_tracing_tempo/images
Removing observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-removing.adoc
Removing observability/distr_tracing/distr_tracing_tempo/_attributes
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc
Removing observability/distr_tracing/distr_tracing_arch/snippets
Removing observability/distr_tracing/distr_tracing_arch/modules
Removing observability/distr_tracing/distr_tracing_arch/images
Removing observability/distr_tracing/distr_tracing_arch/_attributes
Auto-merging observability/distr_tracing/distr-tracing-tempo-configuring.adoc
CONFLICT (content): Merge conflict in observability/distr_tracing/distr-tracing-tempo-configuring.adoc
Auto-merging observability/distr_tracing/distr-tracing-rn.adoc
Auto-merging modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 OBSDOCS-1629: Flatten the Distributed tracing docs structure

In response to this:

/cherrypick enterprise-4.19
/cherrypick enterprise-4.18
/cherrypick enterprise-4.17
/cherrypick enterprise-4.16
/cherrypick enterprise-4.15
/cherrypick enterprise-4.14
/cherrypick enterprise-4.13
/cherrypick enterprise-4.12

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.

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.19

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.18

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.17

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.16

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.15

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.14

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.13

@openshift-cherrypick-robot

@jeana-redhat: new pull request created: #93431

In response to this:

/cherrypick enterprise-4.19

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

@jeana-redhat: #92944 failed to apply on top of branch "enterprise-4.18":

Applying: OBSDOCS-1629: Flatten the Distributed tracing docs structure
.git/rebase-apply/patch:680: trailing whitespace.
* xref:../../security/certificate_types_descriptions/service-ca-certificates.adoc#cert-types-service-ca-certificates[Service CA certificates] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
M	observability/distr_tracing/distr-tracing-rn.adoc
Falling back to patching base and 3-way merge...
Removing observability/distr_tracing/distr_tracing_tempo/snippets
Removing observability/distr_tracing/distr_tracing_tempo/modules
Removing observability/distr_tracing/distr_tracing_tempo/images
Removing observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-removing.adoc
Removing observability/distr_tracing/distr_tracing_tempo/_attributes
Removing observability/distr_tracing/distr_tracing_arch/snippets
Removing observability/distr_tracing/distr_tracing_arch/modules
Removing observability/distr_tracing/distr_tracing_arch/images
Removing observability/distr_tracing/distr_tracing_arch/_attributes
Auto-merging observability/distr_tracing/distr-tracing-rn.adoc
Auto-merging modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
Auto-merging _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 OBSDOCS-1629: Flatten the Distributed tracing docs structure

In response to this:

/cherrypick enterprise-4.18

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

@jeana-redhat: #92944 failed to apply on top of branch "enterprise-4.17":

Applying: OBSDOCS-1629: Flatten the Distributed tracing docs structure
.git/rebase-apply/patch:680: trailing whitespace.
* xref:../../security/certificate_types_descriptions/service-ca-certificates.adoc#cert-types-service-ca-certificates[Service CA certificates] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
M	observability/distr_tracing/distr-tracing-rn.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
M	observability/overview/index.adoc
M	welcome/learn_more_about_openshift.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/learn_more_about_openshift.adoc
CONFLICT (content): Merge conflict in welcome/learn_more_about_openshift.adoc
Auto-merging observability/overview/index.adoc
Removing observability/distr_tracing/distr_tracing_tempo/snippets
Removing observability/distr_tracing/distr_tracing_tempo/modules
Removing observability/distr_tracing/distr_tracing_tempo/images
Removing observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-removing.adoc
Removing observability/distr_tracing/distr_tracing_tempo/_attributes
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
Removing observability/distr_tracing/distr_tracing_arch/snippets
Removing observability/distr_tracing/distr_tracing_arch/modules
Removing observability/distr_tracing/distr_tracing_arch/images
Removing observability/distr_tracing/distr_tracing_arch/_attributes
Auto-merging observability/distr_tracing/distr-tracing-rn.adoc
Auto-merging modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
Auto-merging _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 OBSDOCS-1629: Flatten the Distributed tracing docs structure

In response to this:

/cherrypick enterprise-4.17

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

@jeana-redhat: #92944 failed to apply on top of branch "enterprise-4.16":

Applying: OBSDOCS-1629: Flatten the Distributed tracing docs structure
.git/rebase-apply/patch:680: trailing whitespace.
* xref:../../security/certificate_types_descriptions/service-ca-certificates.adoc#cert-types-service-ca-certificates[Service CA certificates] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
M	observability/distr_tracing/distr-tracing-rn.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc
M	observability/overview/index.adoc
M	service_mesh/v2x/ossm-observability.adoc
M	welcome/learn_more_about_openshift.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/learn_more_about_openshift.adoc
CONFLICT (content): Merge conflict in welcome/learn_more_about_openshift.adoc
Auto-merging service_mesh/v2x/ossm-observability.adoc
Auto-merging observability/overview/index.adoc
Removing observability/distr_tracing/distr_tracing_tempo/snippets
Removing observability/distr_tracing/distr_tracing_tempo/modules
Removing observability/distr_tracing/distr_tracing_tempo/images
Removing observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-removing.adoc
Removing observability/distr_tracing/distr_tracing_tempo/_attributes
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
Removing observability/distr_tracing/distr_tracing_arch/snippets
Removing observability/distr_tracing/distr_tracing_arch/modules
Removing observability/distr_tracing/distr_tracing_arch/images
Removing observability/distr_tracing/distr_tracing_arch/_attributes
Auto-merging observability/distr_tracing/distr-tracing-rn.adoc
Auto-merging modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 OBSDOCS-1629: Flatten the Distributed tracing docs structure

In response to this:

/cherrypick enterprise-4.16

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

@jeana-redhat: #92944 failed to apply on top of branch "enterprise-4.15":

Applying: OBSDOCS-1629: Flatten the Distributed tracing docs structure
.git/rebase-apply/patch:680: trailing whitespace.
* xref:../../security/certificate_types_descriptions/service-ca-certificates.adoc#cert-types-service-ca-certificates[Service CA certificates] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
M	observability/distr_tracing/distr-tracing-rn.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc
M	observability/overview/index.adoc
M	service_mesh/v2x/ossm-observability.adoc
M	welcome/learn_more_about_openshift.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/learn_more_about_openshift.adoc
CONFLICT (content): Merge conflict in welcome/learn_more_about_openshift.adoc
Auto-merging service_mesh/v2x/ossm-observability.adoc
Auto-merging observability/overview/index.adoc
Removing observability/distr_tracing/distr_tracing_tempo/snippets
Removing observability/distr_tracing/distr_tracing_tempo/modules
Removing observability/distr_tracing/distr_tracing_tempo/images
Removing observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-removing.adoc
Removing observability/distr_tracing/distr_tracing_tempo/_attributes
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
Removing observability/distr_tracing/distr_tracing_arch/snippets
Removing observability/distr_tracing/distr_tracing_arch/modules
Removing observability/distr_tracing/distr_tracing_arch/images
Removing observability/distr_tracing/distr_tracing_arch/_attributes
Auto-merging observability/distr_tracing/distr-tracing-rn.adoc
Auto-merging modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 OBSDOCS-1629: Flatten the Distributed tracing docs structure

In response to this:

/cherrypick enterprise-4.15

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

@jeana-redhat: #92944 failed to apply on top of branch "enterprise-4.14":

Applying: OBSDOCS-1629: Flatten the Distributed tracing docs structure
.git/rebase-apply/patch:680: trailing whitespace.
* xref:../../security/certificate_types_descriptions/service-ca-certificates.adoc#cert-types-service-ca-certificates[Service CA certificates] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
M	observability/distr_tracing/distr-tracing-rn.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc
M	observability/overview/index.adoc
M	service_mesh/v2x/ossm-observability.adoc
M	welcome/learn_more_about_openshift.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/learn_more_about_openshift.adoc
CONFLICT (content): Merge conflict in welcome/learn_more_about_openshift.adoc
Auto-merging service_mesh/v2x/ossm-observability.adoc
Auto-merging observability/overview/index.adoc
Removing observability/distr_tracing/distr_tracing_tempo/snippets
Removing observability/distr_tracing/distr_tracing_tempo/modules
Removing observability/distr_tracing/distr_tracing_tempo/images
Removing observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-removing.adoc
Removing observability/distr_tracing/distr_tracing_tempo/_attributes
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
Removing observability/distr_tracing/distr_tracing_arch/snippets
Removing observability/distr_tracing/distr_tracing_arch/modules
Removing observability/distr_tracing/distr_tracing_arch/images
Removing observability/distr_tracing/distr_tracing_arch/_attributes
Auto-merging observability/distr_tracing/distr-tracing-rn.adoc
Auto-merging modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 OBSDOCS-1629: Flatten the Distributed tracing docs structure

In response to this:

/cherrypick enterprise-4.14

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

@jeana-redhat: #92944 failed to apply on top of branch "enterprise-4.13":

Applying: OBSDOCS-1629: Flatten the Distributed tracing docs structure
.git/rebase-apply/patch:680: trailing whitespace.
* xref:../../security/certificate_types_descriptions/service-ca-certificates.adoc#cert-types-service-ca-certificates[Service CA certificates] 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
M	observability/distr_tracing/distr-tracing-rn.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
M	observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc
M	observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-configuring.adoc
M	observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-installing.adoc
M	observability/overview/index.adoc
M	service_mesh/v2x/ossm-observability.adoc
M	welcome/learn_more_about_openshift.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/learn_more_about_openshift.adoc
CONFLICT (content): Merge conflict in welcome/learn_more_about_openshift.adoc
Auto-merging service_mesh/v2x/ossm-observability.adoc
CONFLICT (content): Merge conflict in service_mesh/v2x/ossm-observability.adoc
Auto-merging observability/overview/index.adoc
Removing observability/distr_tracing/distr_tracing_tempo/snippets
Removing observability/distr_tracing/distr_tracing_tempo/modules
Removing observability/distr_tracing/distr_tracing_tempo/images
Removing observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-removing.adoc
Removing observability/distr_tracing/distr_tracing_tempo/_attributes
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-updating.adoc
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-installing.adoc
Auto-merging observability/distr_tracing/distr_tracing_jaeger/distr-tracing-jaeger-configuring.adoc
Removing observability/distr_tracing/distr_tracing_arch/snippets
Removing observability/distr_tracing/distr_tracing_arch/modules
Removing observability/distr_tracing/distr_tracing_arch/images
Removing observability/distr_tracing/distr_tracing_arch/_attributes
Auto-merging observability/distr_tracing/distr-tracing-tempo-installing.adoc
CONFLICT (content): Merge conflict in observability/distr_tracing/distr-tracing-tempo-installing.adoc
Auto-merging observability/distr_tracing/distr-tracing-tempo-configuring.adoc
CONFLICT (content): Merge conflict in observability/distr_tracing/distr-tracing-tempo-configuring.adoc
Auto-merging observability/distr_tracing/distr-tracing-rn.adoc
Auto-merging modules/distr-tracing-tempo-object-storage-setup-ibm-storage.adoc
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
CONFLICT (content): Merge conflict in _attributes/common-attributes.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 OBSDOCS-1629: Flatten the Distributed tracing docs structure

In response to this:

/cherrypick enterprise-4.13

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 branch/enterprise-4.16 branch/enterprise-4.17 branch/enterprise-4.18 branch/enterprise-4.19 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants