Skip to content

Remove default type as Elastic 7 deprecates document types #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deric wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove default type as Elastic 7 deprecates document types #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
487eb83
Remove default type as Elastic 7 deprecates document types
deric Aug 10, 2020
0387ec3
Add es_version parameter, print error when incorrect type is being used
deric Aug 10, 2020
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
2 changes: 1 addition & 1 deletion elasticsearch/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

cmake_minimum_required(VERSION 3.0)
project(elasticsearch VERSION 1.0.8 LANGUAGES C)
project(elasticsearch VERSION 1.0.9 LANGUAGES C)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Elasticsearch encoders and outputs")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${PACKAGE_PREFIX}-heka (>= 1.0), ${PACKAGE_PREFIX}-rjson (>= 1.0), ${PACKAGE_PREFIX}-cjson (>= 2.1), ${PACKAGE_PREFIX}-socket (>= 3.0)")
string(REGEX REPLACE "[()]" "" CPACK_RPM_PACKAGE_REQUIRES ${CPACK_DEBIAN_PACKAGE_DEPENDS})
Expand Down
10 changes: 9 additions & 1 deletion elasticsearch/io_modules/encoders/elasticsearch/common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@ encoders_elasticsearch_common = {
-- than the system time.
es_index_from_timestamp = false -- optional, default shown

-- Elastic 7 and newer are moving to type-less documents (use `type_name = nil` or `_doc`)
-- https://www.elastic.co/guide/en/elasticsearch/reference/7.x/removal-of-types.html
es_version = 5 -- optional, default shown

-- String to use as the `_index` key's value in the generated JSON.
-- Supports field interpolation as described below.
index = "heka-%{%Y.%m.%d}" -- optional, default shown

-- String to use as the `_type` key's value in the generated JSON.
-- Supports field interpolation as described below.
type_name = "message" -- optional, default shown
type_name = nil -- optional, default shown

-- String to use as the `_id` key's value in the generated JSON.
-- Supports field interpolation as described below.
Expand Down Expand Up @@ -126,7 +130,11 @@ function load_encoder_cfg()
end

if cfg.type_name == nil then
if cfg.es_version < 7 then
cfg.type_name = "message"
else
assert(cfg.type_name == "_doc", "type_name must be nil or _doc, types are deprecated since Elasic 7.0")
end
else
assert(type(cfg.type_name) == "string", "type_name must be nil or a string")
end
Expand Down