Merge pull request #14034 from mburke5678/logging-fluentd-40

Update Fluentd for 4.0

Author: mburke5678

modules/efk-logging-fluentd-external.adoc

@@ -74,9 +74,9 @@ secret that is mounted on the Fluentd pods. The `your_ca_cert` and
 in `configmap/logging-fluentd`:
 +
 ----
-$ oc patch secrets/logging-fluentd --type=json \
+$ oc patch secrets/fluentd --type=json \
   --patch "[{'op':'add','path':'/data/your_ca_cert','value':'$(base64 /path/to/your_ca_cert.pem)'}]"
-$ oc patch secrets/logging-fluentd --type=json \
+$ oc patch secrets/fluentd --type=json \
   --patch "[{'op':'add','path':'/data/your_private_key','value':'$(base64 /path/to/your_private_key.pem)'}]"
 ----
 +

modules/efk-logging-fluentd-limits.adoc

@@ -9,7 +9,9 @@ Each component specification allows for adjustments to both the CPU and memory l
 
 .Prerequisite
 
-If needed, get the name of the Cluster Logging Custom Resource from the `openshift-logging` project:
+* Set cluster logging to the unmanaged state.
+
+* If needed, get the name of the Cluster Logging Custom Resource from the `openshift-logging` project:
 
 ----
 $ oc get ClusterLogging
@@ -38,11 +40,11 @@ spec:
       elasticsearch:
         resources: <1>
           limits:
-            cpu:
-            memory:
+            cpu: 500m
+            memory: 4Gi
           requests:
-            cpu:
-            memory:
+            cpu: 500m
+            memory: 4Gi
 ----
 
-<1> Specify the CPU and memory limits as needed.
+<1> Specify the CPU and memory limits as needed. The values shown are the default values.

modules/efk-logging-fluentd-log-location.adoc

@@ -16,18 +16,27 @@ Set cluster logging to the unmanaged state.
 
 To set the output location for the Fluentd logs:
 
-. Edit the `LOGGING_FILE_PATH` parameter. You can specify a particular file or `STDOUT`:
+. Edit the `LOGGING_FILE_PATH`  parameter in the `fluentd` daemonset. You can specify a particular file or `console`:
 +
 ----
-LOGGING_FILE_PATH=console <1>
-LOGGING_FILE_PATH=<path-to-log/fluentd.log> <2>
+spec:
+  template:
+    spec:
+      containers:
+          env:            
+            - name: LOGGING_FILE_PATH
+              value: console <1>
+
+LOGGING_FILE_PATH= <2>
 ----
-<1> Sends the log output to the Fluentd default location. Retrieve the logs with the `oc logs [-f] <pod_name>` command.
-<2> Sends the log output to the specified file. Retrieve the logs with the `oc exec <pod_name> -- logs` command.
+<1> Specify the log output method: 
+* use `consule` to use the Fluentd default location. Retrieve the logs with the `oc logs [-f] <pod_name>` command.
+* use `<path-to-log/fluentd.log> to sends the log output to the specified file. Retrieve the logs with the `oc exec <pod_name> -- logs` command.
+This is the default setting.
 +
-For example:
+Or, use the CLI:
 +
 ----
-oc -n openshift-logging set env daemonset/fluentd --list | grep LOGGING_FILE_PATH
+oc -n openshift-logging set env daemonset/fluentd LOGGING_FILE_PATH=console
 ----
 

modules/efk-logging-fluentd-log-rotation.adoc

@@ -19,6 +19,10 @@ fluentd.log.3  1Mb
 fluentd.log.4  1Mb
 ----
 
+.Prerequisites
+
+Set cluster logging to the unmanaged state.
+
 .Procedure
 
 You can control the size of the Fluentd log files and how many of the renamed files that {product-title} retains using
@@ -37,5 +41,5 @@ environment variables.
 For example:
 
 ----
-$ oc set env ds/logging-fluentd LOGGING_FILE_AGE=30 LOGGING_FILE_SIZE=1024000"
+$ oc set env daemonset/fluentd LOGGING_FILE_AGE=30 LOGGING_FILE_SIZE=1024000"
 ----

modules/efk-logging-fluentd-log-viewing.adoc

@@ -7,40 +7,41 @@
 
 How you view logs depends upon the `LOGGING_FILE_PATH` setting.
 
-* If you are using `LOGGING_FILE_PATH=console`,  Fluentd writes logs to stdout/stderr`. 
-You can retrieve the logs with the `oc logs [-f] <pod_name>` command, where the `-f`
-is optional, from the project where the pod is located.
+* If `LOGGING_FILE_PATH` points to a file, the default, use the *logs* utility, from the project, 
+where the pod is located, to print out the contents of Fluentd log files:
 +
 ----
