[monitoring-docs-main] OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts

[eromanova97]

Manual cherry-pick of #100816 to standalone main

[ocpdocs-previewbot]

🤖 Thu Nov 13 10:06:29 - Prow CI generated the docs preview:

https://102438--ocpdocs-pr.netlify.app/openshift-monitoring/latest/about-ocp-monitoring/monitoring-stack-architecture.html

[openshift-ci]

@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]

/cherrypick monitoring-docs-4.21

[eromanova97]

/cherrypick monitoring-docs-4.20

[eromanova97]

/cherrypick monitoring-docs-4.19

[eromanova97]

/cherrypick monitoring-docs-4.18

[eromanova97]

/cherrypick monitoring-docs-4.17

[eromanova97]

/cherrypick monitoring-docs-4.16

[eromanova97]

/cherrypick monitoring-docs-4.15

[openshift-cherrypick-robot]

@eromanova97: new pull request created: #102440

In response to this:

/cherrypick monitoring-docs-4.21

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: new pull request created: #102441

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: new pull request created: #102442

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: #102438 failed to apply on top of branch "monitoring-docs-4.18":

Applying: OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts
Using index info to reconstruct a base tree...
M	about-ocp-monitoring/monitoring-stack-architecture.adoc
Falling back to patching base and 3-way merge...
Auto-merging about-ocp-monitoring/monitoring-stack-architecture.adoc
CONFLICT (content): Merge conflict in about-ocp-monitoring/monitoring-stack-architecture.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 advice.mergeConflict false"
Patch failed at 0001 OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts

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: #102438 failed to apply on top of branch "monitoring-docs-4.17":

Applying: OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts
Using index info to reconstruct a base tree...
M	about-ocp-monitoring/monitoring-stack-architecture.adoc
Falling back to patching base and 3-way merge...
Auto-merging about-ocp-monitoring/monitoring-stack-architecture.adoc
CONFLICT (content): Merge conflict in about-ocp-monitoring/monitoring-stack-architecture.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 advice.mergeConflict false"
Patch failed at 0001 OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts

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: #102438 failed to apply on top of branch "monitoring-docs-4.16":

Applying: OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts
Using index info to reconstruct a base tree...
M	about-ocp-monitoring/monitoring-stack-architecture.adoc
Falling back to patching base and 3-way merge...
Auto-merging about-ocp-monitoring/monitoring-stack-architecture.adoc
CONFLICT (content): Merge conflict in about-ocp-monitoring/monitoring-stack-architecture.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 advice.mergeConflict false"
Patch failed at 0001 OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts

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: #102438 failed to apply on top of branch "monitoring-docs-4.15":

Applying: OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts
Using index info to reconstruct a base tree...
M	about-ocp-monitoring/monitoring-stack-architecture.adoc
M	modules/monitoring-default-monitoring-components.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/monitoring-default-monitoring-components.adoc
Auto-merging about-ocp-monitoring/monitoring-stack-architecture.adoc
CONFLICT (content): Merge conflict in about-ocp-monitoring/monitoring-stack-architecture.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 advice.mergeConflict false"
Patch failed at 0001 OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts

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.