OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts

[eromanova97]

Version(s): 4.12 +

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

Link to docs preview: https://100816--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.html#tls-security-and-rotation_monitoring-stack-architecture

QE review:

• QE has approved this change.

Additional information:

[ocpdocs-previewbot]

🤖 Thu Nov 13 08:40:27 - Prow CI generated the docs preview:

https://100816--ocpdocs-pr.netlify.app/openshift-dedicated/latest/observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.html
https://100816--ocpdocs-pr.netlify.app/openshift-enterprise/latest/observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.html
https://100816--ocpdocs-pr.netlify.app/openshift-rosa-hcp/latest/observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.html
https://100816--ocpdocs-pr.netlify.app/openshift-rosa/latest/observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.html

[jan--f]

/lgtm
Thanks!

[juzhao]

/lgtm

[max-cx]

Excellent work as usual, Eliska!
I just added a few questions and nitpicks in case you find it useful.

[openshift-ci]

New changes are detected. LGTM label has been removed.

[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 enterprise-4.17

[eromanova97]

/cherrypick enterprise-4.16

[eromanova97]

/cherrypick enterprise-4.15

[eromanova97]

/cherrypick enterprise-4.14

[eromanova97]

/cherrypick enterprise-4.13

[eromanova97]

/cherrypick enterprise-4.12

[eromanova97]

/cherrypick monitoring-docs-main

[openshift-cherrypick-robot]

@eromanova97: new pull request created: #102428

In response to this:

/cherrypick enterprise-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: #102429

In response to this:

/cherrypick enterprise-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: #102430

In response to this:

/cherrypick enterprise-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: #100816 failed to apply on top of branch "enterprise-4.18":

Applying: OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts
Using index info to reconstruct a base tree...
M	observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc
CONFLICT (content): Merge conflict in observability/monitoring/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 enterprise-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: #100816 failed to apply on top of branch "enterprise-4.17":

Applying: OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts
Using index info to reconstruct a base tree...
M	observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc
CONFLICT (content): Merge conflict in observability/monitoring/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 enterprise-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: #100816 failed to apply on top of branch "enterprise-4.16":

Applying: OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts
Using index info to reconstruct a base tree...
M	observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc
Falling back to patching base and 3-way merge...
Auto-merging observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc
CONFLICT (content): Merge conflict in observability/monitoring/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 enterprise-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: #100816 failed to apply on top of branch "enterprise-4.15":

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

[openshift-cherrypick-robot]

@eromanova97: #100816 failed to apply on top of branch "enterprise-4.14":

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

[openshift-cherrypick-robot]

@eromanova97: #100816 failed to apply on top of branch "enterprise-4.13":

Applying: OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts
Using index info to reconstruct a base tree...
M	modules/monitoring-default-monitoring-components.adoc
A	observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc deleted in HEAD and modified in OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts. Version OBSDOCS-2495 - CMO TLS/configMap updates cause Prometheus restarts of observability/monitoring/about-ocp-monitoring/monitoring-stack-architecture.adoc left in tree.
Auto-merging modules/monitoring-default-monitoring-components.adoc
CONFLICT (content): Merge conflict in modules/monitoring-default-monitoring-components.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 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-sigs/prow repository.

[openshift-cherrypick-robot]

@eromanova97: #100816 failed to apply on top of branch "enterprise-4.12":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

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

[openshift-cherrypick-robot]

@eromanova97: #100816 failed to apply on top of branch "monitoring-docs-main":

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

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.