Skip to content

CCSINTL-3095 [POWERMON] Module short descriptions#107858

Merged
briandooley merged 1 commit intoopenshift:power-monitoring-docs-mainfrom
gwynnemonahan:CCSINTL-3095
Mar 5, 2026
Merged

CCSINTL-3095 [POWERMON] Module short descriptions#107858
briandooley merged 1 commit intoopenshift:power-monitoring-docs-mainfrom
gwynnemonahan:CCSINTL-3095

Conversation

@gwynnemonahan
Copy link
Copy Markdown
Contributor

@gwynnemonahan gwynnemonahan commented Mar 3, 2026

CCSINTL-3095 [POWERMON] Module short descriptions

Version(s):
power-monitoring-docs-0.5
power-monitoring-docs-0.4
power-monitoring-docs-0.3

Issue:
https://issues.redhat.com/browse/CCSINTL-3095

Link to docs preview:

QE review:
QE is not required for this PR.

Additional information:

  • This PR only adds [role="_abstract"] to module files. Assemblies are being handled separately.

@openshift-ci openshift-ci bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 3, 2026
@openshift-ci openshift-ci bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 3, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Mar 4, 2026

@gwynnemonahan: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@briandooley
Copy link
Copy Markdown
Contributor

Peer Review: LGTM

@briandooley briandooley merged commit c0fe9b8 into openshift:power-monitoring-docs-main Mar 5, 2026
2 checks passed
@briandooley
Copy link
Copy Markdown
Contributor

/cherrypick power-monitoring-docs-0.5

@briandooley
Copy link
Copy Markdown
Contributor

/cherrypick power-monitoring-docs-0.4

@briandooley
Copy link
Copy Markdown
Contributor

/cherrypick power-monitoring-docs-0.3

@openshift-cherrypick-robot
Copy link
Copy Markdown

@briandooley: new pull request created: #107972

Details

In response to this:

/cherrypick power-monitoring-docs-0.5

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
Copy link
Copy Markdown

@briandooley: #107858 failed to apply on top of branch "power-monitoring-docs-0.4":

Applying: CCSINTL-3095 [POWERMON] Module short descriptions
Using index info to reconstruct a base tree...
M	modules/power-monitoring-accessing-dashboards-admin.adoc
M	modules/power-monitoring-accessing-dashboards-developer.adoc
M	modules/power-monitoring-dashboards-overview.adoc
M	modules/power-monitoring-deleting-kepler.adoc
A	modules/power-monitoring-deleting-power-monitor-custom-resource.adoc
A	modules/power-monitoring-deploying-power-monitor-custom-resource.adoc
A	modules/power-monitoring-hardware-support.adoc
M	modules/power-monitoring-kepler-architecture.adoc
M	modules/power-monitoring-kepler-configuration.adoc
A	modules/power-monitoring-kepler-power-attribution-guide.adoc
M	modules/power-monitoring-monitoring-kepler-status.adoc
M	modules/power-monitoring-overview.adoc
A	modules/power-monitoring-release-notes-tp-0-5-deprecated-removed-features.adoc
A	modules/power-monitoring-release-notes-tp-0-5-enhancements.adoc
A	modules/power-monitoring-release-notes-tp-0-5-new-features.adoc
A	modules/power-monitoring-release-notes-tp-0-5-support-tables.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/power-monitoring-release-notes-tp-0-5-support-tables.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-release-notes-tp-0-5-support-tables.adoc left in tree.
CONFLICT (modify/delete): modules/power-monitoring-release-notes-tp-0-5-new-features.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-release-notes-tp-0-5-new-features.adoc left in tree.
CONFLICT (modify/delete): modules/power-monitoring-release-notes-tp-0-5-enhancements.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-release-notes-tp-0-5-enhancements.adoc left in tree.
CONFLICT (modify/delete): modules/power-monitoring-release-notes-tp-0-5-deprecated-removed-features.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-release-notes-tp-0-5-deprecated-removed-features.adoc left in tree.
Auto-merging modules/power-monitoring-overview.adoc
CONFLICT (content): Merge conflict in modules/power-monitoring-overview.adoc
Auto-merging modules/power-monitoring-monitoring-kepler-status.adoc
CONFLICT (content): Merge conflict in modules/power-monitoring-monitoring-kepler-status.adoc
CONFLICT (modify/delete): modules/power-monitoring-kepler-power-attribution-guide.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-kepler-power-attribution-guide.adoc left in tree.
Auto-merging modules/power-monitoring-kepler-configuration.adoc
CONFLICT (content): Merge conflict in modules/power-monitoring-kepler-configuration.adoc
Auto-merging modules/power-monitoring-kepler-architecture.adoc
CONFLICT (modify/delete): modules/power-monitoring-hardware-support.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-hardware-support.adoc left in tree.
CONFLICT (modify/delete): modules/power-monitoring-deploying-power-monitor-custom-resource.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-deploying-power-monitor-custom-resource.adoc left in tree.
CONFLICT (modify/delete): modules/power-monitoring-deleting-power-monitor-custom-resource.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-deleting-power-monitor-custom-resource.adoc left in tree.
Auto-merging modules/power-monitoring-deleting-kepler.adoc
CONFLICT (content): Merge conflict in modules/power-monitoring-deleting-kepler.adoc
Auto-merging modules/power-monitoring-dashboards-overview.adoc
Auto-merging modules/power-monitoring-accessing-dashboards-developer.adoc
Auto-merging modules/power-monitoring-accessing-dashboards-admin.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 set advice.mergeConflict false"
Patch failed at 0001 CCSINTL-3095 [POWERMON] Module short descriptions

