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

OBSDOCS-152: Restructuring log visualization docs #67346

Merged
merged 1 commit into from Nov 7, 2023
Merged

OBSDOCS-152: Restructuring log visualization docs #67346

merged 1 commit into from Nov 7, 2023

Conversation

abrennan89
Copy link
Contributor

@abrennan89 abrennan89 commented Nov 2, 2023 •
edited

@abrennan89 abrennan89 added this to the Continuous Release milestone Nov 2, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 2, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 2, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-152 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 epic to target the "4.15.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

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

Link to docs preview:

QE review:

  • QE has approved this change.

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-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 2, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Nov 2, 2023 •
edited

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

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

@abrennan89 abrennan89 force-pushed the visual-logs branch 3 times, most recently from dd414a2 to 55eee92 Compare November 3, 2023 14:47
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 3, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-152 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 epic to target the "4.15.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

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

Link to docs preview:

QE review:

  • QE has approved this change.

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.

@abrennan89
Copy link
Contributor Author

FYI @Preeticp updates will be required to https://docs.openshift.com/pipelines/1.12/records/viewing-pipeline-logs-using-the-openshift-logging-operator.html to keep the links up to date with our new structure for logging docs. In fact, that section as a whole should be updated to move away from using the old EFK stack to using the new Vector/Loki stack.

@abrennan89 abrennan89 force-pushed the visual-logs branch 3 times, most recently from b8e3cc8 to bed48ca Compare November 3, 2023 16:02
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 3, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-152 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 epic to target the "4.15.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

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

Link to docs preview:

QE review:

  • QE has approved this change.

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-ci-robot
Copy link

openshift-ci-robot commented Nov 3, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-152 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 epic to target the "4.15.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

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

Link to docs preview:

QE review:

  • QE has approved this change.

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.

@abrennan89 abrennan89 changed the title [WIP] OBSDOCS-152: Restructuring log visualization docs OBSDOCS-152: Restructuring log visualization docs Nov 3, 2023
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 3, 2023
@anpingli
Copy link

anpingli commented Nov 6, 2023 •
edited

@abrennan89 I don't see a sub-items which display lokistack logs via Admin/Dev Console under https://67346--docspreview.netlify.app/openshift-enterprise/latest/logging/log_visualization/log-visualization. Is there another PR about lokistack visualization?

@abrennan89
Copy link
Contributor Author

@anpingli this PR is just restructuring existing content. I didn't see any content for Lokistack visualization to move here.
If there's existing content in the docs that you feel should be in this section, please provide a link. Otherwise adding this new content would need to be a separate follow up Jira, since the idea for this PR is only restructuring, not closing content gaps.

@anpingli
Copy link

anpingli commented Nov 6, 2023

LGTM

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 6, 2023 •
edited by openshift-ci bot

@abrennan89: This pull request references OBSDOCS-152 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 epic to target the "4.15.0" version, but no target version was set.

In response to this:

Version(s):
4.11+

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

Link to docs preview:

QE review:

  • QE has approved this change.

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.

@lpettyjo lpettyjo added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Nov 7, 2023
@lpettyjo lpettyjo self-requested a review November 7, 2023 13:29
lpettyjo
lpettyjo reviewed Nov 7, 2023
View reviewed changes
Copy link
Contributor

@lpettyjo lpettyjo left a comment

Choose a reason for hiding this comment

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

Otherwise, LGTM!

logging/log_visualization/log-visualization.adoc Outdated Show resolved Hide resolved
logging/log_visualization/logging-kibana.adoc Outdated Show resolved Hide resolved
modules/cluster-logging-dashboards-es.adoc Outdated Show resolved Hide resolved
@lpettyjo lpettyjo added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Nov 7, 2023
@abrennan89 abrennan89 added the merge-review-needed Signifies that the merge review team needs to review this PR label Nov 7, 2023
@jeana-redhat jeana-redhat added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Nov 7, 2023
jeana-redhat
jeana-redhat approved these changes Nov 7, 2023
View reviewed changes
Copy link
Contributor

@jeana-redhat jeana-redhat left a comment

Choose a reason for hiding this comment

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

Approving 👍

@jeana-redhat jeana-redhat removed 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 labels Nov 7, 2023
@abrennan89 abrennan89 merged commit f15e899 into openshift:main Nov 7, 2023
1 check passed
@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.11

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.12

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.13

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.14

