Skip to content

Commit

Permalink
Fix Display Name for Alerts (#14889)
Browse files Browse the repository at this point in the history 
* Fix Display Names

* FIx Names and condition
  • Loading branch information
@mohityadav766
mohityadav766 authored Jan 26, 2024
1 parent f1c76ab commit 3f234df
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 93 deletions.
110 changes: 38 additions & 72 deletions openmetadata-service/src/main/resources/json/data/EntityObservabilityFilterDescriptor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
{
"name": "filterByFqn",
"fullyQualifiedName": "eventSubscription.filterByFqn",
"displayName": "Filter By Table Name",
"description" : "Filter A Change Event By Table Name",
"displayName": "Table Name",
"description" : "Event Filtering By Table Name",
"effect" : "include",
"condition": "matchAnyEntityFqn(${fqnList})",
"arguments": [
Expand All @@ -17,8 +17,8 @@
{
"name": "filterByDomain",
"fullyQualifiedName": "eventSubscription.filterByDomain",
"displayName": "Filter By Domain",
"description" : "Filter An Change Event By Domain a Entity Belongs To",
"displayName": "Domain",
"description" : "Event Filtering By Domain a Entity Belongs To",
"effect" : "include",
"condition": "matchAnyDomain(${domainList})",
"arguments": [
Expand All @@ -29,8 +29,8 @@
{
"name": "filterByOwner",
"fullyQualifiedName": "eventSubscription.filterByOwner",
"displayName": "Filter By Owner Name",
"description" : "Filter A Change Event By Owner Name of Asset",
"displayName": "Owner Name",
"description" : "Event Filtering By Owner Name of Asset",
"effect" : "include",
"condition": "matchAnyOwnerName(${ownerNameList})",
"arguments": [
Expand Down Expand Up @@ -66,8 +66,8 @@
{
"name": "filterByFqn",
"fullyQualifiedName": "eventSubscription.filterByFqn",
"displayName": "Filter By Topic Name",
"description" : "Filter A Change Event By Topic Name",
"displayName": "Topic Name",
"description" : "Event Filtering By Topic Name",
"effect" : "include",
"condition": "matchAnyEntityFqn(${fqnList})",
"arguments": [
Expand All @@ -78,8 +78,8 @@
{
"name": "filterByDomain",
"fullyQualifiedName": "eventSubscription.filterByDomain",
"displayName": "Filter By Domain",
"description" : "Filter An Change Event By Domain a Entity Belongs To",
"displayName": "Domain",
"description" : "Event Filtering By Domain a Entity Belongs To",
"effect" : "include",
"condition": "matchAnyDomain(${domainList})",
"arguments": [
Expand All @@ -90,8 +90,8 @@
{
"name": "filterByOwner",
"fullyQualifiedName": "eventSubscription.filterByOwner",
"displayName": "Filter By Owner Name",
"description" : "Filter A Change Event By Owner Name of Asset",
"displayName": "Owner Name",
"description" : "Event Filtering By Owner Name of Asset",
"effect" : "include",
"condition": "matchAnyOwnerName(${ownerNameList})",
"arguments": [
Expand All @@ -118,8 +118,8 @@
{
"name": "filterByFqn",
"fullyQualifiedName": "eventSubscription.filterByFqn",
"displayName": "Filter By Container Name",
"description" : "Filter A Change Event By Container Name",
"displayName": "Container Name",
"description" : "Event Filtering By Container Name",
"effect" : "include",
"condition": "matchAnyEntityFqn(${fqnList})",
"arguments": [
Expand All @@ -130,8 +130,8 @@
{
"name": "filterByDomain",
"fullyQualifiedName": "eventSubscription.filterByDomain",
"displayName": "Filter By Domain",
"description" : "Filter An Change Event By Domain a Entity Belongs To",
"displayName": "Domain",
"description" : "Event Filtering By Domain a Entity Belongs To",
"effect" : "include",
"condition": "matchAnyDomain(${domainList})",
"arguments": [
Expand All @@ -142,8 +142,8 @@
{
"name": "filterByOwner",
"fullyQualifiedName": "eventSubscription.filterByOwner",
"displayName": "Filter By Owner Name",
"description" : "Filter A Change Event By Owner Name of Asset",
"displayName": "Owner Name",
"description" : "Event Filtering By Owner Name of Asset",
"effect" : "include",
"condition": "matchAnyOwnerName(${ownerNameList})",
"arguments": [
Expand All @@ -170,8 +170,8 @@
{
"name": "filterByFqn",
"fullyQualifiedName": "eventSubscription.filterByFqn",
"displayName": "Filter By Pipeline Name",
"description" : "Filter A Change Event By Pipeline Name",
"displayName": "Pipeline Name",
"description" : "Event Filtering By Pipeline Name",
"effect" : "include",
"condition": "matchAnyEntityFqn(${fqnList})",
"arguments": [
Expand All @@ -182,8 +182,8 @@
{
"name": "filterByDomain",
"fullyQualifiedName": "eventSubscription.filterByDomain",
"displayName": "Filter By Domain",
"description" : "Filter An Change Event By Domain a Entity Belongs To",
"displayName": "Domain",
"description" : "Event Filtering By Domain a Entity Belongs To",
"effect" : "include",
"condition": "matchAnyDomain(${domainList})",
"arguments": [
Expand All @@ -194,8 +194,8 @@
{
"name": "filterByOwner",
"fullyQualifiedName": "eventSubscription.filterByOwner",
"displayName": "Filter By Owner Name",
"description" : "Filter A Change Event By Owner Name of Asset",
"displayName": "Owner Name",
"description" : "Event Filtering By Owner Name of Asset",
"effect" : "include",
"condition": "matchAnyOwnerName(${ownerNameList})",
"arguments": [
Expand All @@ -205,15 +205,6 @@
}
],
"supportedActions" : [
{
"name": "GetPipelineSchemaChanges",
"fullyQualifiedName": "eventSubscription.filterBySchemaChange",
"displayName": "Get Schema Changes",
"description" : "Get Updates for Schema Changes",
"effect" : "include",
"condition": "matchAnyFieldChange({'sourceUrl','pipelineLocation'})",
"inputType": "none"
},
{
"name": "GetPipelineStatusUpdates",
"fullyQualifiedName": "eventSubscription.GetPipelineStatusUpdates",
Expand All @@ -234,8 +225,8 @@
{
"name": "filterByFqn",
"fullyQualifiedName": "eventSubscription.filterByFqn",
"displayName": "Filter By Test Case Name",
"description" : "Filter A Change Event By Test Case Name",
"displayName": "Test Case Name",
"description" : "Event By Test Case Name",
"effect" : "include",
"condition": "matchAnyEntityFqn(${fqnList})",
"arguments": [
Expand All @@ -246,8 +237,8 @@
{
"name": "filterByDomain",
"fullyQualifiedName": "eventSubscription.filterByDomain",
"displayName": "Filter By Domain",
"description" : "Filter An Change Event By Domain a Entity Belongs To",
"displayName": "Domain",
"description" : "Event Filtering By Domain a Entity Belongs To",
"effect" : "include",
"condition": "matchAnyDomain(${domainList})",
"arguments": [
Expand All @@ -258,8 +249,8 @@
{
"name": "filterByOwner",
"fullyQualifiedName": "eventSubscription.filterByOwner",
"displayName": "Filter By Owner Name",
"description" : "Filter A Change Event By Owner Name of Asset",
"displayName": "Owner Name",
"description" : "Event Filtering By Owner Name of Asset",
"effect" : "include",
"condition": "matchAnyOwnerName(${ownerNameList})",
"arguments": [
Expand All @@ -270,8 +261,8 @@
{
"name": "filterByTableNameTestCaseBelongsTo",
"fullyQualifiedName": "eventSubscription.filterByTableNameTestCaseBelongsTo",
"displayName": "Filter By Table Name",
"description" : "Filter A Change Event By Pipeline Name",
"displayName": "Table Name A Test Case Belongs To",
"description" : "Event Filtering By Table Name A Test Case Belongs To",
"effect" : "include",
"condition": "filterByTableNameTestCaseBelongsTo(${tableNameList})",
"arguments": [
Expand Down Expand Up @@ -310,8 +301,8 @@
{
"name": "filterByFqn",
"fullyQualifiedName": "eventSubscription.filterByFqn",
"displayName": "Filter By Test Suite Name",
"description" : "Filter By Test Suite Name",
"displayName": "Test Suite Name",
"description" : "Event Filtering By Test Suite Name",
"effect" : "include",
"condition": "matchAnyEntityFqn(${fqnList})",
"arguments": [
Expand All @@ -322,32 +313,20 @@
{
"name": "filterByOwner",
"fullyQualifiedName": "eventSubscription.filterByOwner",
"displayName": "Filter By Owner Name",
"description" : "Filter A Change Event By Owner Name of Asset",
"displayName": "Owner Name",
"description" : "Event Filtering By Owner Name of Asset",
"effect" : "include",
"condition": "matchAnyOwnerName(${ownerNameList})",
"arguments": [
"ownerNameList"
],
"inputType": "runtime"
},
{
"name": "filterByTableNameTestCaseBelongsTo",
"fullyQualifiedName": "eventSubscription.filterByTableNameTestCaseBelongsTo",
"displayName": "Filter By Table Name For A Test Suite",
"description" : "Filter A Change Event By Pipeline Name",
"effect" : "include",
"condition": "matchByTableNameTestCaseBelongsTo(${tableNameList})",
"arguments": [
"tableNameList"
],
"inputType": "runtime"
},
{
"name": "filterByDomain",
"fullyQualifiedName": "eventSubscription.filterByDomain",
"displayName": "Filter By Domain",
"description" : "Filter An Change Event By Domain a Entity Belongs To",
"displayName": "Domain",
"description" : "Event Filtering By Domain a Entity Belongs To",
"effect" : "include",
"condition": "matchAnyDomain(${domainList})",
"arguments": [
Expand Down Expand Up @@ -378,19 +357,6 @@
"testStatusList"
],
"inputType": "runtime"
},
{
"name": "GetTestCaseAdditionOrDeletionToSuite",
"fullyQualifiedName": "eventSubscription.GetTestCaseAdditionOrDeletionToSuite",
"displayName": "Get Test Case Addition Or Deletion To Suite Updates",
"description" : "Get Status Updates when a Test Case is added or deleted to a Test Suite",
"effect" : "include",
"condition": "getTestCaseAdditionOrDeletionToSuite(${testSuiteList}, ${opList})",
"arguments": [
"testSuiteList",
"opList"
],
"inputType": "runtime"
}
]
}
Expand Down
42 changes: 21 additions & 21 deletions openmetadata-service/src/main/resources/json/data/FilterFunctionsDescriptor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{
"name": "filterBySource",
"fullyQualifiedName": "eventSubscription.filterBySource",
"displayName": "Filter By Source of Change Event",
"description" : "Filter By Source of Change Event",
"displayName": "Source of Change Event",
"description" : "Event Filtering By Source of Change Event",
"effect" : "include",
"condition": "matchAnySource(${sourceList})",
"arguments": [
Expand All @@ -14,8 +14,8 @@
{
"name": "filterByOwnerName",
"fullyQualifiedName": "eventSubscription.filterByOwnerName",
"displayName": "Filter By Owner",
"description" : "Filter By Owner of the Asset",
"displayName": "Owner",
"description" : "Event Filtering By Owner of the Asset",
"effect" : "include",
"condition": "matchAnyOwnerName(${ownerNameList})",
"arguments": [
Expand All @@ -26,8 +26,8 @@
{
"name": "filterByFqn",
"fullyQualifiedName": "eventSubscription.filterByFqn",
"displayName": "Filter By Entity FQN",
"description" : "Filter A Change Event By Entity FQN",
"displayName": "Entity FQN",
"description" : "Event Filtering By Entity FQN",
"effect" : "include",
"condition": "matchAnyEntityFqn(${fqnList})",
"arguments": [
Expand All @@ -38,8 +38,8 @@
{
"name": "filterByEntityId",
"fullyQualifiedName": "eventSubscription.filterByEntityId",
"displayName": "Filter By Entity Id",
"description" : "Filter A Change Event By Entity Id",
"displayName": "Entity Id",
"description" : "Event Filtering By Entity Id",
"effect" : "include",
"condition": "matchAnyEntityId(${entityIdList})",
"arguments": [
Expand All @@ -50,8 +50,8 @@
{
"name": "filterByEventType",
"fullyQualifiedName": "eventSubscription.filterByEventType",
"displayName": "Filter By Event Type",
"description" : "Filter By Type of Event like entityCreated, entityUpdated, etc.",
"displayName": "Event Type",
"description" : "Event Filtering by Event Type like entityCreated, entityUpdated, etc.",
"effect" : "include",
"condition": "matchAnyEventType(${eventTypeList})",
"arguments": [
Expand All @@ -62,8 +62,8 @@
{
"name": "filterByUpdaterName",
"fullyQualifiedName": "eventSubscription.filterByUpdaterName",
"displayName": "Filter By Update Name",
"description" : "Filter An Change Event if the Entity is Updated By Any of the Users",
"displayName": "Updater Name",
"description" : "Event Filtering by Updaters Name",
"effect" : "include",
"condition": "matchUpdatedBy(${updateByUserList})",
"arguments": [
Expand All @@ -74,8 +74,8 @@
{
"name": "filterByFieldChange",
"fullyQualifiedName": "eventSubscription.filterByFieldChange",
"displayName": "Filter By Field Change",
"description" : "Filter By a specific field change",
"displayName": "Field Change",
"description" : "Event Filtering By a specific field change",
"effect" : "include",
"condition": "matchAnyFieldChange(${fieldChangeList})",
"arguments": [
Expand All @@ -86,8 +86,8 @@
{
"name": "filterByDomain",
"fullyQualifiedName": "eventSubscription.filterByDomain",
"displayName": "Filter By Domain",
"description" : "Filter An Change Event By Domain a Entity Belongs To",
"displayName": "Domain",
"description" : "Event Filtering By Domain a Entity Belongs To",
"effect" : "include",
"condition": "matchAnyDomain(${domainList})",
"arguments": [
Expand All @@ -98,8 +98,8 @@
{
"name": "filterByMentionedName",
"fullyQualifiedName": "eventSubscription.filterByMentionedName",
"displayName": "Filter By Mentioned Users",
"description" : "Filter An Conversation User Mentioned",
"displayName": "Mentioned Users",
"description" : "Event Filtering An Conversation User Mentioned",
"effect" : "include",
"condition": "matchConversationUser(${userList})",
"arguments": [
Expand All @@ -110,10 +110,10 @@
{
"name": "filterByGeneralMetadataEvents",
"fullyQualifiedName": "eventSubscription.filterByGeneralMetadataEvents",
"displayName": "Filter By General Metadata Events",
"description" : "Filter By General MetadataEvents",
"displayName": "General Metadata Events",
"description" : "Event Filtering By General MetadataEvents",
"effect" : "include",
"condition": "matchAnyFieldChange('description', 'tags')",
"condition": "matchAnyFieldChange({'description', 'tags'})",
"inputType": "none"
}
]

0 comments on commit 3f234df

Please sign in to comment.