feat(ingestion/grafana) add option to pass grafana as is as dashboard owner

Also remove the unique id of the dashboard as a owner.

Author: daha

metadata-ingestion/src/datahub/ingestion/source/grafana/entity_mcp_builder.py

@@ -167,6 +167,7 @@ def build_dashboard_mcps(
     chart_urns: List[str],
     base_url: str,
     ingest_owners: bool,
+    strip_user_ids_from_email: bool,
     ingest_tags: bool,
 ) -> Tuple[str, List[MetadataChangeProposalWrapper]]:
     """Build dashboard metadata change proposals"""
@@ -206,7 +207,7 @@ def build_dashboard_mcps(
 
     # Ownership aspect
     if dashboard.uid and ingest_owners:
-        owner = _build_ownership(dashboard)
+        owner = _build_ownership(dashboard, strip_user_ids_from_email)
         if owner:
             mcps.append(
                 MetadataChangeProposalWrapper(
@@ -378,24 +379,22 @@ def _build_dashboard_properties(dashboard: Dashboard) -> Dict[str, str]:
     return props
 
 
-def _build_ownership(dashboard: Dashboard) -> Optional[OwnershipClass]:
+def _build_ownership(
+    dashboard: Dashboard, strip_user_ids_from_email: bool
+) -> Optional[OwnershipClass]:
     """Build ownership information"""
     owners = []
 
-    if dashboard.uid:
-        owners.append(
-            OwnerClass(
-                owner=make_user_urn(dashboard.uid),
-                type=OwnershipTypeClass.TECHNICAL_OWNER,
-            )
-        )
-
     if dashboard.created_by:
-        owner_id = dashboard.created_by.split("@")[0]
+        if strip_user_ids_from_email:
+            owner_id = dashboard.created_by.split("@")[0]
+        else:
+            owner_id = dashboard.created_by
+
         owners.append(
             OwnerClass(
                 owner=make_user_urn(owner_id),
-                type=OwnershipTypeClass.DATAOWNER,
+                type=OwnershipTypeClass.TECHNICAL_OWNER,
             )
         )
 

metadata-ingestion/src/datahub/ingestion/source/grafana/grafana_config.py

@@ -83,6 +83,11 @@ class GrafanaSourceConfig(
     ingest_owners: bool = Field(
         default=True, description="Whether to ingest dashboard ownership information"
     )
+    strip_user_ids_from_email: bool = Field(
+        True,
+        description="When enabled, converts Grafana user emails of the form [email protected] to urn:li:corpuser:name "
+        "when assigning ownership",
+    )
     skip_text_panels: bool = Field(
         default=False,
         description="Whether to skip text panels during ingestion. "

metadata-ingestion/src/datahub/ingestion/source/grafana/grafana_source.py

@@ -392,6 +392,7 @@ def _process_dashboard(self, dashboard: Dashboard) -> Iterable[MetadataWorkUnit]
             chart_urns=chart_urns,
             base_url=self.config.url,
             ingest_owners=self.config.ingest_owners,
+            strip_user_ids_from_email=self.config.strip_user_ids_from_email,
             ingest_tags=self.config.ingest_tags,
         )
 

metadata-ingestion/tests/unit/grafana/test_grafana_entity_mcp_builder.py

@@ -72,15 +72,23 @@ def test_build_dashboard_properties(mock_dashboard):
 
 
 def test_build_ownership(mock_dashboard):
-    ownership = _build_ownership(mock_dashboard)
+    ownership = _build_ownership(mock_dashboard, True)
     assert isinstance(ownership, OwnershipClass)
-    assert len(ownership.owners) == 2
+    assert len(ownership.owners) == 1
     assert {owner.owner for owner in ownership.owners} == {
-        "urn:li:corpuser:dash1",
         "urn:li:corpuser:test",
     }
 
 
+def test_build_ownership_full_email(mock_dashboard):
+    ownership = _build_ownership(mock_dashboard, False)
+    assert isinstance(ownership, OwnershipClass)
+    assert len(ownership.owners) == 1
+    assert {owner.owner for owner in ownership.owners} == {
+        "urn:li:corpuser:[email protected]",
+    }
+
+
 def test_build_chart_mcps(mock_panel, mock_dashboard):
     dataset_urn, chart_urn, chart_mcps = build_chart_mcps(
         panel=mock_panel,
@@ -147,6 +155,7 @@ def test_build_dashboard_mcps(mock_dashboard):
         chart_urns=chart_urns,
         base_url="http://grafana.test",
         ingest_owners=True,
+        strip_user_ids_from_email=True,
         ingest_tags=True,
     )
 
@@ -193,7 +202,7 @@ def test_build_dashboard_mcps(mock_dashboard):
     )
     assert ownership_mcp is not None
     assert isinstance(ownership_mcp.aspect, OwnershipClass)  # type safety
-    assert len(ownership_mcp.aspect.owners) == 2
+    assert len(ownership_mcp.aspect.owners) == 1
 
 
 def test_build_chart_mcps_no_tags(mock_panel, mock_dashboard):
@@ -222,6 +231,7 @@ def test_build_dashboard_mcps_no_owners(mock_dashboard):
         chart_urns=[],
         base_url="http://grafana.test",
         ingest_owners=True,
+        strip_user_ids_from_email=True,
         ingest_tags=True,
     )