Skip to content

Conversation

eromanova97
Copy link
Contributor

@eromanova97 eromanova97 commented Feb 3, 2025

Version(s): none for cherry-picking, monitoring-docs-restructure only

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

Link to docs preview:
ROSA: https://87956--ocpdocs-pr.netlify.app/openshift-rosa/latest/observability/monitoring/monitoring-overview

OSD: https://87956--ocpdocs-pr.netlify.app/openshift-dedicated/latest/observability/monitoring/monitoring-overview

The thing here is to check that the distros do not include any core platform procedures, especially in this assembly: link) but includes only user-defined project procedures.

QE review: n/a

Additional information:

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 3, 2025

@eromanova97: This pull request references OBSDOCS-1637 which is a valid jira issue.

In response to this:

Version(s): none for cherry-picking, monitoring-docs-restructure only

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

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 openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 3, 2025
@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 Feb 3, 2025
Comment on lines 7 to 16
// The ultimate solution DOES NOT NEED separate IDs, it is just needed for now so that the tests will not break
// tag::CPM[]
[id="about-specifying-limits-and-requests-for-monitoring-components-cpm_{context}"]
= About specifying limits and requests for core monitoring components
// end::CPM[]

// tag::UWM[]
[id="about-specifying-limits-and-requests-for-monitoring-components-uwm_{context}"]
= About specifying limits and requests for monitoring components for user-defined projects
// end::UWM[]
Copy link
Contributor Author

@eromanova97 eromanova97 Feb 3, 2025

Choose a reason for hiding this comment

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

As the note says: the final solution does not need separate IDs, this is the last PR for editing the content, so I am getting rid of it in this step. Same can be seen in other modules in this PR.

Comment on lines 105 to -107
// Configurable monitoring components
// The following module should only include core platform monitoring (CPM tags)
include::modules/monitoring-configurable-monitoring-components.adoc[leveloffset=+1,tags=**;CPM;!UWM]
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The modules rendering with core platform monitoring (CPM tags) content can be now safely removed from the original assembly, because this assembly is now used only by ROSA/OSD distros, which do not contain the CPM docs. This can be seen throughout the file changes in this PR.

Comment on lines -125 to -132
// This following ifndef causes the first procedure NOT to show up in ROSA/OSD builds, only in the OCP build
// The final solution WILL NOT need those ifdef statements
// The module should only include core platform monitoring
ifndef::openshift-dedicated,openshift-rosa[]
include::modules/monitoring-moving-monitoring-components-to-different-nodes.adoc[leveloffset=+2,tags=**;CPM;!UWM]
endif::openshift-dedicated,openshift-rosa[]

// The following module shows in all builds.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This first suggested solution was overcomplicating things and can be removed now.

@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Feb 3, 2025

🤖 Wed Feb 05 11:58:55 - Prow CI generated the docs preview:
https://87956--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 3, 2025

@eromanova97: This pull request references OBSDOCS-1637 which is a valid jira issue.

In response to this:

Version(s): none for cherry-picking, monitoring-docs-restructure only

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

Link to docs preview:
https://87956--ocpdocs-pr.netlify.app/openshift-rosa/latest/observability/monitoring/monitoring-overview (the thing here is to check that the distro does not include any core platform procedures, especially in this assembly: link) but includes only user-defined project procedures)

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.

@eromanova97 eromanova97 changed the title [WIP] OBSDOCS-1637: Ensure the ROSA/OSD distros are rendering correctly. OBSDOCS-1637: Ensure the ROSA/OSD distros are rendering correctly. Feb 5, 2025
@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 Feb 5, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 5, 2025

@eromanova97: This pull request references OBSDOCS-1637 which is a valid jira issue.

In response to this:

Version(s): none for cherry-picking, monitoring-docs-restructure only

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

Link to docs preview:
ROSA: https://87956--ocpdocs-pr.netlify.app/openshift-rosa/latest/observability/monitoring/monitoring-overview

OSD: https://87956--ocpdocs-pr.netlify.app/openshift-dedicated/latest/observability/monitoring/monitoring-overview

The thing here is to check that the distros do not include any core platform procedures, especially in this assembly: link) but includes only user-defined project procedures.

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 openshift-ci bot added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Feb 5, 2025
Copy link

openshift-ci bot commented Feb 5, 2025

@eromanova97: Those labels are not set on the issue: peer-review-needed

In response to this:

/remove-label peer-review-needed

/label peer-review-in-progress

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.

@eromanova97
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added peer-review-needed Signifies that the peer review team needs to review this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Feb 5, 2025
@gabriel-rh gabriel-rh added the peer-review-in-progress Signifies that the peer review team is reviewing this PR label Feb 5, 2025
Copy link
Contributor

@gabriel-rh gabriel-rh left a comment

Choose a reason for hiding this comment

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

LGTM - Great work @eromanova97 !

@gabriel-rh gabriel-rh 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 peer-review-needed Signifies that the peer review team needs to review this PR labels Feb 5, 2025
Copy link

openshift-ci bot commented Feb 5, 2025

@eromanova97: 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.

@gabriel-rh gabriel-rh merged commit bbc67ef into openshift:monitoring-docs-restructure Feb 5, 2025
2 checks passed
@eromanova97 eromanova97 deleted the OBSDOCS-1637 branch February 5, 2025 12:29
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. 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.

4 participants