Skip to content

Commit 8146e43

Browse files
authored
Merge pull request #13580 from mburke5678/logging-remove-ansible
Removing Ansible from Logging topics
2 parents 531f280 + 1ccad7b commit 8146e43

22 files changed

+36
-746
lines changed

logging/efk-logging-deploy.adoc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ The process for deploying the EFK into {prouct-title} involves:
99

1010
* Preparing yourself and your environment;
1111
12-
* Editing the Ansible inventory file for your environment;
13-
14-
* Running the logging installer Ansible playbook.
12+
* Installing the Cluster Logging subscription using the web console.
1513
1614
// The following include statements pull in the module files that comprise
1715
// the assembly. Include any combination of concept, procedure, or reference
@@ -22,12 +20,8 @@ include::modules/efk-logging-deploy-pre.adoc[leveloffset=+1]
2220

2321
include::modules/efk-logging-storage-considerations.adoc[leveloffset=+1]
2422

25-
include::modules/efk-logging-deploy-variables.adoc[leveloffset=+1]
26-
2723
include::modules/efk-logging-deploy-memory.adoc[leveloffset=+1]
2824

2925
include::modules/efk-logging-deploy-certificates.adoc[leveloffset=+1]
3026

31-
include::modules/efk-logging-deploy-playbook.adoc[leveloffset=+1]
32-
3327
include::modules/efk-logging-deploy-label.adoc[leveloffset=+1]

logging/efk-logging-uninstall.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ include::modules/common-attributes.adoc[]
55

66
toc::[]
77

8-
You can use an Ansible playbook to remove the EFK stack from your {product-title} cluster.
8+
You can remove cluster logging from your {product-title} cluster.
99

1010
// The following include statements pull in the module files that comprise
1111
// the assembly. Include any combination of concept, procedure, or reference

modules/efk-logging-about-elasticsearch.adoc

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@ You can configure Elasticsearch to make copies of the shards, called _replicas_.
1212
the Elasticsearch nodes. The *ClusterLogging* Custom Resource allows you to specify the replication policy in the Custom Resource Definition (CRD) to provide data redundancy and resilience to failure.
1313

1414
The Cluster Logging Operator and companion Elasticsearch Operator ensure that each Elasticsearch node is deployed using a unique deployment configuration that includes its own storage volume.
15-
During installation, you can use the `openshift_logging_es_cluster_size` Ansible variable to specify the number of Elasticsearch nodes.
16-
Or, you can scale up your existing cluster by modifying the
17-
`openshift_logging_es_cluster_size` in the inventory file and re-running the
18-
logging playbook. Additional clustering parameters can be modified and are
19-
described in *Specifying Logging Ansible Variables*.
20-
15+
You can use the cluster logging Custom Resource to increase the number of Elasticsearch nodes.
2116
Refer to
2217
link:https://www.elastic.co/guide/en/elasticsearch/guide/current/hardware.html[Elastic's
2318
documentation] for considerations involved in choosing storage and
@@ -26,8 +21,7 @@ network location as directed below.
2621
[NOTE]
2722
====
2823
A highly-available Elasticsearch environment requires at least three Elasticsearch nodes,
29-
each on a different host, and setting the `openshift_logging_es_number_of_replicas` Ansible variable
30-
to a value of `1` or higher to create replicas.
24+
each on a different host.
3125
====
3226

3327
For more information, see https://www.elastic.co/products/elasticsearch[Elasticsearch (ES)].

modules/efk-logging-curator-configuration.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[id='efk-logging-curator-configuration_{context}']
66
= Creating the Curator configuration
77

8-
The `openshift_logging` Ansible role provides a ConfigMap from which Curator
8+
The installation provides a ConfigMap from which Curator
99
reads its configuration. You may edit or replace this ConfigMap to reconfigure
1010
Curator. Currently the `logging-curator` ConfigMap is used to configure both
1111
your ops and non-ops Curator instances. Any `.operations` configurations are

modules/efk-logging-deploy-certificates.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[id='efk-logging-deploy-certificates_{context}']
66
= Deploying custom certificates
77

8-
You can specify custom certificates using the following inventory variables
8+
You can specify custom certificates using the following variables
99
instead of relying on those generated during the deployment process. These
1010
certificates are used to encrypt and secure communication between a user's
1111
browser and Kibana. The security-related files will be generated if they are not

modules/efk-logging-deploy-memory.adoc

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,9 @@
88
By default the amount of RAM allocated to each ES instance is 16GB. You can change this value as needed.
99

1010
Keep in mind that *half* of this value will be passed to the individual
11-
elasticsearch pods java processes
11+
Elasticsearch pods java processes
1212
link:https://www.elastic.co/guide/en/elasticsearch/guide/current/heap-sizing.html#_give_half_your_memory_to_lucene[heap
1313
size].
1414

1515
.Procedure
1616

17-
. Edit the Ansible inventory file, by default *_/etc/Ansible/hosts_*.
18-
19-
. Add or set the openshift_logging_use_ops to true.
20-
+
21-
----
22-
openshift_logging_es_memory_limit=<memory>
23-
----
24-
25-
. Run the Ansible playbook as shown below.

modules/efk-logging-deploy-playbook.adoc

Lines changed: 0 additions & 75 deletions
This file was deleted.

modules/efk-logging-deploy-pre.adoc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ Before deploying cluster logging into {product-title} perform the following task
1111

1212
. Be familiar with the following:
1313
+
14-
.. An Ansible playbook is available to deploy and upgrade aggregated logging. You
15-
should familiarize yourself with the {product-title} installation process. The installation process
16-
includes information for preparing to use Ansible and using the Ansible inventory file to configure
17-
various areas of cluster logging.
18-
+
1914
.. Review the *Storage Considerations for Cluster Logging and {product-title}* to determine how best to configure your deployment.
2015

2116
. Make sure your environment meets the following requirements:

0 commit comments

Comments
 (0)