@abrennan89
Copy link
Contributor Author

/cherrypick enterprise-4.15

@openshift-cherrypick-robot
Copy link

@abrennan89: #67346 failed to apply on top of branch "enterprise-4.11":

Applying: OBSDOCS-152: Restructuring log visualization docs
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	architecture/index.adoc
M	logging/cluster-logging-dashboards.adoc
M	logging/cluster-logging-deploying.adoc
M	modules/cluster-logging-dashboards-access.adoc
Falling back to patching base and 3-way merge...
Removing modules/cluster-logging-view-cluster-dashboards.adoc
Auto-merging modules/cluster-logging-dashboards-access.adoc
Removing modules/cluster-logging-about-visualizer.adoc
Removing logging/viewing-resource-logs.adoc
Auto-merging logging/log_visualization/cluster-logging-dashboards.adoc
CONFLICT (content): Merge conflict in logging/log_visualization/cluster-logging-dashboards.adoc
Removing logging/config/cluster-logging-visualizer.adoc
Removing logging/cluster-logging-visualizer.adoc
Auto-merging logging/cluster-logging-deploying.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-deploying.adoc
Auto-merging architecture/index.adoc
CONFLICT (content): Merge conflict in architecture/index.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
CONFLICT (content): Merge conflict in _topic_maps/_topic_map_osd.yml
Auto-merging _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 OBSDOCS-152: Restructuring log visualization docs
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.

@openshift-cherrypick-robot
Copy link

@abrennan89: #67346 failed to apply on top of branch "enterprise-4.12":

Applying: OBSDOCS-152: Restructuring log visualization docs
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	architecture/index.adoc
M	logging/cluster-logging-dashboards.adoc
Falling back to patching base and 3-way merge...
Removing modules/cluster-logging-view-cluster-dashboards.adoc
Removing modules/cluster-logging-about-visualizer.adoc
Removing logging/viewing-resource-logs.adoc
Auto-merging logging/log_visualization/cluster-logging-dashboards.adoc
CONFLICT (content): Merge conflict in logging/log_visualization/cluster-logging-dashboards.adoc
Removing logging/config/cluster-logging-visualizer.adoc
Removing logging/cluster-logging-visualizer.adoc
Auto-merging architecture/index.adoc
CONFLICT (content): Merge conflict in architecture/index.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
Auto-merging _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 OBSDOCS-152: Restructuring log visualization docs
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
Copy link

@abrennan89: #67346 failed to apply on top of branch "enterprise-4.13":

Applying: OBSDOCS-152: Restructuring log visualization docs
Using index info to reconstruct a base tree...
M	_topic_maps/_topic_map.yml
M	_topic_maps/_topic_map_osd.yml
M	_topic_maps/_topic_map_rosa.yml
M	architecture/index.adoc
Falling back to patching base and 3-way merge...
Removing modules/cluster-logging-view-cluster-dashboards.adoc
Removing modules/cluster-logging-about-visualizer.adoc
Removing logging/viewing-resource-logs.adoc
Removing logging/config/cluster-logging-visualizer.adoc
Removing logging/cluster-logging-visualizer.adoc
Auto-merging architecture/index.adoc
CONFLICT (content): Merge conflict in architecture/index.adoc
Auto-merging _topic_maps/_topic_map_rosa.yml
Auto-merging _topic_maps/_topic_map_osd.yml
Auto-merging _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 OBSDOCS-152: Restructuring log visualization docs
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.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
Copy link

@abrennan89: new pull request created: #67510

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.

This was referenced Nov 7, 2023
Merged
Merged
@openshift-cherrypick-robot
Copy link

@abrennan89: new pull request created: #67511

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

This was referenced Nov 7, 2023
Merged
Merged
Merged
@abrennan89 abrennan89 deleted the visual-logs branch November 13, 2023 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lpettyjo lpettyjo lpettyjo left review comments

@jeana-redhat jeana-redhat jeana-redhat approved these changes

Assignees
No one assigned
Labels
branch/enterprise-4.11 branch/enterprise-4.12 branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 dev-tools Label for all Odo/Pipelines/Helm/Developer Console/Perspective PRs 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
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@abrennan89 @openshift-ci-robot @ocpdocs-previewbot @anpingli @openshift-cherrypick-robot @jeana-redhat @lpettyjo