Skip to content
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

Replace 'ent-search-generic' with 'search-default' pipeline #204670

Merged
merged 1 commit into from
Dec 18, 2024
Merged

Replace 'ent-search-generic' with 'search-default' pipeline #204670

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
4 changes: 2 additions & 2 deletions packages/kbn-search-connectors/lib/collect_connector_stats_test_data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const spoConnector: Connector = {
last_indexed_document_count: 1000,
pipeline: {
extract_binary_content: false,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: false,
},
Expand Down Expand Up @@ -99,7 +99,7 @@ export const mysqlConnector: Connector = {
last_indexed_document_count: 2000,
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: false,
},
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-search-connectors/lib/create_connector_document.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe('createConnectorDocument', () => {
name: 'indexName-name',
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: false,
},
Expand Down Expand Up @@ -103,7 +103,7 @@ describe('createConnectorDocument', () => {
name: 'indexName-name',
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: false,
},
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/enterprise_search/common/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ export const ENTERPRISE_SEARCH_DOCUMENTS_DEFAULT_DOC_COUNT = 25;

export const ENTERPRISE_SEARCH_CONNECTOR_CRAWLER_SERVICE_TYPE = 'elastic-crawler';

export const DEFAULT_PIPELINE_NAME = 'ent-search-generic-ingestion';
export const DEFAULT_PIPELINE_NAME = 'search-default-ingestion';
export const DEFAULT_PIPELINE_VALUES: IngestPipelineParams = {
extract_binary_content: true,
name: DEFAULT_PIPELINE_NAME,
Expand Down
12 changes: 6 additions & 6 deletions ...rch_content/components/search_index/pipelines/pipelines_json_configurations_logic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('IndexPipelinesConfigurationsLogic', () => {
});
it('fetchIndexPipelinesDataSuccess selects index ingest pipeline if found', async () => {
const pipelines = {
'ent-search-generic-ingest': {
'search-default-ingest': {
version: 1,
},
[indexName]: {
Expand All @@ -68,23 +68,23 @@ describe('IndexPipelinesConfigurationsLogic', () => {
});
it('fetchIndexPipelinesDataSuccess selects first pipeline as default pipeline', async () => {
const pipelines = {
'ent-search-generic-ingest': {
'search-default-ingest': {
version: 1,
},
};
FetchCustomPipelineApiLogic.actions.apiSuccess(pipelines);
await nextTick();

expect(IndexPipelinesConfigurationsLogic.values.selectedPipelineId).toEqual(
'ent-search-generic-ingest'
'search-default-ingest'
);
});
});

describe('selectors', () => {
it('pipelineNames returns names of pipelines', async () => {
const pipelines = {
'ent-search-generic-ingest': {
'search-default-ingest': {
version: 1,
},
[indexName]: {
Expand All @@ -96,13 +96,13 @@ describe('IndexPipelinesConfigurationsLogic', () => {
await nextTick();

expect(IndexPipelinesConfigurationsLogic.values.pipelineNames).toEqual([
'ent-search-generic-ingest',
'search-default-ingest',
indexName,
]);
});
it('selectedPipeline returns full pipeline', async () => {
const pipelines = {
'ent-search-generic-ingest': {
'search-default-ingest': {
version: 1,
},
foo: {
Expand Down
2 changes: 1 addition & 1 deletion ...tions/enterprise_search_content/components/search_index/pipelines/pipelines_logic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { PipelinesLogic } from './pipelines_logic';

const DEFAULT_PIPELINE_VALUES = {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: true,
};
Expand Down
2 changes: 1 addition & 1 deletion ...plications/enterprise_search_content/components/shared/header_actions/syncs_logic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ const mockConnector: Connector = {
name: 'test',
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: true,
},
Expand Down
8 changes: 4 additions & 4 deletions x-pack/plugins/enterprise_search/server/lib/connectors/add_connector.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('addConnector lib function', () => {
_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,
},
Expand Down Expand Up @@ -89,7 +89,7 @@ describe('addConnector lib function', () => {
name: 'index_name',
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: true,
},
Expand Down Expand Up @@ -134,7 +134,7 @@ describe('addConnector lib function', () => {
name: 'index_name',
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: true,
},
Expand Down Expand Up @@ -264,7 +264,7 @@ describe('addConnector lib function', () => {
name: '',
pipeline: {
extract_binary_content: true,
name: 'ent-search-generic-ingestion',
name: 'search-default-ingestion',
reduce_whitespace: true,
run_ml_inference: true,
},
Expand Down
Loading