diff --git a/connectors/cli/connector.py b/connectors/cli/connector.py index a3e8fed74..6bd00d327 100644 --- a/connectors/cli/connector.py +++ b/connectors/cli/connector.py @@ -167,7 +167,7 @@ async def __create_connector( "custom_scheduling": {}, "pipeline": { "extract_binary_content": True, - "name": "ent-search-generic-ingestion", + "name": "search-default-ingestion", "reduce_whitespace": True, "run_ml_inference": True, }, diff --git a/connectors/kibana.py b/connectors/kibana.py index deacd61c8..51a9258f5 100644 --- a/connectors/kibana.py +++ b/connectors/kibana.py @@ -53,7 +53,7 @@ async def prepare(service_type, index_name, config, connector_definition=None): connector_index = ConnectorIndex(config["elasticsearch"]) await es.ensure_ingest_pipeline_exists( - "ent-search-generic-ingestion", + "search-default-ingestion", DEFAULT_PIPELINE["version"], DEFAULT_PIPELINE["description"], DEFAULT_PIPELINE["processors"], diff --git a/connectors/protocol/connectors.py b/connectors/protocol/connectors.py index ed0e0a3c1..e1e753ccb 100644 --- a/connectors/protocol/connectors.py +++ b/connectors/protocol/connectors.py @@ -555,7 +555,7 @@ def transform_filtering(self): PIPELINE_DEFAULT = { - "name": "ent-search-generic-ingestion", + "name": "search-default-ingestion", "extract_binary_content": True, "reduce_whitespace": True, "run_ml_inference": True, diff --git a/docs/CONNECTOR_PROTOCOL.md b/docs/CONNECTOR_PROTOCOL.md index 644bac8d2..2c063d7ca 100644 --- a/docs/CONNECTOR_PROTOCOL.md +++ b/docs/CONNECTOR_PROTOCOL.md @@ -180,7 +180,7 @@ This is our main communication index, used to communicate the connector's config "_meta" : { "pipeline" : { "default_extract_binary_content" : true, - "default_name" : "ent-search-generic-ingestion", + "default_name" : "search-default-ingestion", "default_reduce_whitespace" : true, "default_run_ml_inference" : true }, diff --git a/tests/fixtures/connector.json b/tests/fixtures/connector.json index 82574ddd1..4a2bdd87c 100644 --- a/tests/fixtures/connector.json +++ b/tests/fixtures/connector.json @@ -103,7 +103,7 @@ "scheduling": {"full": {"enabled": true, "interval": "1 * * * * *"}}, "pipeline": { "extract_binary_content": true, - "name": "ent-search-generic-ingestion", + "name": "search-default-ingestion", "reduce_whitespace": true, "run_ml_inference": true } diff --git a/tests/protocol/test_connectors.py b/tests/protocol/test_connectors.py index 4de4646ed..d77f762c5 100644 --- a/tests/protocol/test_connectors.py +++ b/tests/protocol/test_connectors.py @@ -2300,7 +2300,7 @@ def test_has_validation_state( @pytest.mark.parametrize( "key, value, default_value", [ - ("name", "foobar", "ent-search-generic-ingestion"), + ("name", "foobar", "search-default-ingestion"), ("extract_binary_content", False, True), ("reduce_whitespace", False, True), ("run_ml_inference", False, True), diff --git a/tests/test_kibana.py b/tests/test_kibana.py index 140926bf8..236bcd675 100644 --- a/tests/test_kibana.py +++ b/tests/test_kibana.py @@ -50,7 +50,7 @@ def test_main(patch_logger, mock_responses): ) mock_index_creation("data", mock_responses, hidden=False) mock_responses.get( - "http://nowhere.com:9200/_ingest/pipeline/ent-search-generic-ingestion", + "http://nowhere.com:9200/_ingest/pipeline/search-default-ingestion", headers=headers, repeat=True, ) diff --git a/tests/test_service_cli.py b/tests/test_service_cli.py index a6f529b6f..aeba9091c 100644 --- a/tests/test_service_cli.py +++ b/tests/test_service_cli.py @@ -33,7 +33,7 @@ def test_main_exits_on_sigterm(mock_responses): mock_responses.head(f"{host}/.elastic-connectors", headers=headers) mock_responses.head(f"{host}/.elastic-connectors-sync-jobs", headers=headers) mock_responses.get( - f"{host}/_ingest/pipeline/ent-search-generic-ingestion", headers=headers + f"{host}/_ingest/pipeline/search-default-ingestion", headers=headers ) async def kill(): diff --git a/tests/test_sink.py b/tests/test_sink.py index daa648970..31d9f9474 100644 --- a/tests/test_sink.py +++ b/tests/test_sink.py @@ -262,7 +262,7 @@ def set_responses(mock_responses, ts=None): ) mock_responses.put( - "http://nowhere.com:9200/_bulk?pipeline=ent-search-generic-ingestion", + "http://nowhere.com:9200/_bulk?pipeline=search-default-ingestion", payload={ "took": 7, "errors": False,