refactor(redash): emit charts first and try with id based dashboard A…

…PI first (#4991)
datahub-project · May 25, 2022 · 34f099f · 34f099f
1 parent 049db62
commit 34f099f
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/metadata-ingestion/src/datahub/ingestion/source/redash.py b/metadata-ingestion/src/datahub/ingestion/source/redash.py
@@ -566,14 +566,19 @@ def _emit_dashboard_mces(self) -> Iterable[MetadataWorkUnit]:
                     continue
 
                 # Continue producing MCE
-                dashboard_slug = dashboard_response["slug"]
                 try:
-                    dashboard_data = self.client.dashboard(dashboard_slug)
-                except Exception:
+                    # This is undocumented but checking the Redash source
+                    # the API is id based not slug based
+                    # Tested the same with a Redash instance
                     dashboard_id = dashboard_response["id"]
                     dashboard_data = self.client._get(
                         "api/dashboards/{}".format(dashboard_id)
                     ).json()
+                except Exception:
+                    # This does not work in our testing but keeping for now because
+                    # people in community are using Redash connector successfully
+                    dashboard_slug = dashboard_response["slug"]
+                    dashboard_data = self.client.dashboard(dashboard_slug)
                 logger.debug(dashboard_data)
                 dashboard_snapshot = self._get_dashboard_snapshot(dashboard_data)
                 mce = MetadataChangeEvent(proposedSnapshot=dashboard_snapshot)
@@ -708,8 +713,8 @@ def _emit_chart_mces(self) -> Iterable[MetadataWorkUnit]:
 
     def get_workunits(self) -> Iterable[MetadataWorkUnit]:
         self.test_connection()
-        yield from self._emit_dashboard_mces()
         yield from self._emit_chart_mces()
+        yield from self._emit_dashboard_mces()
 
     def get_report(self) -> SourceReport:
         return self.report