Skip to content

[enterprise-4.16] OBSDOCS-1629: Flatten the Distributed tracing docs structure #93470

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 28, 2025

Conversation

max-cx
Copy link
Contributor

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

Version(s): OCP 4.16

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

Link to docs preview: See #92944

QE review: N/A

Additional information: Cherry-pick of #92944

@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 15, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 15, 2025

@max-cx: This pull request references OBSDOCS-1629 which is a valid jira issue.

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 15, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 15, 2025

@max-cx: This pull request references OBSDOCS-1629 which is a valid jira issue.

In response to this:

Version(s): OCP 4.16

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

Link to docs preview: See #92944

QE review: N/A

Additional information: Cherry-pick of #92944

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 16, 2025

/retest

@max-cx
Copy link
Contributor Author

max-cx commented May 16, 2025

/test

Copy link

openshift-ci bot commented May 16, 2025

@max-cx: The /test command needs one or more targets.
The following commands are available to trigger required jobs:

/test validate-asciidoc
/test validate-portal

Use /test all to run all jobs.

In response to this:

/test

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.

@max-cx
Copy link
Contributor Author

max-cx commented May 16, 2025

/test all

@max-cx
Copy link
Contributor Author

max-cx commented May 16, 2025

/retest

@max-cx max-cx force-pushed the enterprise-4.16 branch 6 times, most recently from 5cff668 to b069fdf Compare May 20, 2025 19:16
@max-cx
Copy link
Contributor Author

max-cx commented May 21, 2025

/retest

1 similar comment
@max-cx
Copy link
Contributor Author

max-cx commented May 22, 2025

/retest

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented May 27, 2025

🤖 Tue May 27 19:33:40 - Prow CI generated the docs preview:
https://93470--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@max-cx max-cx force-pushed the enterprise-4.16 branch 2 times, most recently from f1e1009 to 6601755 Compare May 27, 2025 18:58
Copy link

openshift-ci bot commented May 27, 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 28, 2025

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label May 28, 2025
@stevsmit stevsmit removed the merge-review-needed Signifies that the merge review team needs to review this PR label May 28, 2025
@stevsmit stevsmit merged commit 2d975ba into openshift:enterprise-4.16 May 28, 2025
2 checks passed
@stevsmit
Copy link
Member

/cherry-pick enterprise-4.15

@openshift-cherrypick-robot

@stevsmit: new pull request created: #93881

In response to this:

/cherry-pick 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.

@stevsmit
Copy link
Member

/cherry-pick enterprise-4.14

@openshift-cherrypick-robot

@stevsmit: new pull request created: #93882

In response to this:

/cherry-pick 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.

@stevsmit
Copy link
Member

/cherry-pick enterprise-4.13

@stevsmit
Copy link
Member

/cherry-pick enterprise-4.12

@openshift-cherrypick-robot

@stevsmit: #93470 failed to apply on top of branch "enterprise-4.13":

Applying: OBSDOCS-1629: Flatten the Distributed tracing docs structure
.git/rebase-apply/patch:743: 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	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_tempo/distr-tracing-tempo-configuring.adoc
M	observability/distr_tracing/distr_tracing_tempo/distr-tracing-tempo-installing.adoc
M	observability/otel/otel-configuring-metrics-for-monitoring-stack.adoc
M	observability/otel/otel-configuring-otelcol-metrics.adoc
M	observability/otel/otel-installing.adoc
M	observability/overview/index.adoc
M	service_mesh/v2x/ossm-observability.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.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
Auto-merging observability/otel/otel-installing.adoc
Auto-merging observability/otel/otel-configuring-otelcol-metrics.adoc
Auto-merging observability/otel/otel-configuring-metrics-for-monitoring-stack.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
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 _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:

/cherry-pick 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.

@openshift-cherrypick-robot

@stevsmit: #93470 failed to apply on top of branch "enterprise-4.12":

Applying: OBSDOCS-1629: Flatten the Distributed tracing docs structure
.git/rebase-apply/patch:743: 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	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_tempo/distr-tracing-tempo-configuring.adoc
M	observability/otel/otel-configuring-metrics-for-monitoring-stack.adoc
M	observability/otel/otel-configuring-otelcol-metrics.adoc
M	observability/overview/index.adoc
M	service_mesh/v2x/ossm-observability.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.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
Auto-merging observability/otel/otel-configuring-otelcol-metrics.adoc
Auto-merging observability/otel/otel-configuring-metrics-for-monitoring-stack.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
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 _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:

/cherry-pick 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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.

5 participants