Skip to content

Conversation

eromanova97
Copy link
Contributor

Version(s): 4.15 +

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

Link to docs preview:

QE review: n/a

Additional information:

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 22, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 22, 2025

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

In response to this:

Version(s): 4.15 +

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

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 openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 22, 2025
@ocpdocs-previewbot
Copy link

🤖 Mon Sep 22 12:09:01 - Prow CI generated the docs preview:
https://99475--ocpdocs-pr.netlify.app
Complete list of updated preview URLs: artifacts/updated_preview_urls.txt

Copy link

openshift-ci bot commented Sep 22, 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.

@eromanova97 eromanova97 merged commit 63e691e into openshift:monitoring-docs-main Sep 23, 2025
2 checks passed
@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.20

@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.19

@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.18

@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.17

@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.16

@eromanova97
Copy link
Contributor Author

/cherrypick monitoring-docs-4.15

@openshift-cherrypick-robot

@eromanova97: new pull request created: #99509

In response to this:

/cherrypick monitoring-docs-4.20

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

@eromanova97: #99475 failed to apply on top of branch "monitoring-docs-4.19":

Applying: Add abstract tag to modules
Using index info to reconstruct a base tree...
A	modules/monitoring-4-20-release-notes.adoc
M	modules/monitoring-setting-log-levels-for-monitoring-components.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/monitoring-setting-log-levels-for-monitoring-components.adoc
CONFLICT (content): Merge conflict in modules/monitoring-setting-log-levels-for-monitoring-components.adoc
CONFLICT (modify/delete): modules/monitoring-4-20-release-notes.adoc deleted in HEAD and modified in Add abstract tag to modules. Version Add abstract tag to modules of modules/monitoring-4-20-release-notes.adoc left in tree.
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 advice.mergeConflict false"
Patch failed at 0001 Add abstract tag to modules

In response to this:

/cherrypick monitoring-docs-4.19

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

@eromanova97: #99475 failed to apply on top of branch "monitoring-docs-4.18":

