diff --git a/.kitchen.yml b/.kitchen.yml index a8d440a..6425c86 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -21,7 +21,7 @@ provisioner: extra_vars: es_major_version: "<%= ENV['VERSION'] %>" <% if ENV['VERSION'] == '5.x' %> - es_version: '5.6.8' + es_version: '5.6.9' <% end %> <% end %> diff --git a/README.md b/README.md index 7c49204..49432f2 100644 --- a/README.md +++ b/README.md @@ -338,13 +338,16 @@ In addition to es_config, the following parameters allow the customization of th * ```es_start_service``` (true (default) or false) * ```es_plugins_reinstall``` (true or false (default) ) * ```es_plugins``` an array of plugin definitions e.g.: -* ```es_path_repo``` Sets the whitelist for allowing local back-up repositories -* ```es_action_auto_create_index ``` Sets the value for auto index creation, use the syntax below for specifying indexes (else true/false): - es_action_auto_create_index: '[".watches", ".triggered_watches", ".watcher-history-*"]' ```yml es_plugins: - plugin: ingest-geoip ``` +* ```es_path_repo``` Sets the whitelist for allowing local back-up repositories +* ```es_action_auto_create_index ``` Sets the value for auto index creation, use the syntax below for specifying indexes (else true/false): + es_action_auto_create_index: '[".watches", ".triggered_watches", ".watcher-history-*"]' +* ```es_path_repo``` Sets the whitelist for allowing local back-up repositories +* ```es_action_auto_create_index ``` Sets the value for auto index creation, use the syntax below for specifying indexes (else true/false): + es_action_auto_create_index: '[".watches", ".triggered_watches", ".watcher-history-*"]' * ```es_allow_downgrades``` For development purposes only. (true or false (default) ) * ```es_java_install``` If set to false, Java will not be installed. (true (default) or false) * ```update_java``` Updates Java to the latest version. (true or false (default)) diff --git a/defaults/main.yml b/defaults/main.yml index 56b2df9..52ec07c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,6 @@ --- es_major_version: "6.x" -es_version: "6.2.3" +es_version: "6.2.4" es_version_lock: false es_use_repository: true es_templates_fileglob: "files/templates/*.json" diff --git a/templates/elasticsearch.yml.j2 b/templates/elasticsearch.yml.j2 index ee93aba..739ed14 100644 --- a/templates/elasticsearch.yml.j2 +++ b/templates/elasticsearch.yml.j2 @@ -85,4 +85,4 @@ xpack.notification.email: password: {{ es_mail_config['pass'] }} {% endif %} -{% endif %} \ No newline at end of file +{% endif %}