Merge pull request #31908 from rolfedh/RHDEVDOCS-2945-rem-el-cur

RHDEVDOCS-2945 Remove Elasticsearch Curator from Logging 5.1

Author: Preeticp

_topic_map.yml

@@ -1846,8 +1846,6 @@ Topics:
     File: cluster-logging-moving-nodes
   - Name: Configuring systemd-journald for Logging
     File: cluster-logging-systemd
-  - Name: Configuring the log curator
-    File: cluster-logging-curator
   - Name: Maintenance and support
     File: cluster-logging-maintenance-support
 - Name: Viewing logs for a specific resource
@@ -1885,8 +1883,6 @@ Topics:
     File: cluster-logging-log-store-status
   - Name: Understanding Logging alerts
     File: cluster-logging-alerts
-  - Name: Troubleshooting the log curator
-    File: cluster-logging-troubleshooting-curator
   - Name: Collecting logging data for Red Hat Support
     File: cluster-logging-must-gather
 - Name: Uninstalling Logging

_unused_topics/cluster-logging-configuring-node-selector.adoc

@@ -45,20 +45,13 @@ spec:
       nodeSelector:  <2>
         logging: kibana
       replicas: 1
-  curation:
-    type: "curator"
-    curator:
-      nodeSelector:  <3>
-        logging: curator
-      schedule: "*/10 * * * *"
   collection:
     logs:
       type: "fluentd"
       fluentd:
-        nodeSelector:  <4>
+        nodeSelector:  <3>
         logging: fluentd
 ----
 <1> Node selector for Elasticsearch.
 <2> Node selector for Kibana.
-<3> Node selector for Curator.
-<4> Node selector for Fluentd.
+<3> Node selector for Fluentd.

logging/cluster-logging-eventrouter.adoc

@@ -1,4 +1,4 @@
-:context: cluster-logging-curator
+:context: cluster-logging-eventrouter
 [id="cluster-logging-eventrouter"]
 = Collecting and storing Kubernetes events
 include::modules/common-attributes.adoc[]
@@ -7,7 +7,7 @@ toc::[]
 
 The {product-title} Event Router is a pod that watches Kubernetes events and logs them for collection by OpenShift Logging. You must manually deploy the Event Router.
 
-The Event Router collects events from all projects and writes them to `STDOUT`. Fluentd collects those events and forwards them into the {product-title} Elasticsearch instance. Elasticsearch indexes the events to the `infra` index. 
+The Event Router collects events from all projects and writes them to `STDOUT`. Fluentd collects those events and forwards them into the {product-title} Elasticsearch instance. Elasticsearch indexes the events to the `infra` index.
 
 [IMPORTANT]
 ====

logging/config/cluster-logging-curator.adoc

@@ -9,7 +9,7 @@ toc::[]
 
 
 
-You can use node selectors to deploy the Elasticsearch, Kibana, and Curator pods to different nodes.
+You can use node selectors to deploy the Elasticsearch and Kibana pods to different nodes.
 
 // The following include statements pull in the module files that comprise
 // the assembly. Include any combination of concept, procedure, or reference

logging/config/cluster-logging-moving-nodes.adoc

@@ -8,9 +8,8 @@ toc::[]
 As a cluster administrator, you can deploy OpenShift Logging
 to aggregate logs for a range of services.
 
-{product-title} clusters can perform logging tasks using the OpenShift Elasticsearch
-Operator. OpenShift Logging is configured through the Curator tool to retain logs
-for two days.
+{product-title} clusters can perform logging tasks using the OpenShift Elasticsearch Operator.
+
 
 OpenShift Logging is configurable using a `ClusterLogging` custom resource (CR)
 deployed in the `openshift-logging` project namespace.
@@ -20,9 +19,11 @@ any missing logging components, and adjusts the logging environment accordingly.
 
 The `ClusterLogging` CR is based on the `ClusterLogging` custom resource
 definition (CRD), which defines a complete OpenShift Logging environment and
-includes all the components of the logging stack to collect, store and visualize
+includes all the components of the logging stack to collect, store, and visualize
 logs.
 
+The `retentionPolicy` parameter in the `ClusterLogging` custom resource (CR) defines how long the internal Elasticsearch log store retains logs.
+
 .Sample `ClusterLogging` custom resource (CR)
 [source,yaml]
 ----

logging/dedicated-cluster-logging.adoc

@@ -105,17 +105,7 @@ spec:
           cpu: 100m
           memory: 736Mi
       replicas: 1
-  curation: <6>
-    type: "curator"
-    curator:
-      resources:
-        limits:
-          memory: 256Mi
-        requests:
-          cpu: 100m
-          memory: 256Mi
-      schedule: "30 3 * * *"
-  collection: <7>
+  collection: <6>
     logs:
       type: "fluentd"
       fluentd:
@@ -131,6 +121,5 @@ spec:
 <3> The Red Hat OpenShift Logging Operator management state. When set to `unmanaged` the operator is in an unsupported state and will not get updates.
 <4> Settings for the log store, including retention policy, the number of nodes, the resource requests and limits, and the storage class.
 <5> Settings for the visualizer, including the resource requests and limits, and the number of pod replicas.
-<6> Settings for curation, including the resource requests and limits, and curation schedule.
-<7> Settings for the log collector, including the resource requests and limits.
+<6> Settings for the log collector, including the resource requests and limits.
 endif::[]

logging/troubleshooting/cluster-logging-troubleshooting-curator.adoc

@@ -15,14 +15,14 @@ You can view the images by running the following command:
 ----
 $ oc -n openshift-logging set env deployment/cluster-logging-operator --list | grep _IMAGE
 ----
+// logging test command and update the example output
 
+.Example output
 [source,terminal]
 ----
 FLUENTD_IMAGE=registry.redhat.io/openshift-logging/fluentd-rhel8:latest@sha256:ffdf79da7386871d2bc24cd937e02284b30f85a9979dc8c635fb73021cbca2f3 <1>
-CURATOR_IMAGE=registry.redhat.io/openshift-logging/logging-curator5-rhel8:latest@sha256:b57c5135d72a01170e1cef26af1ea79d80ce52934456cfe363280ecbe795f21a <2>
 ----
 <1> *FLUENTD_IMAGE* deploys Fluentd.
-<2> *CURATOR_IMAGE* deploys Curator.
 
 [NOTE]
 ====

modules/cluster-logging-about-crd.adoc

@@ -59,21 +59,11 @@ spec:
             cpu: 100m
             memory: 100Mi
       replicas: 2
-  curation:
-    type: "curator"
-    curator:
-      resources: <3>
-        limits:
-          memory: 200Mi
-        requests:
-          cpu: 200m
-          memory: 200Mi
-      schedule: "*/10 * * * *"
   collection:
     logs:
       type: "fluentd"
       fluentd:
-        resources: <4>
+        resources: <3>
           limits:
             memory: 736Mi
           requests:
@@ -82,5 +72,4 @@ spec:
 ----
 <1> Specify the CPU and memory limits and requests for the log store as needed. For Elasticsearch, you must adjust both the request value and the limit value.
 <2> Specify the CPU and memory limits and requests for the log visualizer as needed.
-<3> Specify the CPU and memory limits and requests for the log curator as needed.
-<4> Specify the CPU and memory limits and requests for the log collector as needed.
+<3> Specify the CPU and memory limits and requests for the log collector as needed.