Skip to content

Conversation

rolfedh
Copy link
Contributor

@rolfedh rolfedh commented Jan 18, 2021

…ift Logging"
https://issues.redhat.com/browse/RHDEVDOCS-2493

Replaced most instances of "cluster logging" with "OpenShift Logging," as requested, with the following exceptions:

  • "Cluster Logging Custom Resource"
  • "cluster logging operator"
  • References of "Cluster Logging" in the product UI, such as in "Choose Cluster Logging from the list of available Operators, and click Install."

@openshift-ci-robot openshift-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jan 18, 2021
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 18, 2021
@rolfedh
Copy link
Contributor Author

rolfedh commented Jan 18, 2021

@alexissolanas @linuxstudio @ptrknvk Please take a look. Thanks.

@rolfedh rolfedh changed the title RHDEVDOCS-2493 Logging: Change name from "cluster logging" to "OpenSh… RHDEVDOCS-2493 Logging: Change name from "cluster logging" to "OpenSh… [enterprise-4.7] Jan 18, 2021
Copy link
Contributor

@bobfuru bobfuru left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some small items to fix but overall looks good.

@bobfuru bobfuru added peer-review-done Signifies that the peer review team has reviewed this PR branch/enterprise-4.7 labels Jan 18, 2021
@bobfuru bobfuru added this to the Future Release milestone Jan 18, 2021
@bobfuru
Copy link
Contributor

bobfuru commented Jan 19, 2021

LGTM

@bobfuru bobfuru merged commit 3925583 into openshift:master Jan 19, 2021
@bobfuru
Copy link
Contributor

bobfuru commented Jan 19, 2021

/cherrypick enterprise-4.7

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Jan 19, 2021

@bobfuru: #28650 failed to apply on top of branch "enterprise-4.7":

Applying: [RHDEVDOCS-2493](https://issues.redhat.com/browse/RHDEVDOCS-2493) Logging: Change name from "cluster logging" to "OpenShift Logging"
.git/rebase-apply/patch:150: trailing whitespace.
You can uninstall the infra cluster from OpenShift Logging. 
.git/rebase-apply/patch:184: trailing whitespace.
creates and manages the Elasticsearch cluster used by OpenShift Logging. 
.git/rebase-apply/patch:386: trailing whitespace.
You can configure both the CPU and memory limits for each of the OpenShift Logging components as needed. 
.git/rebase-apply/patch:450: trailing whitespace.
You can use taints and tolerations to ensure that OpenShift Logging pods run 
.git/rebase-apply/patch:611: trailing whitespace.
= About OpenShift Logging components 
warning: squelched 13 whitespace errors
warning: 18 lines add whitespace errors.
Using index info to reconstruct a base tree...
A	_unused_topics/cluster-logging-configuring-node-selector.adoc
A	_unused_topics/cluster-logging-elasticsearch-admin.adoc
A	_unused_topics/cluster-logging-exported-fields-docker.adoc
A	_unused_topics/cluster-logging-uninstall-cluster-ops.adoc
M	logging/cluster-logging-deploying.adoc
M	logging/cluster-logging-external.adoc
M	logging/cluster-logging-upgrading.adoc
M	logging/cluster-logging.adoc
M	modules/cluster-logging-about-crd.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-elasticsearch-audit.adoc
M	modules/cluster-logging-logstore-limits.adoc
M	modules/cluster-logging-manual-rollout-rolling.adoc
M	modules/dedicated-cluster-install-deploy.adoc
M	modules/infrastructure-moving-logging.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/infrastructure-moving-logging.adoc
Auto-merging modules/dedicated-cluster-install-deploy.adoc
Auto-merging modules/cluster-logging-manual-rollout-rolling.adoc
Auto-merging modules/cluster-logging-logstore-limits.adoc
Auto-merging modules/cluster-logging-elasticsearch-audit.adoc
Auto-merging modules/cluster-logging-deploying-about.adoc
Auto-merging modules/cluster-logging-deploy-storage-considerations.adoc
Auto-merging modules/cluster-logging-deploy-console.adoc
Auto-merging modules/cluster-logging-deploy-cli.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-deploy-cli.adoc
Auto-merging modules/cluster-logging-configuring-node-selector.adoc
CONFLICT (content): Merge conflict in modules/cluster-logging-configuring-node-selector.adoc
Auto-merging modules/cluster-logging-about-crd.adoc
Auto-merging logging/cluster-logging.adoc
Auto-merging logging/cluster-logging-upgrading.adoc
Auto-merging logging/cluster-logging-external.adoc
Auto-merging 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-2493](https://issues.redhat.com/browse/RHDEVDOCS-2493) Logging: Change name from "cluster logging" to "OpenShift Logging"
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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR 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.

6 participants