Merge "Typo and bug fixes"

elk_metrics_6x/readme.rst

@@ -39,7 +39,7 @@ lines.
 .. code-block:: yaml
 
     haproxy_extra_services:
-     - service:
+      - service:
           haproxy_service_name: kibana
           haproxy_ssl: False
           haproxy_backend_nodes: "{{ groups['kibana'] | default([]) }}"
@@ -64,7 +64,7 @@ lines.
 Optional | add OSProfiler to an OpenStack-Ansible deployment
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-To initalize the `OSProfiler` module within openstack the following overrides
+To initialize the `OSProfiler` module within openstack the following overrides
 can be applied to the to a user variables file. The hmac key needs to be defined
 consistently throughout the environment.
 
@@ -106,7 +106,7 @@ OpenStack-Ansible deployment.
     trove_config_overrides: *os_profiler
 
 
-If a deployer wishes to use multiple keys they can do so by with comma seperated
+If a deployer wishes to use multiple keys they can do so by with comma separated
 list.
 
 .. code-block:: yaml

elk_metrics_6x/templates/_include_log_stash_output.yml.j2

@@ -34,12 +34,11 @@ output.logstash:
   # if no error is encountered.
   slow_start: true
 
-{% if _named_index is defined %}
+{% if named_index is defined %}
   # Optional index name. The default index name is set to {{ named_index }}
   # in all lowercase.
   index: '{{ named_index }}'
 {% endif %}
-
   # SOCKS5 proxy server URL
   #proxy_url: socks5://user:password@socks5-server:2233
 

elk_metrics_6x/templates/journalbeat.yml.j2

@@ -280,8 +280,8 @@ name: journalbeat
 
 
 #----------------------------- Logstash output ---------------------------------
-{% with _named_index="journalbeat" %}
-{% include 'templates/_include_log_stash_output.yml.j2' %}
+{% with named_index="journalbeat" %}
+{%   include 'templates/_include_log_stash_output.yml.j2' %}
 {% endwith %}
 
 #------------------------------- Kafka output ----------------------------------