From dfeadbf18ccf991ce86cd97ac4740618b99b71b4 Mon Sep 17 00:00:00 2001 From: Dave Wilde Date: Thu, 7 Jun 2018 10:19:10 -0500 Subject: [PATCH] Typo and bug fixes Corrects a couple of typos and adds a check for named_index. Change-Id: I6109623d6ce59dcbbf296830e619489030d42988 Signed-off-by: Kevin Carter --- elk_metrics_6x/readme.rst | 6 +++--- elk_metrics_6x/templates/_include_log_stash_output.yml.j2 | 3 +-- elk_metrics_6x/templates/journalbeat.yml.j2 | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/elk_metrics_6x/readme.rst b/elk_metrics_6x/readme.rst index 386142a8..cf1c4671 100644 --- a/elk_metrics_6x/readme.rst +++ b/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 diff --git a/elk_metrics_6x/templates/_include_log_stash_output.yml.j2 b/elk_metrics_6x/templates/_include_log_stash_output.yml.j2 index 322ac439..2aeffe6b 100644 --- a/elk_metrics_6x/templates/_include_log_stash_output.yml.j2 +++ b/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 diff --git a/elk_metrics_6x/templates/journalbeat.yml.j2 b/elk_metrics_6x/templates/journalbeat.yml.j2 index df73ac2c..e9186d1f 100644 --- a/elk_metrics_6x/templates/journalbeat.yml.j2 +++ b/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 ----------------------------------