Skip to content

fix index mapping updating #3

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

Merged
merged 1 commit into from
Jul 8, 2025
Merged

fix index mapping updating #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 16 additions & 21 deletions target_elasticsearch/sinks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ def __init__(
):
super().__init__(target, stream_name, schema, key_properties)
self.client = self._authenticated_client()
self.index_schema_fields = self.config.get("index_schema_fields", {}).get(
self.stream_name, {}
)
self.index_schema_fields = self.config.get("index_schema_fields", {}).get(self.stream_name, {})
self.metadata_fields = self.config.get("metadata_fields", {}).get(self.stream_name, {})
self.index_mappings = self.config.get("index_mappings", {}).get(self.stream_name, {})
self.index_name = None
Expand Down Expand Up @@ -99,9 +97,7 @@ def _build_fields(
for k, v in mapping.items():
match = jsonpath_ng.parse(v).find(record)
if len(match) == 0:
self.logger.warning(
f"schema key {k} with json path {v} could not be found in record: {record}"
)
self.logger.warning(f"schema key {k} with json path {v} could not be found in record: {record}")
schemas[k] = v
else:
if len(match) > 1:
Expand Down Expand Up @@ -154,23 +150,24 @@ def create_index(self, index: str) -> None:
mappings = {
key: value["mapping"][key]["type"]
for key, value in self.client.indices.get_field_mapping(
index=index, fields=self.index_mappings.keys()
)["mappings"].items()
index=index, fields=list(self.index_mappings.keys())
)[index]["mappings"].items()
}
if not all(self.index_mappings[key] == value for key, value in mappings):
self.logger.warning(
f"Index {index} already exists with different mappings. Recreate index with new mappings."
)
elif mappings.keys() != self.index_mappings.keys():
self.logger.info(
f"Index {index} exists but with different fields. Updating mapping for existing index."
)
self.client.indices.put_mapping(index=index, body=self.index_mappings)
if not all(self.index_mappings[key]["type"] == value for key, value in mappings.items()):
try:
self.client.indices.put_mapping(index=index, body={"properties": self.index_mappings})
except elasticsearch.exceptions.BadRequestError as e:
if e.message == "illegal_argument_exception":
self.logger.warning(
f"Failed to update mapping for index {index}: {e}, recreate index to apply new mappings."
)
else:
raise e
else:
self.logger.debug(f"Index {index} already exists, skipping creation.")
else:
self.logger.info(f"Creating index {index} with mappings: {self.index_mappings}")
self.client.indices.create(index=index, mappings=self.index_mappings)
self.client.indices.create(index=index, mappings={"properties": self.index_mappings})

def _authenticated_client(self) -> elasticsearch.Elasticsearch:
"""Generate a newly authenticated Elasticsearch client.
Expand Down Expand Up @@ -212,9 +209,7 @@ def process_batch(self, context: dict[str, Any]) -> None:
Args:
context: Dictionary containing batch processing context including records.
"""
updated_records, distinct_indices = self.build_request_body_and_distinct_indices(
context["records"]
)
updated_records, distinct_indices = self.build_request_body_and_distinct_indices(context["records"])
for index in distinct_indices:
self.create_index(index)
try:
Expand Down
12 changes: 4 additions & 8 deletions target_elasticsearch/target.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ class TargetElasticsearch(Target):
th.ObjectType(),
description="""Index Mappings allows you to define field mappings for each stream/index.
This creates or updates the Elasticsearch index mapping with the specified field types and properties.
Format: {"stream_name": {"properties": {"field_name": {"type": "text", "analyzer": "standard"}}}}
Example: {"users": {"properties": {"email": {"type": "keyword"}, "created_at": {"type": "date"}}}}
Format: {"stream_name": {"field_name": {"type": "text", "analyzer": "standard"}}}
Example: {"users": {"email": {"type": "keyword"}, "created_at": {"type": "date"}}}
See: https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping.html""",
default=None,
),
Expand Down Expand Up @@ -154,12 +154,8 @@ def __init__(
validate_config=validate_config,
setup_mapper=setup_mapper,
)
assert bool(self.config.get("username") is None) == bool(
self.config.get("password") is None
)
assert bool(self.config.get("api_key_id") is None) == bool(
self.config.get("api_key") is None
)
assert bool(self.config.get("username") is None) == bool(self.config.get("password") is None)
assert bool(self.config.get("api_key_id") is None) == bool(self.config.get("api_key") is None)

@property
def state(self) -> Dict:
Expand Down
Loading