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.

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

TRACING-3258 | Document troubleshooting OTEL #64772

Merged
merged 1 commit into from
Sep 22, 2023

Conversation

pavolloffay
Copy link
Member

@pavolloffay pavolloffay commented Sep 15, 2023

Version(s):

4.11
4.12
4.13
4.14

Issue:

https://issues.redhat.com/browse/TRACING-3258

Link to docs preview:

https://64772--docspreview.netlify.app/

QE review:

  • QE has approved this change.

Additional information:

@pavolloffay
Copy link
Member Author

This can be merged ASAP, it is already present in RHOSDT 2.9

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 15, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Sep 15, 2023

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

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

@IshwarKanse
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 20, 2023
_topic_maps/_topic_map.yml Outdated Show resolved Hide resolved
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 20, 2023
@openshift-ci
Copy link

openshift-ci bot commented Sep 20, 2023

New changes are detected. LGTM label has been removed.

@openshift-ci openshift-ci bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 20, 2023
@pavolloffay pavolloffay force-pushed the otel-troubleshoot branch 2 times, most recently from 0c14ebf to ee26775 Compare September 22, 2023 12:48
Signed-off-by: Pavol Loffay <p.loffay@gmail.com>
@max-cx
Copy link
Contributor

max-cx commented Sep 22, 2023

@max-cx
Copy link
Contributor

max-cx commented Sep 22, 2023

Peer/language review is done.

@max-cx
Copy link
Contributor

max-cx commented Sep 22, 2023

/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 Sep 22, 2023
@michaelryanpeter
Copy link
Contributor

/cherrypick enterprise-4.14

@michaelryanpeter
Copy link
Contributor

/cherrypick enterprise-4.13

@michaelryanpeter
Copy link
Contributor

/cherrypick enterprise-4.12

@michaelryanpeter
Copy link
Contributor

/cherrypick enterprise-4.11

@openshift-cherrypick-robot

@michaelryanpeter: new pull request created: #65142

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

@michaelryanpeter: new pull request created: #65143

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

@michaelryanpeter: #64772 failed to apply on top of branch "enterprise-4.12":

Applying: Document troubleshooting OTEL
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Document troubleshooting OTEL
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

@michaelryanpeter: #64772 failed to apply on top of branch "enterprise-4.11":

Applying: Document troubleshooting OTEL
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
Falling back to patching base and 3-way merge...
Auto-merging _topic_maps/_topic_map.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Document troubleshooting OTEL
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.

[id="distr-tracing-otel-troubleshoot-logs_{context}"]
= Getting the OpenTelemetry Collector logs

You can get the logs for the OpenTelemetry Collector as follows.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this introduction could be a little more specific. Maybe something like, "You can specify your desired log level for the OpenTelemetry Collector as shown in the following example..."

@michaelryanpeter
Copy link
Contributor

@max-cx It looks like 4.11 and 4.12 will need manual cherry picks. Would you be able to take care of this?

@max-cx
Copy link
Contributor

max-cx commented Sep 25, 2023

@michaelryanpeter

  1. Thank you so much for your review. I created a Jira and added it to my epic for the next release, so I'll make sure to update the docs with your suggestions.
  2. Regarding cherry-picking to 4.11 and 4.12, I am a newbie to the OpenShift docs, so I unfortunately don't have any merge rights yet.

@michaelryanpeter
Copy link
Contributor

michaelryanpeter commented Sep 26, 2023

@max-cx: NP! There are instructions for creating manual cherry picks in the OpenShift Docs manual. You have to scroll a little bit, but the instructions are very detailed and should walk you through it. If you run into issues, please reach out in the team Slack channel.

Please make sure you prepend the heading of the PR with [enterprise-4.*] and reference the commit message and original PR at the top of comment zero. These points are in the instructions but are easy to miss sometimes. They make the manual cherrypicks consistent with the cherrypick bot. They also make it easier for the merge review squad to recognize that these are manual CPs.

Once you have created the manual CPs, put the /label merge-review-needed on.

@max-cx
Copy link
Contributor

max-cx commented Sep 27, 2023

@michaelryanpeter, thank you so much for the link to the docs manual.

Unfortunately, I don't have commit rights, so I can't push my cherry-picks into any branch in this repo.

Also, these cherry-picks are currently blocked by the parent PR (#62410) having not been cherry-picked yet.

@max-cx
Copy link
Contributor

max-cx commented Oct 9, 2023

The parent PR (#62410) has since been cherry-picked.

This PR is ready for the cherry-picks.

@max-cx
Copy link
Contributor

max-cx commented Oct 9, 2023

/cherry-pick enterprise-4.11

@max-cx
Copy link
Contributor

max-cx commented Oct 9, 2023

/cherry-pick enterprise-4.12

@max-cx
Copy link
Contributor

max-cx commented Oct 9, 2023

/cherry-pick enterprise-4.13

@max-cx
Copy link
Contributor

max-cx commented Oct 9, 2023

/cherry-pick enterprise-4.14

@openshift-cherrypick-robot

@max-cx: new pull request created: #65927

In response to this:

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

@openshift-cherrypick-robot

@max-cx: new pull request created: #65928

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

@openshift-cherrypick-robot

@max-cx: new pull request could not be created: failed to create pull request against openshift/openshift-docs#enterprise-4.13 from head openshift-cherrypick-robot:cherry-pick-64772-to-enterprise-4.13: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"No commits between openshift:enterprise-4.13 and openshift-cherrypick-robot:cherry-pick-64772-to-enterprise-4.13"}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request"}

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

@openshift-cherrypick-robot

@max-cx: new pull request could not be created: failed to create pull request against openshift/openshift-docs#enterprise-4.14 from head openshift-cherrypick-robot:cherry-pick-64772-to-enterprise-4.14: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"No commits between openshift:enterprise-4.14 and openshift-cherrypick-robot:cherry-pick-64772-to-enterprise-4.14"}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request"}

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

@max-cx
Copy link
Contributor

max-cx commented Oct 9, 2023

@michaelryanpeter, please see
#64772 (comment)
and
#64772 (comment)
above.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/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.

None yet

6 participants