Skip to content

Commit

Permalink
Minor: Fix ingestion pipeline name search not working for observabili…
Browse files Browse the repository at this point in the history
…ty alert (#15057)

* add ingestion pipeline search index in UI

* Add Ingestion Pipeline index

* Update date in case of running

* Use timestamp

* add cypress test case for ingestion pipeline trigger

---------

Co-authored-by: mohitdeuex <mohit.y@deuexsolutions.com>
(cherry picked from commit b871369)
  • Loading branch information
aniketkatkar97 authored and mohityadav766 committed Feb 6, 2024
1 parent 9144a65 commit 7a646b4
Show file tree
Hide file tree
Showing 19 changed files with 1,067 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public class SearchIndexApp extends AbstractNativeApplication {
"dashboard",
"topic",
"pipeline",
"ingestionPipeline",
"searchIndex",
"user",
"team",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ public boolean matchIngestionPipelineState(List<String> pipelineState) {
for (FieldChange fieldChange : changeEvent.getChangeDescription().getFieldsUpdated()) {
if (fieldChange.getName().equals("pipelineStatus") && fieldChange.getNewValue() != null) {
PipelineStatus pipelineStatus =
JsonUtils.convertValue(fieldChange.getNewValue(), PipelineStatus.class);
JsonUtils.readOrConvertValue(fieldChange.getNewValue(), PipelineStatus.class);
PipelineStatusType status = pipelineStatus.getPipelineState();
for (String givenStatus : pipelineState) {
if (givenStatus.equalsIgnoreCase(status.value())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.openmetadata.schema.type.FieldChange;
import org.openmetadata.service.formatter.decorators.MessageDecorator;
import org.openmetadata.service.formatter.util.FormatterUtil;
import org.openmetadata.service.util.JsonUtils;

public class IngestionPipelineFormatter implements EntityFormatter {
private static final String PIPELINE_STATUS_FIELD = "pipelineStatus";
Expand All @@ -41,10 +42,12 @@ public String format(
private String transformIngestionPipelineStatus(
MessageDecorator<?> messageFormatter, FieldChange fieldChange, EntityInterface entity) {
String ingestionPipelineName = entity.getName();
PipelineStatus status = (PipelineStatus) fieldChange.getNewValue();
PipelineStatus status =
JsonUtils.readOrConvertValue(fieldChange.getNewValue(), PipelineStatus.class);
if (status != null) {
// In case of running
String date =
new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date(status.getEndDate()));
new SimpleDateFormat("dd/MM/yyyy HH:mm:ss").format(new Date(status.getTimestamp()));
String format =
String.format(
"Ingestion Pipeline %s %s at %s",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ private List<SubscriptionDestination> getSubscriptions(
List<SubscriptionDestination> result = new ArrayList<>();
subscriptions.forEach(
subscription -> {
if (subscription.getId() == null) {
if (nullOrEmpty(subscription.getId())) {
subscription.withId(UUID.randomUUID());
}
result.add(subscription);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.openmetadata.schema.entity.services.PipelineService;
import org.openmetadata.schema.entity.services.SearchService;
import org.openmetadata.schema.entity.services.StorageService;
import org.openmetadata.schema.entity.services.ingestionPipelines.IngestionPipeline;
import org.openmetadata.schema.entity.teams.Team;
import org.openmetadata.schema.entity.teams.User;
import org.openmetadata.schema.tests.TestCase;
Expand All @@ -49,6 +50,7 @@
import org.openmetadata.service.search.indexes.EntityReportDataIndex;
import org.openmetadata.service.search.indexes.GlossaryIndex;
import org.openmetadata.service.search.indexes.GlossaryTermIndex;
import org.openmetadata.service.search.indexes.IngestionPipelineIndex;
import org.openmetadata.service.search.indexes.MessagingServiceIndex;
import org.openmetadata.service.search.indexes.MetadataServiceIndex;
import org.openmetadata.service.search.indexes.MlModelIndex;
Expand Down Expand Up @@ -82,6 +84,7 @@ public SearchIndex buildIndex(String entityType, Object entity) {
case Entity.DASHBOARD -> new DashboardIndex((Dashboard) entity);
case Entity.TOPIC -> new TopicIndex((Topic) entity);
case Entity.PIPELINE -> new PipelineIndex((Pipeline) entity);
case Entity.INGESTION_PIPELINE -> new IngestionPipelineIndex((IngestionPipeline) entity);
case Entity.USER -> new UserIndex((User) entity);
case Entity.TEAM -> new TeamIndex((Team) entity);
case Entity.GLOSSARY -> new GlossaryIndex((Glossary) entity);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
package org.openmetadata.service.search.indexes;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.openmetadata.common.utils.CommonUtil;
import org.openmetadata.schema.entity.services.ingestionPipelines.IngestionPipeline;
import org.openmetadata.service.Entity;
import org.openmetadata.service.search.ParseTags;
import org.openmetadata.service.search.SearchIndexUtils;
import org.openmetadata.service.search.models.SearchSuggest;
import org.openmetadata.service.util.JsonUtils;

public class IngestionPipelineIndex implements SearchIndex {
final IngestionPipeline ingestionPipeline;
final List<String> excludeFields =
List.of("changeDescription", "sourceConfig", "openMetadataServerConnection", "airflowConfig");

public IngestionPipelineIndex(IngestionPipeline ingestionPipeline) {
this.ingestionPipeline = ingestionPipeline;
}

public Map<String, Object> buildESDoc() {
Map<String, Object> doc = JsonUtils.getMap(ingestionPipeline);
SearchIndexUtils.removeNonIndexableFields(doc, excludeFields);
List<SearchSuggest> suggest = new ArrayList<>();
List<SearchSuggest> serviceSuggest = new ArrayList<>();
suggest.add(
SearchSuggest.builder().input(ingestionPipeline.getFullyQualifiedName()).weight(5).build());
suggest.add(
SearchSuggest.builder().input(ingestionPipeline.getDisplayName()).weight(10).build());
serviceSuggest.add(
SearchSuggest.builder().input(ingestionPipeline.getService().getName()).weight(5).build());
ParseTags parseTags =
new ParseTags(Entity.getEntityTags(Entity.INGESTION_PIPELINE, ingestionPipeline));
doc.put(
"name",
ingestionPipeline.getName() != null
? ingestionPipeline.getName()
: ingestionPipeline.getDisplayName());
doc.put(
"displayName",
ingestionPipeline.getDisplayName() != null
? ingestionPipeline.getDisplayName()
: ingestionPipeline.getName());
doc.put("followers", SearchIndexUtils.parseFollowers(ingestionPipeline.getFollowers()));
doc.put("tags", parseTags.getTags());
doc.put("tier", parseTags.getTierTag());
doc.put("suggest", suggest);
doc.put("service_suggest", serviceSuggest);
doc.put("entityType", Entity.INGESTION_PIPELINE);
doc.put(
"totalVotes",
CommonUtil.nullOrEmpty(ingestionPipeline.getVotes())
? 0
: ingestionPipeline.getVotes().getUpVotes()
- ingestionPipeline.getVotes().getDownVotes());
doc.put(
"fqnParts",
getFQNParts(
ingestionPipeline.getFullyQualifiedName(),
suggest.stream().map(SearchSuggest::getInput).toList()));
doc.put("owner", getEntityWithDisplayName(ingestionPipeline.getOwner()));
doc.put("service", getEntityWithDisplayName(ingestionPipeline.getService()));
doc.put("domain", getEntityWithDisplayName(ingestionPipeline.getDomain()));
return doc;
}

public static Map<String, Float> getFields() {
return SearchIndex.getDefaultFields();
}
}
Loading

0 comments on commit 7a646b4

Please sign in to comment.