Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Distributed tracing 2.9 #62410

Merged
merged 1 commit into from Sep 12, 2023
Merged

Distributed tracing 2.9 #62410

merged 1 commit into from Sep 12, 2023

Conversation

max-cx
Copy link
Contributor

@max-cx max-cx commented Jul 14, 2023 •
edited

Version(s):

OpenShift 4.10, 4.11, 4.12, 4.13, 4.14

Issue:

Links to docs preview:

💡 As the PR author on the docs side, I'm happy to set up a call with the merge reviewer and go through it together to make it easier and less overwhelming for the reviewer. Get in touch, mleonov

New content under Distributed tracing:
Distributed tracing release notes:

Reorganized, previously published content under Distributed tracing:
Distributed tracing release notes:

QE review:

  • QE has approved this change.

Additional information:

This PR contains the docs updates for the distributed tracing 2.9 release.
This PR already incorporates changes from the following PRs:

@max-cx max-cx marked this pull request as draft July 14, 2023 15:01
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 14, 2023
This was referenced Jul 14, 2023
Closed
Closed
@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jul 14, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Jul 14, 2023 •
edited

🤖 Updated build preview is available at:
https://62410--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/24463

@openshift-merge-robot openshift-merge-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 18, 2023
@openshift-ci openshift-ci bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 19, 2023
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 22, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 26, 2023
@jeana-redhat jeana-redhat merged commit b0f9c25 into openshift:main Sep 12, 2023
1 check passed
@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.14

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.13

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.12

@jeana-redhat
Copy link
Contributor

/cherrypick enterprise-4.11

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 12, 2023
Merged
@openshift-cherrypick-robot
Copy link

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

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/test-infra repository.

openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/openshift-docs that referenced this pull request Sep 12, 2023
@max-cx
Distributed tracing 2.9 openshift#62410
5c49300
@openshift-cherrypick-robot
Copy link

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

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/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 12, 2023
Merged
@openshift-cherrypick-robot
Copy link

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

Applying: Distributed tracing 2.9 https://github.com/openshift/openshift-docs/pull/62410
.git/rebase-apply/patch:2929: trailing whitespace.
$ oc login --username=<your_username> 
.git/rebase-apply/patch:3298: trailing whitespace.
$ oc login --username=<your_username> 
.git/rebase-apply/patch:1216: new blank line at EOF.
+
.git/rebase-apply/patch:1256: new blank line at EOF.
+
.git/rebase-apply/patch:1837: new blank line at EOF.
+
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc
M	modules/distr-tracing-product-overview.adoc
M	modules/support.adoc
M	service_mesh/v2x/ossm-reference-jaeger.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/v2x/ossm-reference-jaeger.adoc
Auto-merging modules/support.adoc
Removing modules/distr-tracing-rn-technology-preview.adoc
Removing modules/distr-tracing-rn-new-features.adoc
Removing modules/distr-tracing-rn-known-issues.adoc
Removing modules/distr-tracing-rn-fixed-issues.adoc
Auto-merging modules/distr-tracing-product-overview.adoc
CONFLICT (content): Merge conflict in modules/distr-tracing-product-overview.adoc
Removing modules/distr-tracing-change-operator-20.adoc
Removing distr_tracing/distributed-tracing-release-notes.adoc
CONFLICT (content): Merge conflict in distr_tracing/distr_tracing_otel/snippets
CONFLICT (content): Merge conflict in distr_tracing/distr_tracing_otel/_attributes
CONFLICT (content): Merge conflict in distr_tracing/distr_tracing_jaeger/snippets
CONFLICT (content): Merge conflict in distr_tracing/distr_tracing_jaeger/_attributes
Removing distr_tracing/distr_tracing_install/modules
Removing distr_tracing/distr_tracing_install/images
Removing distr_tracing/distr_tracing_install/distr-tracing-deploying-otel.adoc
CONFLICT (modify/delete): distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc deleted in Distributed tracing 2.9 https://github.com/openshift/openshift-docs/pull/62410 and modified in HEAD. Version HEAD of distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc left in tree.
Removing distr_tracing/distr_tracing_config/modules
Removing distr_tracing/distr_tracing_config/images
Auto-merging _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Distributed tracing 2.9 https://github.com/openshift/openshift-docs/pull/62410
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".

In response to this:

/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/test-infra repository.

openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/openshift-docs that referenced this pull request Sep 12, 2023
@max-cx
Distributed tracing 2.9 openshift#62410
b4b341a
@openshift-cherrypick-robot
Copy link

@jeana-redhat: #62410 failed to apply on top of branch "enterprise-4.11":