Applying: Add abstract tag to modules
Using index info to reconstruct a base tree...
A	modules/monitoring-4-20-release-notes.adoc
M	modules/monitoring-about-monitoring-dashboards.adoc
M	modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
M	modules/monitoring-accessing-the-alerting-ui.adoc
M	modules/monitoring-choosing-a-metrics-collection-profile.adoc
M	modules/monitoring-configuring-alert-routing-console.adoc
M	modules/monitoring-configuring-alert-routing-default-platform-alerts.adoc
M	modules/monitoring-configuring-alert-routing-user-defined-alerts-secret.adoc
M	modules/monitoring-configuring-metrics-collection-profiles.adoc
M	modules/monitoring-creating-scrape-sample-alerts.adoc
M	modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc
M	modules/monitoring-editing-silences.adoc
M	modules/monitoring-enabling-alert-routing-for-user-defined-projects.adoc
M	modules/monitoring-expiring-silences.adoc
M	modules/monitoring-getting-detailed-information-about-a-target.adoc
M	modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc
M	modules/monitoring-granting-user-permissions-using-the-web-console.adoc
M	modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc
M	modules/monitoring-granting-users-permissions-for-core-platform-monitoring.adoc
M	modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc
M	modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc
M	modules/monitoring-managing-silences.adoc
M	modules/monitoring-querying-metrics-for-all-projects-with-mon-dashboard.adoc
M	modules/monitoring-querying-metrics-for-user-defined-projects-with-mon-dashboard.adoc
M	modules/monitoring-resources-reference-for-the-cluster-monitoring-operator.adoc
M	modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
M	modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
M	modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc
M	modules/monitoring-setting-log-levels-for-monitoring-components.adoc
M	modules/monitoring-silencing-alerts.adoc
M	modules/monitoring-support-version-matrix-for-monitoring-components.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/monitoring-support-version-matrix-for-monitoring-components.adoc
Auto-merging modules/monitoring-silencing-alerts.adoc
CONFLICT (content): Merge conflict in modules/monitoring-silencing-alerts.adoc
Auto-merging modules/monitoring-setting-log-levels-for-monitoring-components.adoc
CONFLICT (content): Merge conflict in modules/monitoring-setting-log-levels-for-monitoring-components.adoc
Auto-merging modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc
Auto-merging modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
CONFLICT (content): Merge conflict in modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
Auto-merging modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
CONFLICT (content): Merge conflict in modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
Auto-merging modules/monitoring-resources-reference-for-the-cluster-monitoring-operator.adoc
Auto-merging modules/monitoring-querying-metrics-for-user-defined-projects-with-mon-dashboard.adoc
Auto-merging modules/monitoring-querying-metrics-for-all-projects-with-mon-dashboard.adoc
Auto-merging modules/monitoring-managing-silences.adoc
CONFLICT (content): Merge conflict in modules/monitoring-managing-silences.adoc
Auto-merging modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc
Auto-merging modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc
Auto-merging modules/monitoring-granting-users-permissions-for-core-platform-monitoring.adoc
Auto-merging modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc
Auto-merging modules/monitoring-granting-user-permissions-using-the-web-console.adoc
Auto-merging modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc
CONFLICT (content): Merge conflict in modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc
Auto-merging modules/monitoring-getting-detailed-information-about-a-target.adoc
Auto-merging modules/monitoring-expiring-silences.adoc
CONFLICT (content): Merge conflict in modules/monitoring-expiring-silences.adoc
Auto-merging modules/monitoring-enabling-alert-routing-for-user-defined-projects.adoc
Auto-merging modules/monitoring-editing-silences.adoc
CONFLICT (content): Merge conflict in modules/monitoring-editing-silences.adoc
Auto-merging modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc
Auto-merging modules/monitoring-creating-scrape-sample-alerts.adoc
Auto-merging modules/monitoring-configuring-metrics-collection-profiles.adoc
CONFLICT (content): Merge conflict in modules/monitoring-configuring-metrics-collection-profiles.adoc
Auto-merging modules/monitoring-configuring-alert-routing-user-defined-alerts-secret.adoc
Auto-merging modules/monitoring-configuring-alert-routing-default-platform-alerts.adoc
Auto-merging modules/monitoring-configuring-alert-routing-console.adoc
Auto-merging modules/monitoring-choosing-a-metrics-collection-profile.adoc
CONFLICT (content): Merge conflict in modules/monitoring-choosing-a-metrics-collection-profile.adoc
Auto-merging modules/monitoring-accessing-the-alerting-ui.adoc
CONFLICT (content): Merge conflict in modules/monitoring-accessing-the-alerting-ui.adoc
Auto-merging modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
CONFLICT (content): Merge conflict in modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
Auto-merging modules/monitoring-about-monitoring-dashboards.adoc
CONFLICT (content): Merge conflict in modules/monitoring-about-monitoring-dashboards.adoc
CONFLICT (modify/delete): modules/monitoring-4-20-release-notes.adoc deleted in HEAD and modified in Add abstract tag to modules. Version Add abstract tag to modules of modules/monitoring-4-20-release-notes.adoc left in tree.
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 advice.mergeConflict false"
Patch failed at 0001 Add abstract tag to modules

In response to this:

/cherrypick monitoring-docs-4.18

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

@eromanova97: #99475 failed to apply on top of branch "monitoring-docs-4.17":

