diff --git a/elementary/monitor/alerts/source_freshness_alert.py b/elementary/monitor/alerts/source_freshness_alert.py index 9da7d831a..90bae3a50 100644 --- a/elementary/monitor/alerts/source_freshness_alert.py +++ b/elementary/monitor/alerts/source_freshness_alert.py @@ -154,9 +154,16 @@ def error_message(self) -> str: @property def summary(self) -> str: + source_fqn = ".".join( + [ + part + for part in [self.database_name, self.schema_name, self.identifier] + if part + ] + ) if self.original_status == "runtime error": - return f'Failed to calculate the source freshness of "{self.source_name}"' - return f'Freshness exceeded the acceptable times on source "{self.source_name}"' + return f'Failed to calculate the source freshness of "{source_fqn}"' + return f'Freshness exceeded the acceptable times on source "{source_fqn}"' def get_report_link(self) -> Optional[ReportLinkData]: return get_test_runs_link(self.report_url, self.source_freshness_execution_id) diff --git a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-False_message-False_tags-True_owners-True_path-True_error-True_suppression-False_env-False.json b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-False_message-False_tags-True_owners-True_path-True_error-True_suppression-False_env-False.json index 8aace3306..ad9b40d92 100644 --- a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-False_message-False_tags-True_owners-True_path-True_error-True_suppression-False_env-False.json +++ b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-False_message-False_tags-True_owners-True_path-True_error-True_suppression-False_env-False.json @@ -10,7 +10,7 @@ "items": [ { "type": "TextBlock", - "text": "Error: Freshness exceeded the acceptable times on source \"test_source\"", + "text": "Error: Freshness exceeded the acceptable times on source \"test_db.test_schema.test_identifier\"", "weight": "bolder", "size": "large", "wrap": true diff --git a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-False_message-True_tags-True_owners-True_path-False_error-True_suppression-False_env-True.json b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-False_message-True_tags-True_owners-True_path-False_error-True_suppression-False_env-True.json index bdd1ab80e..e659a9db6 100644 --- a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-False_message-True_tags-True_owners-True_path-False_error-True_suppression-False_env-True.json +++ b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-False_message-True_tags-True_owners-True_path-False_error-True_suppression-False_env-True.json @@ -10,7 +10,7 @@ "items": [ { "type": "TextBlock", - "text": "Error: Freshness exceeded the acceptable times on source \"test_source\"", + "text": "Error: Freshness exceeded the acceptable times on source \"test_db.test_schema.test_identifier\"", "weight": "bolder", "size": "large", "wrap": true diff --git a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-True_message-False_tags-False_owners-False_path-False_error-False_suppression-True_env-False.json b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-True_message-False_tags-False_owners-False_path-False_error-False_suppression-True_env-False.json index 1c89d23b8..6b14553c7 100644 --- a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-True_message-False_tags-False_owners-False_path-False_error-False_suppression-True_env-False.json +++ b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-True_message-False_tags-False_owners-False_path-False_error-False_suppression-True_env-False.json @@ -10,7 +10,7 @@ "items": [ { "type": "TextBlock", - "text": "Error: Freshness exceeded the acceptable times on source \"test_source\"", + "text": "Error: Freshness exceeded the acceptable times on source \"test_db.test_schema.test_identifier\"", "weight": "bolder", "size": "large", "wrap": true diff --git a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-True_message-False_tags-True_owners-True_path-True_error-False_suppression-True_env-False.json b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-True_message-False_tags-True_owners-True_path-True_error-False_suppression-True_env-False.json index dcae91454..bda247eab 100644 --- a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-True_message-False_tags-True_owners-True_path-True_error-False_suppression-True_env-False.json +++ b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-True_message-False_tags-True_owners-True_path-True_error-False_suppression-True_env-False.json @@ -10,7 +10,7 @@ "items": [ { "type": "TextBlock", - "text": "Error: Freshness exceeded the acceptable times on source \"test_source\"", + "text": "Error: Freshness exceeded the acceptable times on source \"test_db.test_schema.test_identifier\"", "weight": "bolder", "size": "large", "wrap": true diff --git a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-True_message-True_tags-False_owners-False_path-True_error-True_suppression-True_env-True.json b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-True_message-True_tags-False_owners-False_path-True_error-True_suppression-True_env-True.json index 391f2c6de..3a6774d7f 100644 --- a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-True_message-True_tags-False_owners-False_path-True_error-True_suppression-True_env-True.json +++ b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-error_link-True_message-True_tags-False_owners-False_path-True_error-True_suppression-True_env-True.json @@ -10,7 +10,7 @@ "items": [ { "type": "TextBlock", - "text": "Error: Freshness exceeded the acceptable times on source \"test_source\"", + "text": "Error: Freshness exceeded the acceptable times on source \"test_db.test_schema.test_identifier\"", "weight": "bolder", "size": "large", "wrap": true diff --git a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-False_message-False_tags-False_owners-False_path-False_error-False_suppression-False_env-False.json b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-False_message-False_tags-False_owners-False_path-False_error-False_suppression-False_env-False.json index 3672f1464..e02a53db9 100644 --- a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-False_message-False_tags-False_owners-False_path-False_error-False_suppression-False_env-False.json +++ b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-False_message-False_tags-False_owners-False_path-False_error-False_suppression-False_env-False.json @@ -10,7 +10,7 @@ "items": [ { "type": "TextBlock", - "text": "Runtime Error: Failed to calculate the source freshness of \"test_source\"", + "text": "Runtime Error: Failed to calculate the source freshness of \"test_db.test_schema.test_identifier\"", "weight": "bolder", "size": "large", "wrap": true diff --git a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-False_message-True_tags-True_owners-False_path-False_error-True_suppression-True_env-True.json b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-False_message-True_tags-True_owners-False_path-False_error-True_suppression-True_env-True.json index c84066c2b..f60b016ea 100644 --- a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-False_message-True_tags-True_owners-False_path-False_error-True_suppression-True_env-True.json +++ b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-False_message-True_tags-True_owners-False_path-False_error-True_suppression-True_env-True.json @@ -10,7 +10,7 @@ "items": [ { "type": "TextBlock", - "text": "Runtime Error: Failed to calculate the source freshness of \"test_source\"", + "text": "Runtime Error: Failed to calculate the source freshness of \"test_db.test_schema.test_identifier\"", "weight": "bolder", "size": "large", "wrap": true diff --git a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-True_message-False_tags-True_owners-False_path-True_error-False_suppression-True_env-True.json b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-True_message-False_tags-True_owners-False_path-True_error-False_suppression-True_env-True.json index 2762a7ecf..1fc112382 100644 --- a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-True_message-False_tags-True_owners-False_path-True_error-False_suppression-True_env-True.json +++ b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-True_message-False_tags-True_owners-False_path-True_error-False_suppression-True_env-True.json @@ -10,7 +10,7 @@ "items": [ { "type": "TextBlock", - "text": "Runtime Error: Failed to calculate the source freshness of \"test_source\"", + "text": "Runtime Error: Failed to calculate the source freshness of \"test_db.test_schema.test_identifier\"", "weight": "bolder", "size": "large", "wrap": true diff --git a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-True_message-True_tags-False_owners-True_path-False_error-True_suppression-False_env-True.json b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-True_message-True_tags-False_owners-True_path-False_error-True_suppression-False_env-True.json index b283f59e7..eaff58089 100644 --- a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-True_message-True_tags-False_owners-True_path-False_error-True_suppression-False_env-True.json +++ b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-True_message-True_tags-False_owners-True_path-False_error-True_suppression-False_env-True.json @@ -10,7 +10,7 @@ "items": [ { "type": "TextBlock", - "text": "Runtime Error: Failed to calculate the source freshness of \"test_source\"", + "text": "Runtime Error: Failed to calculate the source freshness of \"test_db.test_schema.test_identifier\"", "weight": "bolder", "size": "large", "wrap": true diff --git a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-True_message-True_tags-True_owners-True_path-True_error-True_suppression-True_env-True.json b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-True_message-True_tags-True_owners-True_path-True_error-True_suppression-True_env-True.json index 3120b0eee..c917c5690 100644 --- a/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-True_message-True_tags-True_owners-True_path-True_error-True_suppression-True_env-True.json +++ b/tests/unit/alerts/alert_messages/fixtures/adaptive_card/source_freshness_alert_status-runtime error_link-True_message-True_tags-True_owners-True_path-True_error-True_suppression-True_env-True.json @@ -10,7 +10,7 @@ "items": [ { "type": "TextBlock", - "text": "Runtime Error: Failed to calculate the source freshness of \"test_source\"", + "text": "Runtime Error: Failed to calculate the source freshness of \"test_db.test_schema.test_identifier\"", "weight": "bolder", "size": "large", "wrap": true diff --git a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-False_message-False_tags-True_owners-True_path-True_error-True_suppression-False_env-False.json b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-False_message-False_tags-True_owners-True_path-True_error-True_suppression-False_env-False.json index ed584f87d..598d1de09 100644 --- a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-False_message-False_tags-True_owners-True_path-True_error-True_suppression-False_env-False.json +++ b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-False_message-False_tags-True_owners-True_path-True_error-True_suppression-False_env-False.json @@ -4,7 +4,7 @@ "type": "header", "text": { "type": "plain_text", - "text": "Error: Freshness exceeded the acceptable times on source \"test_source\"" + "text": "Error: Freshness exceeded the acceptable times on source \"test_db.test_schema.test_identifier\"" } }, { diff --git a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-False_message-True_tags-True_owners-True_path-False_error-True_suppression-False_env-True.json b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-False_message-True_tags-True_owners-True_path-False_error-True_suppression-False_env-True.json index 6d05deb80..23fb2a576 100644 --- a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-False_message-True_tags-True_owners-True_path-False_error-True_suppression-False_env-True.json +++ b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-False_message-True_tags-True_owners-True_path-False_error-True_suppression-False_env-True.json @@ -4,7 +4,7 @@ "type": "header", "text": { "type": "plain_text", - "text": "Error: Freshness exceeded the acceptable times on source \"test_source\"" + "text": "Error: Freshness exceeded the acceptable times on source \"test_db.test_schema.test_identifier\"" } }, { diff --git a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-True_message-False_tags-False_owners-False_path-False_error-False_suppression-True_env-False.json b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-True_message-False_tags-False_owners-False_path-False_error-False_suppression-True_env-False.json index f56e3e70e..969f7b47c 100644 --- a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-True_message-False_tags-False_owners-False_path-False_error-False_suppression-True_env-False.json +++ b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-True_message-False_tags-False_owners-False_path-False_error-False_suppression-True_env-False.json @@ -4,7 +4,7 @@ "type": "header", "text": { "type": "plain_text", - "text": "Error: Freshness exceeded the acceptable times on source \"test_source\"" + "text": "Error: Freshness exceeded the acceptable times on source \"test_db.test_schema.test_identifier\"" } }, { diff --git a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-True_message-False_tags-True_owners-True_path-True_error-False_suppression-True_env-False.json b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-True_message-False_tags-True_owners-True_path-True_error-False_suppression-True_env-False.json index 9ffdc9614..8d92eaaee 100644 --- a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-True_message-False_tags-True_owners-True_path-True_error-False_suppression-True_env-False.json +++ b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-True_message-False_tags-True_owners-True_path-True_error-False_suppression-True_env-False.json @@ -4,7 +4,7 @@ "type": "header", "text": { "type": "plain_text", - "text": "Error: Freshness exceeded the acceptable times on source \"test_source\"" + "text": "Error: Freshness exceeded the acceptable times on source \"test_db.test_schema.test_identifier\"" } }, { diff --git a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-True_message-True_tags-False_owners-False_path-True_error-True_suppression-True_env-True.json b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-True_message-True_tags-False_owners-False_path-True_error-True_suppression-True_env-True.json index b80b1d9c8..fc445ffb9 100644 --- a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-True_message-True_tags-False_owners-False_path-True_error-True_suppression-True_env-True.json +++ b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-error_link-True_message-True_tags-False_owners-False_path-True_error-True_suppression-True_env-True.json @@ -4,7 +4,7 @@ "type": "header", "text": { "type": "plain_text", - "text": "Error: Freshness exceeded the acceptable times on source \"test_source\"" + "text": "Error: Freshness exceeded the acceptable times on source \"test_db.test_schema.test_identifier\"" } }, { diff --git a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-False_message-False_tags-False_owners-False_path-False_error-False_suppression-False_env-False.json b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-False_message-False_tags-False_owners-False_path-False_error-False_suppression-False_env-False.json index a95be5a7a..cf80aaaf2 100644 --- a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-False_message-False_tags-False_owners-False_path-False_error-False_suppression-False_env-False.json +++ b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-False_message-False_tags-False_owners-False_path-False_error-False_suppression-False_env-False.json @@ -4,7 +4,7 @@ "type": "header", "text": { "type": "plain_text", - "text": "Runtime Error: Failed to calculate the source freshness of \"test_source\"" + "text": "Runtime Error: Failed to calculate the source freshness of \"test_db.test_schema.test_identifier\"" } }, { diff --git a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-False_message-True_tags-True_owners-False_path-False_error-True_suppression-True_env-True.json b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-False_message-True_tags-True_owners-False_path-False_error-True_suppression-True_env-True.json index 51d707f2b..f9f390fce 100644 --- a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-False_message-True_tags-True_owners-False_path-False_error-True_suppression-True_env-True.json +++ b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-False_message-True_tags-True_owners-False_path-False_error-True_suppression-True_env-True.json @@ -4,7 +4,7 @@ "type": "header", "text": { "type": "plain_text", - "text": "Runtime Error: Failed to calculate the source freshness of \"test_source\"" + "text": "Runtime Error: Failed to calculate the source freshness of \"test_db.test_schema.test_identifier\"" } }, { diff --git a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-True_message-False_tags-True_owners-False_path-True_error-False_suppression-True_env-True.json b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-True_message-False_tags-True_owners-False_path-True_error-False_suppression-True_env-True.json index ad81d2a32..9f464fa95 100644 --- a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-True_message-False_tags-True_owners-False_path-True_error-False_suppression-True_env-True.json +++ b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-True_message-False_tags-True_owners-False_path-True_error-False_suppression-True_env-True.json @@ -4,7 +4,7 @@ "type": "header", "text": { "type": "plain_text", - "text": "Runtime Error: Failed to calculate the source freshness of \"test_source\"" + "text": "Runtime Error: Failed to calculate the source freshness of \"test_db.test_schema.test_identifier\"" } }, { diff --git a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-True_message-True_tags-False_owners-True_path-False_error-True_suppression-False_env-True.json b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-True_message-True_tags-False_owners-True_path-False_error-True_suppression-False_env-True.json index 0dbca6a0b..ed9e5872c 100644 --- a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-True_message-True_tags-False_owners-True_path-False_error-True_suppression-False_env-True.json +++ b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-True_message-True_tags-False_owners-True_path-False_error-True_suppression-False_env-True.json @@ -4,7 +4,7 @@ "type": "header", "text": { "type": "plain_text", - "text": "Runtime Error: Failed to calculate the source freshness of \"test_source\"" + "text": "Runtime Error: Failed to calculate the source freshness of \"test_db.test_schema.test_identifier\"" } }, { diff --git a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-True_message-True_tags-True_owners-True_path-True_error-True_suppression-True_env-True.json b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-True_message-True_tags-True_owners-True_path-True_error-True_suppression-True_env-True.json index ab9a790d0..d647c8186 100644 --- a/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-True_message-True_tags-True_owners-True_path-True_error-True_suppression-True_env-True.json +++ b/tests/unit/alerts/alert_messages/fixtures/block_kit/source_freshness_alert_status-runtime error_link-True_message-True_tags-True_owners-True_path-True_error-True_suppression-True_env-True.json @@ -4,7 +4,7 @@ "type": "header", "text": { "type": "plain_text", - "text": "Runtime Error: Failed to calculate the source freshness of \"test_source\"" + "text": "Runtime Error: Failed to calculate the source freshness of \"test_db.test_schema.test_identifier\"" } }, { diff --git a/tests/unit/alerts/alert_messages/test_alert_utils.py b/tests/unit/alerts/alert_messages/test_alert_utils.py index f452e7c80..b0b4faa61 100644 --- a/tests/unit/alerts/alert_messages/test_alert_utils.py +++ b/tests/unit/alerts/alert_messages/test_alert_utils.py @@ -272,6 +272,8 @@ def build_base_source_freshness_alert_model( return SourceFreshnessAlertModel( id="test_id", source_name="test_source", + database_name="test_db", + schema_name="test_schema", identifier="test_identifier", original_status=status, path=path,