Applying: Distributed tracing 2.9 https://github.com/openshift/openshift-docs/pull/62410
.git/rebase-apply/patch:2929: trailing whitespace.
$ oc login --username=<your_username> 
.git/rebase-apply/patch:3298: trailing whitespace.
$ oc login --username=<your_username> 
.git/rebase-apply/patch:1216: new blank line at EOF.
+
.git/rebase-apply/patch:1256: new blank line at EOF.
+
.git/rebase-apply/patch:1837: new blank line at EOF.
+
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	_attributes/common-attributes.adoc
M	_topic_maps/_topic_map.yml
M	distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc
M	modules/distr-tracing-deploy-streaming.adoc
M	modules/distr-tracing-product-overview.adoc
M	modules/distr-tracing-rn-known-issues.adoc
M	modules/support.adoc
M	service_mesh/v2x/ossm-reference-jaeger.adoc
Falling back to patching base and 3-way merge...
Auto-merging service_mesh/v2x/ossm-reference-jaeger.adoc
Auto-merging modules/support.adoc
CONFLICT (content): Merge conflict in modules/support.adoc
Removing modules/distr-tracing-rn-technology-preview.adoc
Removing modules/distr-tracing-rn-new-features.adoc
CONFLICT (modify/delete): modules/distr-tracing-rn-known-issues.adoc deleted in Distributed tracing 2.9 https://github.com/openshift/openshift-docs/pull/62410 and modified in HEAD. Version HEAD of modules/distr-tracing-rn-known-issues.adoc left in tree.
Removing modules/distr-tracing-rn-fixed-issues.adoc
Auto-merging modules/distr-tracing-product-overview.adoc
CONFLICT (content): Merge conflict in modules/distr-tracing-product-overview.adoc
Auto-merging modules/distr-tracing-deploy-streaming.adoc
Removing modules/distr-tracing-change-operator-20.adoc
Removing distr_tracing/distributed-tracing-release-notes.adoc
CONFLICT (content): Merge conflict in distr_tracing/distr_tracing_otel/snippets
CONFLICT (content): Merge conflict in distr_tracing/distr_tracing_otel/_attributes
CONFLICT (content): Merge conflict in distr_tracing/distr_tracing_jaeger/snippets
CONFLICT (content): Merge conflict in distr_tracing/distr_tracing_jaeger/_attributes
Removing distr_tracing/distr_tracing_install/modules
Removing distr_tracing/distr_tracing_install/images
Removing distr_tracing/distr_tracing_install/distr-tracing-deploying-otel.adoc
CONFLICT (modify/delete): distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc deleted in Distributed tracing 2.9 https://github.com/openshift/openshift-docs/pull/62410 and modified in HEAD. Version HEAD of distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc left in tree.
Removing distr_tracing/distr_tracing_config/modules
Removing distr_tracing/distr_tracing_config/images
Auto-merging _topic_maps/_topic_map.yml
Auto-merging _attributes/common-attributes.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Distributed tracing 2.9 https://github.com/openshift/openshift-docs/pull/62410
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".

In response to this:

/cherrypick enterprise-4.11

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/test-infra repository.

@max-cx
Copy link
Contributor Author

max-cx commented Sep 26, 2023

/label merge-review-needed

Just asking for manual cherry-picks to enterprise-4.11 and enterprise-4.12 (there 2-3 obvious and simple conflicts to fix).

This is in response to the previous two messages:
#62410 (comment)
#62410 (comment)

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Sep 26, 2023
anarnold97 pushed a commit to anarnold97/openshift-docs that referenced this pull request Sep 26, 2023
@max-cx @anarnold97
Distributed tracing 2.9 openshift#62410
7879661
This was referenced Sep 27, 2023
Merged
Merged
Merged
max-cx added a commit to max-cx/openshift-docs that referenced this pull request Sep 29, 2023
@max-cx
Distributed tracing 2.9 openshift#62410
30796f0 
Conflicts:
	distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc
	modules/distr-tracing-product-overview.adoc
	modules/distr-tracing-rn-known-issues.adoc
	modules/support.adoc
Committing a cherry-pick.
@max-cx max-cx mentioned this pull request Sep 29, 2023
Merged
1 task
max-cx added a commit to max-cx/openshift-docs that referenced this pull request Sep 29, 2023
@max-cx
Distributed tracing 2.9 openshift#62410
1b6bc0c 
Conflicts:
	distr_tracing/distr_tracing_install/distr-tracing-deploying-jaeger.adoc
	modules/distr-tracing-product-overview.adoc
Committing a cherry-pick.
@max-cx max-cx mentioned this pull request Sep 29, 2023
Merged
1 task
@max-cx
Copy link
Contributor Author

max-cx commented Sep 29, 2023 •
edited by jeana-redhat

Test

  • Task 1.
  • Task 2.
  • Task 3.
  • Task 4 that Jeana added later

did that make a line?

@mburke5678 mburke5678 added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Sep 29, 2023
max-cx added a commit to max-cx/openshift-docs that referenced this pull request Oct 30, 2023
@max-cx
Distributed tracing 2.9 openshift#62410
9c96178
DCChadwick pushed a commit to DCChadwick/openshift-docs that referenced this pull request Nov 28, 2023
@max-cx
Distributed tracing 2.9 openshift#62410
6ab0aed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andreasgerstmayr andreasgerstmayr andreasgerstmayr left review comments

@iblancasa iblancasa iblancasa approved these changes

@jeana-redhat jeana-redhat jeana-redhat left review comments

@abhatt-rh abhatt-rh abhatt-rh left review comments

@shipsing shipsing shipsing left review comments

@rubenvp8510 rubenvp8510 rubenvp8510 approved these changes

@pavolloffay pavolloffay pavolloffay approved these changes

@IshwarKanse IshwarKanse IshwarKanse approved these changes

@frzifus frzifus frzifus approved these changes

@deerskindoll deerskindoll deerskindoll approved these changes

Assignees
No one assigned
Labels
branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 merge-review-in-progress Signifies that the merge review team is reviewing this PR merge-review-needed Signifies that the merge review team needs to review this PR peer-review-done Signifies that the peer review team has reviewed this PR size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet