Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

[7.x] add support for elasticsearch 7.x #558

Merged
merged 27 commits into from
May 9, 2019
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
cf7b4c8
[test] update kitchen-ansible configuration
jmlrt May 2, 2019
8637736
[doc] update supported platforms in README
jmlrt May 2, 2019
0ae58a7
[7.x] add support for elasticsearch 7.x
jmlrt May 2, 2019
09f1abd
Revert "[test] update kitchen-ansible configuration"
jmlrt May 2, 2019
eb168a6
[test] update kitchen-ansible configuration
jmlrt May 2, 2019
83f78bf
[test] replace geoip plugin in tests as this one is now embeded in el…
jmlrt May 3, 2019
3c218eb
[test] force again UTF-8 locale-gen on ubuntu
jmlrt May 3, 2019
4ce8a89
[test] ensure every apt command is forced and quiet
jmlrt May 3, 2019
389716b
[es] remove 5.x support
jmlrt May 3, 2019
f0b2d8d
[test] fix packages requirements
jmlrt May 3, 2019
d087543
[es] update version and remove last 5.x mentions
jmlrt May 3, 2019
643706f
[test] remove deprecated conditions (needed for 5.x)
jmlrt May 3, 2019
2110e0a
[es] remove deprecated configuration
jmlrt May 3, 2019
175abea
[es] update test and docs for deprecated parameters
jmlrt May 3, 2019
cc73e03
[es] handle different templates structure for es 7.x and 7.x
jmlrt May 3, 2019
8b856e4
[es] allow forcing es_major_version for upgrade tests
jmlrt May 6, 2019
2954410
[es] remove usage of deprecated security realms settings
jmlrt May 6, 2019
f9b2071
[test] use different for security realms in test es 6.x and test es 7.x
jmlrt May 6, 2019
29def4e
[test] fix security setting test
jmlrt May 6, 2019
1f3c24d
[test] fix serverspec syntax
jmlrt May 6, 2019
e2060a5
fixes after pr review
jmlrt May 7, 2019
a80e3d5
fix typo
jmlrt May 7, 2019
5383148
fix test after pr review
jmlrt May 7, 2019
729b3fa
Merge branch 'master' into es-7.x
jmlrt May 7, 2019
d652f4c
[test] fix multi-instances test
jmlrt May 7, 2019
44e1033
Merge branch 'es-7.x' of github.com:elastic/ansible-elasticsearch int…
jmlrt May 7, 2019
549a9a7
disable discovery on master nodes to avoid "master_not_discovered_exc…
jmlrt May 7, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[es] handle different templates structure for es 7.x and 7.x
jmlrt committed May 3, 2019

Unverified

This user has not yet uploaded their public signing key.
commit cc73e0351dbaba819ba0d64c525862e61a58ae5d
2 changes: 1 addition & 1 deletion defaults/main.yml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ es_enable_xpack: true
es_package_name: "elasticsearch"
es_version_lock: false
es_use_repository: true
es_templates_fileglob: "files/templates/*.json"
es_templates_fileglob: "files/templates-{{ es_major_version }}/*.json"
es_repo_base: "https://artifacts.elastic.co"
es_apt_key: "{{ es_repo_base }}/GPG-KEY-elasticsearch"
es_apt_url: "deb {{ es_repo_base }}/packages/{{ es_repo_name }}/apt stable main"
File renamed without changes.
9 changes: 9 additions & 0 deletions files/templates-7.x/basic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"index_patterns" : "te*",
"settings" : {
"number_of_shards" : 1
},
"mappings" : {
"_source" : { "enabled" : false }
}
}
6 changes: 5 additions & 1 deletion test/integration/helpers/serverspec/shared_spec.rb
Original file line number Diff line number Diff line change
@@ -82,7 +82,11 @@
template = curl_json("#{es_api_url}/_template/basic", username=username, password=password)
expect(template.key?('basic'))
expect(template['basic']['settings']['index']['number_of_shards']).to eq("1")
expect(template['basic']['mappings']['type1']['_source']['enabled']).to eq(false)
if vars['es_major_version'] == '7.x'
expect(template['basic']['mappings']['_source']['enabled']).to eq(false)
else
expect(template['basic']['mappings']['type1']['_source']['enabled']).to eq(false)
end
end
end
end