Applying: Add abstract tag to modules
Using index info to reconstruct a base tree...
A	modules/monitoring-4-20-release-notes.adoc
M	modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc
M	modules/monitoring-about-monitoring-dashboards.adoc
M	modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
M	modules/monitoring-accessing-the-alerting-ui.adoc
M	modules/monitoring-choosing-a-metrics-collection-profile.adoc
M	modules/monitoring-common-terms.adoc
M	modules/monitoring-configuring-alert-routing-console.adoc
M	modules/monitoring-configuring-alert-routing-default-platform-alerts.adoc
M	modules/monitoring-configuring-alert-routing-user-defined-alerts-secret.adoc
M	modules/monitoring-configuring-metrics-collection-profiles.adoc
M	modules/monitoring-controlling-the-impact-of-unbound-attributes-in-user-defined-projects.adoc
M	modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc
M	modules/monitoring-creating-scrape-sample-alerts.adoc
M	modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc
M	modules/monitoring-editing-silences.adoc
M	modules/monitoring-enabling-alert-routing-for-user-defined-projects.adoc
M	modules/monitoring-expiring-silences.adoc
M	modules/monitoring-getting-detailed-information-about-a-target.adoc
M	modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc
M	modules/monitoring-granting-user-permissions-using-the-web-console.adoc
M	modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc
M	modules/monitoring-granting-users-permissions-for-core-platform-monitoring.adoc
M	modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc
M	modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc
M	modules/monitoring-managing-silences.adoc
M	modules/monitoring-querying-metrics-for-all-projects-with-mon-dashboard.adoc
M	modules/monitoring-querying-metrics-for-user-defined-projects-with-mon-dashboard.adoc
M	modules/monitoring-resources-reference-for-the-cluster-monitoring-operator.adoc
M	modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
M	modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
M	modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc
M	modules/monitoring-setting-log-levels-for-monitoring-components.adoc
M	modules/monitoring-silencing-alerts.adoc
M	modules/monitoring-support-version-matrix-for-monitoring-components.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/monitoring-support-version-matrix-for-monitoring-components.adoc
Auto-merging modules/monitoring-silencing-alerts.adoc
CONFLICT (content): Merge conflict in modules/monitoring-silencing-alerts.adoc
Auto-merging modules/monitoring-setting-log-levels-for-monitoring-components.adoc
CONFLICT (content): Merge conflict in modules/monitoring-setting-log-levels-for-monitoring-components.adoc
Auto-merging modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc
Auto-merging modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
CONFLICT (content): Merge conflict in modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
Auto-merging modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
CONFLICT (content): Merge conflict in modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
Auto-merging modules/monitoring-resources-reference-for-the-cluster-monitoring-operator.adoc
Auto-merging modules/monitoring-querying-metrics-for-user-defined-projects-with-mon-dashboard.adoc
Auto-merging modules/monitoring-querying-metrics-for-all-projects-with-mon-dashboard.adoc
Auto-merging modules/monitoring-managing-silences.adoc
CONFLICT (content): Merge conflict in modules/monitoring-managing-silences.adoc
Auto-merging modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc
Auto-merging modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc
Auto-merging modules/monitoring-granting-users-permissions-for-core-platform-monitoring.adoc
Auto-merging modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc
Auto-merging modules/monitoring-granting-user-permissions-using-the-web-console.adoc
Auto-merging modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc
CONFLICT (content): Merge conflict in modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc
Auto-merging modules/monitoring-getting-detailed-information-about-a-target.adoc
Auto-merging modules/monitoring-expiring-silences.adoc
CONFLICT (content): Merge conflict in modules/monitoring-expiring-silences.adoc
Auto-merging modules/monitoring-enabling-alert-routing-for-user-defined-projects.adoc
Auto-merging modules/monitoring-editing-silences.adoc
CONFLICT (content): Merge conflict in modules/monitoring-editing-silences.adoc
Auto-merging modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc
Auto-merging modules/monitoring-creating-scrape-sample-alerts.adoc
Auto-merging modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc
Auto-merging modules/monitoring-controlling-the-impact-of-unbound-attributes-in-user-defined-projects.adoc
Auto-merging modules/monitoring-configuring-metrics-collection-profiles.adoc
CONFLICT (content): Merge conflict in modules/monitoring-configuring-metrics-collection-profiles.adoc
Auto-merging modules/monitoring-configuring-alert-routing-user-defined-alerts-secret.adoc
Auto-merging modules/monitoring-configuring-alert-routing-default-platform-alerts.adoc
Auto-merging modules/monitoring-configuring-alert-routing-console.adoc
Auto-merging modules/monitoring-common-terms.adoc
Auto-merging modules/monitoring-choosing-a-metrics-collection-profile.adoc
CONFLICT (content): Merge conflict in modules/monitoring-choosing-a-metrics-collection-profile.adoc
Auto-merging modules/monitoring-accessing-the-alerting-ui.adoc
CONFLICT (content): Merge conflict in modules/monitoring-accessing-the-alerting-ui.adoc
Auto-merging modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
CONFLICT (content): Merge conflict in modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
Auto-merging modules/monitoring-about-monitoring-dashboards.adoc
CONFLICT (content): Merge conflict in modules/monitoring-about-monitoring-dashboards.adoc
Auto-merging modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc
CONFLICT (content): Merge conflict in modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc
CONFLICT (modify/delete): modules/monitoring-4-20-release-notes.adoc deleted in HEAD and modified in Add abstract tag to modules. Version Add abstract tag to modules of modules/monitoring-4-20-release-notes.adoc left in tree.
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 advice.mergeConflict false"
Patch failed at 0001 Add abstract tag to modules