-$ oc logs -f <pod> <1>
+$ oc exec <pod> -- logs <1>
 ----
-<1> Specify the name of the Fluentd pod. Use `-f` option to follow what is being written into the logs.
+<1> Specify the name of the Fluentd pod. Note the space before `logs`.
 +
-For example
+For example:
 +
 ----
-$ oc logs -f fluentd-lmvms
+$ oc exec etcd-member-ip-30.ec2.internal -n kube-system -- logs
 ----
 +
-The contents of log files are printed out, starting with the oldest log. 
-
-* If `LOGGING_FILE_PATH` points to a file, use the *logs* utility, from the project, 
-where the pod is located, to print out the contents of Fluentd log files:
+To view the current setting:
 +
 ----
-$ oc exec <pod> -- logs <1>
+oc -n openshift-logging set env daemonset/fluentd --list | grep LOGGING_FILE_PATH
 ----
-<1> Specify the name of the Fluentd pod. Note the space before `logs`.
-+
-For example:
+
+* If you are using `LOGGING_FILE_PATH=console`,  Fluentd writes logs to stdout/stderr`. 
+You can retrieve the logs with the `oc logs [-f] <pod_name>` command, where the `-f`
+is optional, from the project where the pod is located.
 +
 ----
-$ oc exec fluentd-lmvms -- logs
+$ oc logs -f <pod> <1>
 ----
+<1> Specify the name of the Fluentd pod. Use `-f` option to follow what is being written into the logs.
 +
-To view the current setting:
+For example
 +
 ----
-oc -n openshift-logging set env daemonset/fluentd --list | grep LOGGING_FILE_PATH
+$ oc logs -f etcd-member-ip-30.ec2.internal -n kube-system
 ----
++
+The contents of log files are printed out, starting with the oldest log. 
+
 

modules/efk-logging-fluentd-pod-location.adoc

@@ -9,13 +9,16 @@ You can use the `oc get pods -o wide` command to see the nodes where the Fluentd
 
 .Procedure
 
-Run the following command:
+Run the following command from th e`openshift-logging` project:
 
 ----
-$ oc get pods -o wide
+$ oc get pods -o wide | grep fluentd
 
-NAME                                       READY     STATUS    RESTARTS   AGE       IP             NODE                         NOMINATED NODE
-es-logging-data-master-5av030lk-1-2x494    2/2       Running   0          38m       154.128.0.80   ip-153-12-8-6.wef.internal   <none>
-fluentd-logging-lqdxg                      1/1       Running   0          2m        154.128.0.85   ip-153-12-8-6.wef.internal   <none>
-kibana-logging-1-gj5kc                     2/2       Running   0          39m       154.128.0.77   ip-153-12-8-6.wef.internal   <none>
+NAME                         READY     STATUS    RESTARTS   AGE     IP            NODE                           NOMINATED NODE
+fluentd-5mr28                1/1       Running   0          4m56s   10.129.2.12   ip-10-0-164-233.ec2.internal   <none>
+fluentd-cnc4c                1/1       Running   0          4m56s   10.128.2.13   ip-10-0-155-142.ec2.internal   <none>
+fluentd-nlp8z                1/1       Running   0          4m56s   10.131.0.13   ip-10-0-138-77.ec2.internal    <none>
+fluentd-rknlk                1/1       Running   0          4m56s   10.128.0.33   ip-10-0-128-130.ec2.internal   <none>
+fluentd-rsm49                1/1       Running   0          4m56s   10.129.0.37   ip-10-0-163-191.ec2.internal   <none>
+fluentd-wjt8s                1/1       Running   0          4m56s   10.130.0.42   ip-10-0-156-251.ec2.internal   <none>
 ----

modules/efk-logging-fluentd-throttling.adoc

@@ -40,11 +40,10 @@ node. The default is 1000 lines at a time per node. For example:
 * Projects
 +
 ----
-project-name:
-  read_lines_limit: 50
+throttle-config.yaml: |
 
-second-project-name:
-  read_lines_limit: 100
+   opensift-logging: <1>
+     read_lines_limit: 10
 ----
 
 * Logging
@@ -115,4 +114,5 @@ logging-infra-fluentd: "true".
 ----
 $ oc patch ds logging-fluentd -p '{"spec":{"template":{"spec":{"nodeSelector":{"logging-infra-fluentd":"true"}}}}}'
 ----
-////
+////
+