Fix typo in the cluster logging templates

[lbscorpio]

@vikram-redhat There are two issues on the templates of cluster logging docs, minimum version that the change applies to should be 4.6 in my opinion, could you review them? Thanks.

1. modules/cluster-logging-deploy-console.adoc
   One more same comment for <6>, should remove it.

2. modules/cluster-logging-elasticsearch-audit.adoc
   On OCP 4.6.x(not test on OCP 4.7 yet, might be same):
   spec.outputs.url in body should match '^$|[a-zA-z]+://.*'" for field "spec.outputs.url".
   supported values: "syslog", "fluentdForward", "elasticsearch", "kafka"" for field "spec.outputs.type".

[netlify]

Deploy preview for osdocs ready!

Built with commit 1445741

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

[vikram-redhat]

@rolfedh can you take a look? Should this apply to 4.7 as well?

[rolfedh]

@rolfedh can you take a look? Should this apply to 4.7 as well?

Yes, it should apply to 4.7.
I'll ask a Logging QE to review and approve this proposed change before we merge it.

[rolfedh]

Hello @anpingli. Would you review the issue @lbscorpio describes above and the changes they are proposing? Thank you.

[anpingli]

https://elasticsearch-secure.svc.messaging.cluster.local should be https://elasticsearch-secure.messaging.svc.cluster.local

[lbscorpio]

@anpingli If so, 4.5 also used the wrong URLs? And http://elasticsearch-secure.svc.messaging.cluster.local should be http://elasticsearch-secure.messaging.svc.cluster.local, am I right? Thanks.

https://docs.openshift.com/container-platform/4.5/logging/cluster-logging-external.html
https://docs.openshift.com/container-platform/4.5/logging/config/cluster-logging-log-store.html

[anpingli]

@lbscorpio yes, the URLs is wrong before.

[rolfedh]

@lbscorpio It looks like 4.5 has the same issues you and @anpingli found here, but in slightly different file locations. Therefore, cherrypicking this PR back to 4.5 won't work.

Please let me know if you want me to fix these issues in 4.5, or if you plan to do it.

Rolfe

[lbscorpio]

@anpingli Sorry, what did you mean? Which URLs not wrong? If the correct one is end with .svc.cluster.local, do you want me to add new change to this PR? Thanks.

https://docs.openshift.com/container-platform/4.5/logging/cluster-logging-external.html
https://docs.openshift.com/container-platform/4.5/logging/config/cluster-logging-log-store.html

Both pages used below URL:
endpoint: elasticsearch-insecure.svc.messaging.cluster.local

[lbscorpio]

@rolfedh Thanks for your feedback. I will wait @anpingli to double confirm firstly. This PR will handle 4.6+, I can raise another PR for 4.5 once confirm, thanks.

[anpingli]

@lbscorpio Yes, the correct one is end with .svc.cluster.local.

[lbscorpio]

@anpingli Thanks for your information.

@rolfedh I have added the new change for 4.6, new commit is efb6727. For 4.5, I raised #29679 to correct the URLs, fyi, thanks.

[rolfedh]

Thanks, @lbscorpio. This looks good. Would you like help to resolve these conflicts?
The duplicate entry in modules/cluster-logging-deploy-console.adoc has already been fixed in master.
Removing that change from your PR should resolve the conflict.

[lbscorpio]

@rolfedh I have removed the duplicate entry in modules/cluster-logging-deploy-console.adoc in my commit, new commit is 1445741, thanks.

[rolfedh]

[enterprise-4.6]
[enterprise-4.7]
[enterprise-4.8]

[anpingli]

/lgtm

[anpingli]

/lgtm

[codyhoag]

YAML edits LGTM!

[codyhoag]

/cherrypick enterprise-4.8

[openshift-cherrypick-robot]

@codyhoag: new pull request created: #30183

Details

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.

[codyhoag]

/cherrypick enterprise-4.7

[openshift-cherrypick-robot]

@codyhoag: new pull request created: #30184

Details

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.

[codyhoag]

/cherrypick enterprise-4.6

[openshift-cherrypick-robot]

@codyhoag: new pull request created: #30185

Details

In response to this:

/cherrypick enterprise-4.6

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.