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

[Behavioral Analytics] Analytics pipeline to the index template registry #96104

Merged
merged 5 commits into from
May 15, 2023
Merged

[Behavioral Analytics] Analytics pipeline to the index template registry #96104

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8610f62
move the pipeline to the index template registry
joemcelroy May 15, 2023
b03e4de
remove unneeded utils for pipeline install
joemcelroy May 15, 2023
60dc6d9
fix tests + added coverage for ingest pipeline
joemcelroy May 15, 2023
42f0376
fix cancellable search request
joemcelroy May 15, 2023
9ab0932
disable search parameter tests
joemcelroy May 15, 2023
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: 0 additions & 2 deletions .../rest/src/yamlRestTest/java/org/elasticsearch/xpack/entsearch/EnterpriseSearchRestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@

import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;

import org.apache.lucene.tests.util.LuceneTestCase;
import org.elasticsearch.common.settings.SecureString;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;

@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/95917")
public class EnterpriseSearchRestIT extends ESClientYamlSuiteTestCase {

public EnterpriseSearchRestIT(final ClientYamlTestCandidate testCandidate) {
Expand Down
9 changes: 1 addition & 8 deletions ...plugin/ent-search/src/main/java/org/elasticsearch/xpack/application/EnterpriseSearch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.elasticsearch.tracing.Tracer;
import org.elasticsearch.watcher.ResourceWatcherService;
import org.elasticsearch.xcontent.NamedXContentRegistry;
import org.elasticsearch.xpack.application.analytics.AnalyticsIngestPipelineRegistry;
import org.elasticsearch.xpack.application.analytics.AnalyticsTemplateRegistry;
import org.elasticsearch.xpack.application.analytics.action.DeleteAnalyticsCollectionAction;
import org.elasticsearch.xpack.application.analytics.action.GetAnalyticsCollectionAction;
Expand Down Expand Up @@ -183,13 +182,7 @@ public Collection<Object> createComponents(
);
analyticsTemplateRegistry.initialize();

final AnalyticsIngestPipelineRegistry analyticsPipelineRegistry = new AnalyticsIngestPipelineRegistry(
clusterService,
threadPool,
client
);

return Arrays.asList(analyticsTemplateRegistry, analyticsPipelineRegistry);
return Arrays.asList(analyticsTemplateRegistry);
}

@Override
Expand Down
77 changes: 0 additions & 77 deletions ...n/java/org/elasticsearch/xpack/application/analytics/AnalyticsIngestPipelineRegistry.java
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions ...rc/main/java/org/elasticsearch/xpack/application/analytics/AnalyticsTemplateRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.elasticsearch.xpack.core.ilm.LifecyclePolicy;
import org.elasticsearch.xpack.core.template.IndexTemplateConfig;
import org.elasticsearch.xpack.core.template.IndexTemplateRegistry;
import org.elasticsearch.xpack.core.template.IngestPipelineConfig;
import org.elasticsearch.xpack.core.template.LifecyclePolicyConfig;

import java.io.IOException;
Expand Down Expand Up @@ -48,6 +49,8 @@ public class AnalyticsTemplateRegistry extends IndexTemplateRegistry {
static final String EVENT_DATA_STREAM_SETTINGS_COMPONENT_NAME = EVENT_DATA_STREAM_INDEX_PREFIX + "settings";
static final String EVENT_DATA_STREAM_MAPPINGS_COMPONENT_NAME = EVENT_DATA_STREAM_INDEX_PREFIX + "mappings";

static final String EVENT_DATA_STREAM_INGEST_PIPELINE_NAME = EVENT_DATA_STREAM_INDEX_PREFIX + "final_pipeline";

static final Map<String, ComponentTemplate> COMPONENT_TEMPLATES;

static {
Expand Down Expand Up @@ -78,6 +81,18 @@ public class AnalyticsTemplateRegistry extends IndexTemplateRegistry {
COMPONENT_TEMPLATES = Map.copyOf(componentTemplates);
}

@Override
protected List<IngestPipelineConfig> getIngestPipelines() {
return List.of(
new IngestPipelineConfig(
EVENT_DATA_STREAM_INGEST_PIPELINE_NAME,
ROOT_RESOURCE_PATH + EVENT_DATA_STREAM_INGEST_PIPELINE_NAME + ".json",
REGISTRY_VERSION,
TEMPLATE_VERSION_VARIABLE
)
);
}

// Composable index templates configuration.
static final String EVENT_DATA_STREAM_TEMPLATE_NAME = EVENT_DATA_STREAM_INDEX_PREFIX + "default";
static final String EVENT_DATA_STREAM_TEMPLATE_FILENAME = EVENT_DATA_STREAM_INDEX_PREFIX + "template";
Expand Down
217 changes: 0 additions & 217 deletions ...arch/src/main/java/org/elasticsearch/xpack/application/utils/ingest/PipelineRegistry.java
View file
Open in desktop

This file was deleted.

Loading