In response to this:

/cherrypick monitoring-docs-4.17

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

@eromanova97: #99475 failed to apply on top of branch "monitoring-docs-4.16":

Applying: Add abstract tag to modules
Using index info to reconstruct a base tree...
A	modules/monitoring-4-20-release-notes.adoc
M	modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc
M	modules/monitoring-about-monitoring-dashboards.adoc
M	modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
M	modules/monitoring-accessing-the-alerting-ui.adoc
M	modules/monitoring-choosing-a-metrics-collection-profile.adoc
M	modules/monitoring-common-terms.adoc
M	modules/monitoring-configuring-alert-routing-console.adoc
M	modules/monitoring-configuring-alert-routing-default-platform-alerts.adoc
M	modules/monitoring-configuring-alert-routing-user-defined-alerts-secret.adoc
M	modules/monitoring-configuring-metrics-collection-profiles.adoc
M	modules/monitoring-controlling-the-impact-of-unbound-attributes-in-user-defined-projects.adoc
M	modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc
M	modules/monitoring-creating-scrape-sample-alerts.adoc
M	modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc
M	modules/monitoring-editing-silences.adoc
M	modules/monitoring-enabling-alert-routing-for-user-defined-projects.adoc
M	modules/monitoring-example-remote-write-queue-configuration.adoc
M	modules/monitoring-expiring-silences.adoc
M	modules/monitoring-getting-detailed-information-about-a-target.adoc
M	modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc
M	modules/monitoring-granting-user-permissions-using-the-web-console.adoc
M	modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc
M	modules/monitoring-granting-users-permissions-for-core-platform-monitoring.adoc
M	modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc
M	modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc
M	modules/monitoring-managing-silences.adoc
M	modules/monitoring-querying-metrics-for-all-projects-with-mon-dashboard.adoc
M	modules/monitoring-querying-metrics-for-user-defined-projects-with-mon-dashboard.adoc
M	modules/monitoring-resolving-the-kubepersistentvolumefillingup-alert-firing-for-prometheus.adoc
M	modules/monitoring-resources-reference-for-the-cluster-monitoring-operator.adoc
M	modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
M	modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
M	modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc
M	modules/monitoring-setting-log-levels-for-monitoring-components.adoc
M	modules/monitoring-silencing-alerts.adoc
M	modules/monitoring-support-version-matrix-for-monitoring-components.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/monitoring-support-version-matrix-for-monitoring-components.adoc
Auto-merging modules/monitoring-silencing-alerts.adoc
CONFLICT (content): Merge conflict in modules/monitoring-silencing-alerts.adoc
Auto-merging modules/monitoring-setting-log-levels-for-monitoring-components.adoc
CONFLICT (content): Merge conflict in modules/monitoring-setting-log-levels-for-monitoring-components.adoc
Auto-merging modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc
Auto-merging modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
CONFLICT (content): Merge conflict in modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
Auto-merging modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
CONFLICT (content): Merge conflict in modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
Auto-merging modules/monitoring-resources-reference-for-the-cluster-monitoring-operator.adoc
Auto-merging modules/monitoring-resolving-the-kubepersistentvolumefillingup-alert-firing-for-prometheus.adoc
Auto-merging modules/monitoring-querying-metrics-for-user-defined-projects-with-mon-dashboard.adoc
Auto-merging modules/monitoring-querying-metrics-for-all-projects-with-mon-dashboard.adoc
Auto-merging modules/monitoring-managing-silences.adoc
CONFLICT (content): Merge conflict in modules/monitoring-managing-silences.adoc
Auto-merging modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc
Auto-merging modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc
Auto-merging modules/monitoring-granting-users-permissions-for-core-platform-monitoring.adoc
Auto-merging modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc
Auto-merging modules/monitoring-granting-user-permissions-using-the-web-console.adoc
Auto-merging modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc
CONFLICT (content): Merge conflict in modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc
Auto-merging modules/monitoring-getting-detailed-information-about-a-target.adoc
Auto-merging modules/monitoring-expiring-silences.adoc
CONFLICT (content): Merge conflict in modules/monitoring-expiring-silences.adoc
Auto-merging modules/monitoring-example-remote-write-queue-configuration.adoc
Auto-merging modules/monitoring-enabling-alert-routing-for-user-defined-projects.adoc
Auto-merging modules/monitoring-editing-silences.adoc
CONFLICT (content): Merge conflict in modules/monitoring-editing-silences.adoc
Auto-merging modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc
Auto-merging modules/monitoring-creating-scrape-sample-alerts.adoc
Auto-merging modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc
Auto-merging modules/monitoring-controlling-the-impact-of-unbound-attributes-in-user-defined-projects.adoc
Auto-merging modules/monitoring-configuring-metrics-collection-profiles.adoc
CONFLICT (content): Merge conflict in modules/monitoring-configuring-metrics-collection-profiles.adoc
Auto-merging modules/monitoring-configuring-alert-routing-user-defined-alerts-secret.adoc
Auto-merging modules/monitoring-configuring-alert-routing-default-platform-alerts.adoc
Auto-merging modules/monitoring-configuring-alert-routing-console.adoc
Auto-merging modules/monitoring-common-terms.adoc
Auto-merging modules/monitoring-choosing-a-metrics-collection-profile.adoc
CONFLICT (content): Merge conflict in modules/monitoring-choosing-a-metrics-collection-profile.adoc
Auto-merging modules/monitoring-accessing-the-alerting-ui.adoc
CONFLICT (content): Merge conflict in modules/monitoring-accessing-the-alerting-ui.adoc
Auto-merging modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
CONFLICT (content): Merge conflict in modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
Auto-merging modules/monitoring-about-monitoring-dashboards.adoc
CONFLICT (content): Merge conflict in modules/monitoring-about-monitoring-dashboards.adoc
Auto-merging modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc
CONFLICT (content): Merge conflict in modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc
CONFLICT (modify/delete): modules/monitoring-4-20-release-notes.adoc deleted in HEAD and modified in Add abstract tag to modules. Version Add abstract tag to modules of modules/monitoring-4-20-release-notes.adoc left in tree.
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 advice.mergeConflict false"
Patch failed at 0001 Add abstract tag to modules