Details

In response to this:

/cherrypick power-monitoring-docs-0.4

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
Copy link
Copy Markdown

@briandooley: #107858 failed to apply on top of branch "power-monitoring-docs-0.3":

Applying: CCSINTL-3095 [POWERMON] Module short descriptions
Using index info to reconstruct a base tree...
M	modules/power-monitoring-accessing-dashboards-admin.adoc
M	modules/power-monitoring-accessing-dashboards-developer.adoc
M	modules/power-monitoring-dashboards-overview.adoc
M	modules/power-monitoring-deleting-kepler.adoc
A	modules/power-monitoring-deleting-power-monitor-custom-resource.adoc
A	modules/power-monitoring-deploying-power-monitor-custom-resource.adoc
A	modules/power-monitoring-fips-support.adoc
A	modules/power-monitoring-hardware-support.adoc
M	modules/power-monitoring-kepler-architecture.adoc
M	modules/power-monitoring-kepler-configuration.adoc
A	modules/power-monitoring-kepler-power-attribution-guide.adoc
M	modules/power-monitoring-monitoring-kepler-status.adoc
M	modules/power-monitoring-overview.adoc
A	modules/power-monitoring-release-notes-tp-0-5-deprecated-removed-features.adoc
A	modules/power-monitoring-release-notes-tp-0-5-enhancements.adoc
A	modules/power-monitoring-release-notes-tp-0-5-new-features.adoc
A	modules/power-monitoring-release-notes-tp-0-5-support-tables.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/power-monitoring-release-notes-tp-0-5-support-tables.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-release-notes-tp-0-5-support-tables.adoc left in tree.
CONFLICT (modify/delete): modules/power-monitoring-release-notes-tp-0-5-new-features.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-release-notes-tp-0-5-new-features.adoc left in tree.
CONFLICT (modify/delete): modules/power-monitoring-release-notes-tp-0-5-enhancements.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-release-notes-tp-0-5-enhancements.adoc left in tree.
CONFLICT (modify/delete): modules/power-monitoring-release-notes-tp-0-5-deprecated-removed-features.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-release-notes-tp-0-5-deprecated-removed-features.adoc left in tree.
Auto-merging modules/power-monitoring-overview.adoc
CONFLICT (content): Merge conflict in modules/power-monitoring-overview.adoc
Auto-merging modules/power-monitoring-monitoring-kepler-status.adoc
CONFLICT (content): Merge conflict in modules/power-monitoring-monitoring-kepler-status.adoc
CONFLICT (modify/delete): modules/power-monitoring-kepler-power-attribution-guide.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-kepler-power-attribution-guide.adoc left in tree.
Auto-merging modules/power-monitoring-kepler-configuration.adoc
CONFLICT (content): Merge conflict in modules/power-monitoring-kepler-configuration.adoc
Auto-merging modules/power-monitoring-kepler-architecture.adoc
CONFLICT (modify/delete): modules/power-monitoring-hardware-support.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-hardware-support.adoc left in tree.
CONFLICT (modify/delete): modules/power-monitoring-fips-support.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-fips-support.adoc left in tree.
CONFLICT (modify/delete): modules/power-monitoring-deploying-power-monitor-custom-resource.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-deploying-power-monitor-custom-resource.adoc left in tree.
CONFLICT (modify/delete): modules/power-monitoring-deleting-power-monitor-custom-resource.adoc deleted in HEAD and modified in CCSINTL-3095 [POWERMON] Module short descriptions. Version CCSINTL-3095 [POWERMON] Module short descriptions of modules/power-monitoring-deleting-power-monitor-custom-resource.adoc left in tree.
Auto-merging modules/power-monitoring-deleting-kepler.adoc
CONFLICT (content): Merge conflict in modules/power-monitoring-deleting-kepler.adoc
Auto-merging modules/power-monitoring-dashboards-overview.adoc
Auto-merging modules/power-monitoring-accessing-dashboards-developer.adoc
Auto-merging modules/power-monitoring-accessing-dashboards-admin.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 set advice.mergeConflict false"
Patch failed at 0001 CCSINTL-3095 [POWERMON] Module short descriptions

Details

In response to this:

/cherrypick power-monitoring-docs-0.3

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

size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants