From 63927ada22b926ea9a1fd3b12dd83f6783188d05 Mon Sep 17 00:00:00 2001 From: Cody Hoag Date: Wed, 6 Nov 2019 15:19:59 -0500 Subject: [PATCH] Correct Elasticsearch naming --- logging/cluster-logging.adoc | 2 +- logging/dedicated-cluster-logging.adoc | 2 +- .../creating-infrastructure-machinesets.adoc | 2 +- .../nodes-cluster-overcommit-resource-requests.adoc | 10 +++++----- .../recommended-configurable-storage-technology.adoc | 4 ++-- release_notes/ocp-4-1-release-notes.adoc | 8 ++++---- welcome/oce_about.adoc | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/logging/cluster-logging.adoc b/logging/cluster-logging.adoc index b80a10f346..b65666b984 100644 --- a/logging/cluster-logging.adoc +++ b/logging/cluster-logging.adoc @@ -11,7 +11,7 @@ As an {product-title} cluster administrator, you can deploy cluster logging to aggregate logs for a range of {product-title} services. ifdef::openshift-dedicated[] -The ElasticSearch, Fluentd, and Kibana (EFK) stack runs on worker nodes. As a +The Elasticsearch, Fluentd, and Kibana (EFK) stack runs on worker nodes. As a {product-title} administrator, you can monitor resource consumption in the console and via Prometheus and Grafana. Due to the high work load required for logging, more worker nodes may be required for your environment. diff --git a/logging/dedicated-cluster-logging.adoc b/logging/dedicated-cluster-logging.adoc index 3ef118b151..bc462fc72e 100644 --- a/logging/dedicated-cluster-logging.adoc +++ b/logging/dedicated-cluster-logging.adoc @@ -6,7 +6,7 @@ include::modules/common-attributes.adoc[] As an {product-title} cluster administrator, you can deploy cluster logging to aggregate logs for a range of services. -{product-title} clusters can perform logging tasks using the ElasticSearch +{product-title} clusters can perform logging tasks using the Elasticsearch Operator. Cluster logging is configured through the Curator tool to retain logs for two days. diff --git a/machine_management/creating-infrastructure-machinesets.adoc b/machine_management/creating-infrastructure-machinesets.adoc index 421e721879..dd364d1f21 100644 --- a/machine_management/creating-infrastructure-machinesets.adoc +++ b/machine_management/creating-infrastructure-machinesets.adoc @@ -25,7 +25,7 @@ include::modules/infrastructure-components.adoc[leveloffset=+1] In a production deployment, deploy at least three MachineSets to hold infrastructure components. Both the logging aggregation solution and -the service mesh deploy ElasticSearch, and ElasticSearch requires three +the service mesh deploy Elasticsearch, and Elasticsearch requires three instances that are installed on different nodes. For high availability, install deploy these nodes to different availability zones. Since you need different MachineSets for each availability zone, create at least three MachineSets. diff --git a/modules/nodes-cluster-overcommit-resource-requests.adoc b/modules/nodes-cluster-overcommit-resource-requests.adoc index e10511acc0..237837ff6e 100644 --- a/modules/nodes-cluster-overcommit-resource-requests.adoc +++ b/modules/nodes-cluster-overcommit-resource-requests.adoc @@ -70,8 +70,8 @@ The value of `buffer_queue_limit` will be `32`. To change the `buffer_queue_limi In this formula, `number_of_outputs` is `1` if all the logs are sent to a single resource, and it is incremented by `1` for each additional resource. For example, the value of `number_of_outputs` is: - * `1` - if all logs are sent to a single ElasticSearch pod - * `2` - if application logs are sent to an ElasticSearch pod and ops logs are sent to -another ElasticSearch pod - * `4` - if application logs are sent to an ElasticSearch pod, ops logs are sent to -another ElasticSearch pod, and both of them are forwarded to other Fluentd instances + * `1` - if all logs are sent to a single Elasticsearch pod + * `2` - if application logs are sent to an Elasticsearch pod and ops logs are sent to +another Elasticsearch pod + * `4` - if application logs are sent to an Elasticsearch pod, ops logs are sent to +another Elasticsearch pod, and both of them are forwarded to other Fluentd instances diff --git a/modules/recommended-configurable-storage-technology.adoc b/modules/recommended-configurable-storage-technology.adoc index 3508d89206..dc52fbbf51 100644 --- a/modules/recommended-configurable-storage-technology.adoc +++ b/modules/recommended-configurable-storage-technology.adoc @@ -65,7 +65,7 @@ A scaled registry is an {product-title} registry where three or more pod replica ==== Testing shows issues with using the NFS server on RHEL as storage backend for the container image registry. This includes the OpenShift Container Registry and Quay, Cassandra -for metrics storage, and ElasticSearch for logging storage. Therefore, using NFS +for metrics storage, and Elasticsearch for logging storage. Therefore, using NFS to back PVs used by core services is not recommended. Other NFS implementations on the marketplace might not have these issues. @@ -118,7 +118,7 @@ In an {product-title} hosted logging cluster deployment: [IMPORTANT] ==== Testing shows issues with using the NFS server on RHEL as storage backend for -the container image registry. This includes ElasticSearch for logging storage. +the container image registry. This includes Elasticsearch for logging storage. Therefore, using NFS to back PVs used by core services is not recommended. Other NFS implementations on the marketplace might not have these issues. diff --git a/release_notes/ocp-4-1-release-notes.adoc b/release_notes/ocp-4-1-release-notes.adoc index 7fad94dae8..9e46a7d4ce 100644 --- a/release_notes/ocp-4-1-release-notes.adoc +++ b/release_notes/ocp-4-1-release-notes.adoc @@ -795,12 +795,12 @@ will fail and may require a username and password challenge if enabled. `ServiceAccountTokenVolumeProjection` is used. (link:https://bugzilla.redhat.com/show_bug.cgi?id=1695196[*BZ#1695196*]) -* The `es nodeCount` in ElasticSearch CRD instances can not be scaled up if +* The `es nodeCount` in Elasticsearch CRD instances can not be scaled up if deployed with three nodes. Scaling works correctly if deployed with one, two, -four, five or six ElasticSearch CRD instances. +four, five or six Elasticsearch CRD instances. (link:https://bugzilla.redhat.com/show_bug.cgi?id=1712955[*BZ#1712955*]) -* ElasticSearch instances created from OperatorHub deploy with a one CPU limit, +* Elasticsearch instances created from OperatorHub deploy with a one CPU limit, even though no limits are specified. (link:https://bugzilla.redhat.com/show_bug.cgi?id=1710657[*BZ#1710657*]) @@ -850,7 +850,7 @@ deployed due a pod stuck in a `Pending` status. Broadwell CPU model 79 (type m4) because the `microcode_ctl` will not update. (link:https://bugzilla.redhat.com/show_bug.cgi?id=1710981[*BZ#1710981*]) -* New ElasticSearch deployments can not be created if another ElasticSearch +* New Elasticsearch deployments can not be created if another Elasticsearch deployment is stuck in a deleting state. (link:https://bugzilla.redhat.com/show_bug.cgi?id=1711044[*BZ#1711044*]) diff --git a/welcome/oce_about.adoc b/welcome/oce_about.adoc index 9dbefe1d4e..2c56e7eb2b 100644 --- a/welcome/oce_about.adoc +++ b/welcome/oce_about.adoc @@ -160,7 +160,7 @@ the kubevirt.io open source project. === Advanced cluster management A {oce} subscription does not offer a cluster-wide log aggregation -solution or support ElasticSearch, Fluentd, Kibana based logging solutions. +solution or support Elasticsearch, Fluentd, Kibana based logging solutions. Similarly the chargeback features found in {product-title} and Red Hat Service Mesh capabilities derived from the open source Istio.io and kiali.io projects that offers OpenTracing observability for containerized services on