In response to this:

/cherrypick monitoring-docs-4.16

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

@eromanova97: #99475 failed to apply on top of branch "monitoring-docs-4.15":

Applying: Add abstract tag to modules
Using index info to reconstruct a base tree...
A	modules/monitoring-4-20-release-notes.adoc
M	modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc
M	modules/monitoring-about-monitoring-dashboards.adoc
M	modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
M	modules/monitoring-accessing-the-alerting-ui.adoc
M	modules/monitoring-choosing-a-metrics-collection-profile.adoc
M	modules/monitoring-common-terms.adoc
M	modules/monitoring-configurable-monitoring-components.adoc
M	modules/monitoring-configuring-alert-routing-console.adoc
M	modules/monitoring-configuring-alert-routing-default-platform-alerts.adoc
M	modules/monitoring-configuring-alert-routing-user-defined-alerts-secret.adoc
A	modules/monitoring-configuring-audit-logs-for-metrics-server.adoc
M	modules/monitoring-configuring-metrics-collection-profiles.adoc
M	modules/monitoring-controlling-the-impact-of-unbound-attributes-in-user-defined-projects.adoc
M	modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc
M	modules/monitoring-creating-scrape-sample-alerts.adoc
M	modules/monitoring-default-monitoring-components.adoc
M	modules/monitoring-default-monitoring-targets.adoc
M	modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc
M	modules/monitoring-editing-silences.adoc
M	modules/monitoring-enabling-alert-routing-for-user-defined-projects.adoc
M	modules/monitoring-example-remote-write-queue-configuration.adoc
M	modules/monitoring-expiring-silences.adoc
M	modules/monitoring-getting-detailed-information-about-a-target.adoc
M	modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc
M	modules/monitoring-granting-user-permissions-using-the-web-console.adoc
M	modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc
M	modules/monitoring-granting-users-permissions-for-core-platform-monitoring.adoc
M	modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc
M	modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc
M	modules/monitoring-managing-silences.adoc
M	modules/monitoring-monitoring-stack-in-ha-clusters.adoc
M	modules/monitoring-querying-metrics-for-all-projects-with-mon-dashboard.adoc
M	modules/monitoring-querying-metrics-for-user-defined-projects-with-mon-dashboard.adoc
M	modules/monitoring-resolving-the-kubepersistentvolumefillingup-alert-firing-for-prometheus.adoc
A	modules/monitoring-resources-reference-for-the-cluster-monitoring-operator.adoc
M	modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
M	modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
M	modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc
M	modules/monitoring-setting-log-levels-for-monitoring-components.adoc
M	modules/monitoring-silencing-alerts.adoc
M	modules/monitoring-specifying-limits-and-requests-for-monitoring-components.adoc
M	modules/monitoring-support-version-matrix-for-monitoring-components.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/monitoring-support-version-matrix-for-monitoring-components.adoc
Auto-merging modules/monitoring-specifying-limits-and-requests-for-monitoring-components.adoc
Auto-merging modules/monitoring-silencing-alerts.adoc
CONFLICT (content): Merge conflict in modules/monitoring-silencing-alerts.adoc
Auto-merging modules/monitoring-setting-log-levels-for-monitoring-components.adoc
CONFLICT (content): Merge conflict in modules/monitoring-setting-log-levels-for-monitoring-components.adoc
Auto-merging modules/monitoring-searching-alerts-silences-and-alerting-rules.adoc
Auto-merging modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
CONFLICT (content): Merge conflict in modules/monitoring-reviewing-monitoring-dashboards-developer.adoc
Auto-merging modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
CONFLICT (content): Merge conflict in modules/monitoring-reviewing-monitoring-dashboards-admin.adoc
CONFLICT (modify/delete): modules/monitoring-resources-reference-for-the-cluster-monitoring-operator.adoc deleted in HEAD and modified in Add abstract tag to modules. Version Add abstract tag to modules of modules/monitoring-resources-reference-for-the-cluster-monitoring-operator.adoc left in tree.
Auto-merging modules/monitoring-resolving-the-kubepersistentvolumefillingup-alert-firing-for-prometheus.adoc
Auto-merging modules/monitoring-querying-metrics-for-user-defined-projects-with-mon-dashboard.adoc
Auto-merging modules/monitoring-querying-metrics-for-all-projects-with-mon-dashboard.adoc
Auto-merging modules/monitoring-monitoring-stack-in-ha-clusters.adoc
Auto-merging modules/monitoring-managing-silences.adoc
CONFLICT (content): Merge conflict in modules/monitoring-managing-silences.adoc
Auto-merging modules/monitoring-listing-alerting-rules-for-all-projects-in-a-single-view.adoc
Auto-merging modules/monitoring-investigating-why-user-defined-metrics-are-unavailable.adoc
Auto-merging modules/monitoring-granting-users-permissions-for-core-platform-monitoring.adoc
Auto-merging modules/monitoring-granting-users-permission-to-monitor-user-defined-projects.adoc
Auto-merging modules/monitoring-granting-user-permissions-using-the-web-console.adoc
Auto-merging modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc
CONFLICT (content): Merge conflict in modules/monitoring-getting-information-about-alerts-silences-and-alerting-rules.adoc
Auto-merging modules/monitoring-getting-detailed-information-about-a-target.adoc
Auto-merging modules/monitoring-expiring-silences.adoc
CONFLICT (content): Merge conflict in modules/monitoring-expiring-silences.adoc
Auto-merging modules/monitoring-example-remote-write-queue-configuration.adoc
Auto-merging modules/monitoring-enabling-alert-routing-for-user-defined-projects.adoc
Auto-merging modules/monitoring-editing-silences.adoc
CONFLICT (content): Merge conflict in modules/monitoring-editing-silences.adoc
Auto-merging modules/monitoring-determining-why-prometheus-is-consuming-disk-space.adoc
Auto-merging modules/monitoring-default-monitoring-targets.adoc
Auto-merging modules/monitoring-default-monitoring-components.adoc
Auto-merging modules/monitoring-creating-scrape-sample-alerts.adoc
Auto-merging modules/monitoring-creating-alerting-rules-for-user-defined-projects.adoc
Auto-merging modules/monitoring-controlling-the-impact-of-unbound-attributes-in-user-defined-projects.adoc
Auto-merging modules/monitoring-configuring-metrics-collection-profiles.adoc
CONFLICT (content): Merge conflict in modules/monitoring-configuring-metrics-collection-profiles.adoc
CONFLICT (modify/delete): modules/monitoring-configuring-audit-logs-for-metrics-server.adoc deleted in HEAD and modified in Add abstract tag to modules. Version Add abstract tag to modules of modules/monitoring-configuring-audit-logs-for-metrics-server.adoc left in tree.
Auto-merging modules/monitoring-configuring-alert-routing-user-defined-alerts-secret.adoc
Auto-merging modules/monitoring-configuring-alert-routing-default-platform-alerts.adoc
Auto-merging modules/monitoring-configuring-alert-routing-console.adoc
Auto-merging modules/monitoring-configurable-monitoring-components.adoc
Auto-merging modules/monitoring-common-terms.adoc
Auto-merging modules/monitoring-choosing-a-metrics-collection-profile.adoc
CONFLICT (content): Merge conflict in modules/monitoring-choosing-a-metrics-collection-profile.adoc
Auto-merging modules/monitoring-accessing-the-alerting-ui.adoc
CONFLICT (content): Merge conflict in modules/monitoring-accessing-the-alerting-ui.adoc
Auto-merging modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
CONFLICT (content): Merge conflict in modules/monitoring-about-specifying-limits-and-requests-for-monitoring-components.adoc
Auto-merging modules/monitoring-about-monitoring-dashboards.adoc
CONFLICT (content): Merge conflict in modules/monitoring-about-monitoring-dashboards.adoc
Auto-merging modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc
CONFLICT (content): Merge conflict in modules/monitoring-about-creating-alerting-rules-for-user-defined-projects.adoc
CONFLICT (modify/delete): modules/monitoring-4-20-release-notes.adoc deleted in HEAD and modified in Add abstract tag to modules. Version Add abstract tag to modules of modules/monitoring-4-20-release-notes.adoc left in tree.
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 advice.mergeConflict false"
Patch failed at 0001 Add abstract tag to modules

In response to this:

/cherrypick monitoring-docs-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-sigs/prow repository.

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. 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