RHDEVDOCS-2900 Tracker for #30976 Issue in file logging/cluster-loggi…

[rolfedh]

…ng-deploying.adoc Add "OpenShift" to "Elasticsearch Operator"

• For versions 4.7+
• https://issues.redhat.com/browse/RHDEVDOCS-2900
• Direct link to doc preview: https://deploy-preview-31302--osdocs.netlify.app/openshift-enterprise/latest/logging/cluster-logging.html
• Ready for SME, QE, and peer review
• Please merge when ready
• Please close the original issue: [enterprise-4.7] Issue in file logging/cluster-logging-deploying.adoc #30976

[netlify]

Deploy preview for osdocs ready!

Built with commit bdfa0d5

https://deploy-preview-31302--osdocs.netlify.app

[JStickler]

LGTM (since I work on the Jaeger and Service Mesh content).

Also, it looks like this PR also addresses #30981.

[jeana-redhat]

LGTM - noted a few small things that you may or may not consider in scope for this (not the change you were looking at, but in the same sentences). LMK if you want to do anything about them or if you'd like me to go ahead and merge and CP to 4.7+

[jeana-redhat]

/cherrypick enterprise-4.8

[jeana-redhat]

/cherrypick enterprise-4.7

[openshift-cherrypick-robot]

@jeana-redhat: #31302 failed to apply on top of branch "enterprise-4.8":

Applying: RHDEVDOCS-2900 Tracker for #30976 Issue in file logging/cluster-logging-deploying.adoc Add "OpenShift" to "Elasticsearch Operator"
.git/rebase-apply/patch:531: trailing whitespace.
<4> The log store nodes in the cluster, with `upgradeStatus`. 
.git/rebase-apply/patch:573: trailing whitespace.
If you _must_ perform configurations not described in the {product-title} documentation, you _must_ set your Cluster Logging Operator or OpenShift Elasticsearch Operator to *Unmanaged*. An unmanaged OpenShift Logging environment is _not supported_ and does not receive updates until you return OpenShift Logging to *Managed*. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	logging/cluster-logging-deploying.adoc
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploy-console.adoc
M	modules/cluster-logging-deploy-storage-considerations.adoc
M	modules/cluster-logging-deploying-about.adoc
M	modules/cluster-logging-logstore-limits.adoc
M	modules/dedicated-cluster-install-deploy.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/dedicated-cluster-install-deploy.adoc
Auto-merging modules/cluster-logging-logstore-limits.adoc
Auto-merging modules/cluster-logging-deploying-about.adoc
Auto-merging modules/cluster-logging-deploy-storage-considerations.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-storage-considerations.adoc
Auto-merging modules/cluster-logging-deploy-console.adoc
Auto-merging modules/cluster-logging-deploy-cli.adoc
Auto-merging logging/cluster-logging-deploying.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-deploying.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 RHDEVDOCS-2900 Tracker for #30976 Issue in file logging/cluster-logging-deploying.adoc Add "OpenShift" to "Elasticsearch Operator"
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.8

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/test-infra repository.

[openshift-cherrypick-robot]

@jeana-redhat: #31302 failed to apply on top of branch "enterprise-4.7":

Applying: RHDEVDOCS-2900 Tracker for #30976 Issue in file logging/cluster-logging-deploying.adoc Add "OpenShift" to "Elasticsearch Operator"
.git/rebase-apply/patch:531: trailing whitespace.
<4> The log store nodes in the cluster, with `upgradeStatus`. 
.git/rebase-apply/patch:573: trailing whitespace.
If you _must_ perform configurations not described in the {product-title} documentation, you _must_ set your Cluster Logging Operator or OpenShift Elasticsearch Operator to *Unmanaged*. An unmanaged OpenShift Logging environment is _not supported_ and does not receive updates until you return OpenShift Logging to *Managed*. 
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	logging/cluster-logging-deploying.adoc
M	modules/cluster-logging-deploy-cli.adoc
M	modules/cluster-logging-deploy-console.adoc
M	modules/cluster-logging-deploy-storage-considerations.adoc
M	modules/cluster-logging-deploying-about.adoc
M	modules/cluster-logging-logstore-limits.adoc
M	modules/dedicated-cluster-install-deploy.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/dedicated-cluster-install-deploy.adoc
Auto-merging modules/cluster-logging-logstore-limits.adoc
Auto-merging modules/cluster-logging-deploying-about.adoc
Auto-merging modules/cluster-logging-deploy-storage-considerations.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-storage-considerations.adoc
Auto-merging modules/cluster-logging-deploy-console.adoc
Auto-merging modules/cluster-logging-deploy-cli.adoc
Auto-merging logging/cluster-logging-deploying.adoc
CONFLICT (content): Merge conflict in logging/cluster-logging-deploying.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 RHDEVDOCS-2900 Tracker for #30976 Issue in file logging/cluster-logging-deploying.adoc Add "OpenShift" to "Elasticsearch Operator"
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick enterprise-4.7

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/test-infra repository.