Manual CP main fix #67428

Author: libander

modules/cluster-logging-collector-log-forward-fluentd.adoc

@@ -28,21 +28,20 @@ spec:
      url: 'tls://fluentdserver.security.example.com:24224' <5>
      secret: <6>
         name: fluentd-secret
-        passphrase: phrase <7>
    - name: fluentd-server-insecure
      type: fluentdForward
      url: 'tcp://fluentdserver.home.example.com:24224'
   pipelines:
-   - name: forward-to-fluentd-secure <8>
-     inputRefs:  <9>
+   - name: forward-to-fluentd-secure <7>
+     inputRefs:  <8>
      - application
      - audit
      outputRefs:
-     - fluentd-server-secure <10>
-     - default <11>
+     - fluentd-server-secure <9>
+     - default <10>
      labels:
-       clusterId: "C1234" <12>
-   - name: forward-to-fluentd-insecure <13>
+       clusterId: "C1234" <11>
+   - name: forward-to-fluentd-insecure <12>
      inputRefs:
      - infrastructure
      outputRefs:
@@ -56,13 +55,12 @@ spec:
 <4> Specify the `fluentdForward` type.
 <5> Specify the URL and port of the external Fluentd instance as a valid absolute URL. You can use the `tcp` (insecure) or `tls` (secure TCP) protocol. If the cluster-wide proxy using the CIDR annotation is enabled, the output must be a server name or FQDN, not an IP address.
 <6> If using a `tls` prefix, you must specify the name of the secret required by the endpoint for TLS communication. The secret must exist in the `openshift-logging` project, and must have keys of: *tls.crt*, *tls.key*, and *ca-bundle.crt* that point to the respective certificates that they represent.
-<7> Optional: Specify the password or passphrase that protects the private key file.
-<8> Optional: Specify a name for the pipeline.
-<9> Specify which log types to forward by using the pipeline: `application,` `infrastructure`, or `audit`.
-<10> Specify the name of the output to use when forwarding logs with this pipeline.
-<11> Optional: Specify the `default` output to forward logs to the internal Elasticsearch instance.
-<12> Optional: String. One or more labels to add to the logs.
-<13> Optional: Configure multiple outputs to forward logs to other external log aggregators of any supported type:
+<7> Optional: Specify a name for the pipeline.
+<8> Specify which log types to forward by using the pipeline: `application,` `infrastructure`, or `audit`.
+<9> Specify the name of the output to use when forwarding logs with this pipeline.
+<10> Optional: Specify the `default` output to forward logs to the internal Elasticsearch instance.
+<11> Optional: String. One or more labels to add to the logs.
+<12> Optional: Configure multiple outputs to forward logs to other external log aggregators of any supported type:
 ** A name to describe the pipeline.
 ** The `inputRefs` is the log type to forward by using the pipeline: `application,` `infrastructure`, or `audit`.
 ** The `outputRefs` is the name of the output to use.