Merge branch 'master' into JifeiMei-patch-1

datahub-project · Jul 13, 2023 · b75ab5a · b75ab5a
2 parents 8c649fd + 83ebeb2
commit b75ab5a
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 87 deletions.
diff --git a/datahub-web-react/src/app/entity/dataset/profile/stats/historical/HistoricalStatsView.tsx b/datahub-web-react/src/app/entity/dataset/profile/stats/historical/HistoricalStatsView.tsx
@@ -104,7 +104,7 @@ const LOOKBACK_WINDOWS = [
     { text: '1 year', windowSize: { interval: DateInterval.Year, count: 1 } },
 ];
 
-const DEFAULT_LOOKBACK_WINDOW = '1 week';
+const DEFAULT_LOOKBACK_WINDOW = '3 months';
 
 const getLookbackWindowSize = (text: string) => {
     for (let i = 0; i < LOOKBACK_WINDOWS.length; i++) {

diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
@@ -212,7 +212,7 @@ def get_long_description():
     "trino[sqlalchemy]>=0.308, !=0.317",
 }
 
-microsoft_common = {"msal==1.16.0"}
+microsoft_common = {"msal==1.22.0"}
 
 iceberg_common = {
     # Iceberg Python SDK

diff --git a/metadata-ingestion/src/datahub/ingestion/source/kafka_connect.py b/metadata-ingestion/src/datahub/ingestion/source/kafka_connect.py
diff --git a/metadata-ingestion/tests/integration/kafka-connect/kafka_connect_mces_golden.json b/metadata-ingestion/tests/integration/kafka-connect/kafka_connect_mces_golden.json
@@ -206,7 +206,7 @@
                 "urn:li:dataset:(urn:li:dataPlatform:postgres,postgres1.postgres.public.member,PROD)"
             ],
             "outputDatasets": [
-                "urn:li:dataset:(urn:li:dataPlatform:kafka,test-postgres-jdbc-member,PROD)"
+                "urn:li:dataset:(urn:li:dataPlatform:kafka,kafka1.test-postgres-jdbc-member,PROD)"
             ]
         }
     },

diff --git a/metadata-ingestion/tests/integration/kafka-connect/kafka_connect_mongo_mces_golden.json b/metadata-ingestion/tests/integration/kafka-connect/kafka_connect_mongo_mces_golden.json
@@ -46,7 +46,7 @@
                 "urn:li:dataset:(urn:li:dataPlatform:mongodb,test_db.purchases,PROD)"
             ],
             "outputDatasets": [
-                "urn:li:dataset:(urn:li:dataPlatform:kafka,mongodb.test_db.purchases,PROD)"
+                "urn:li:dataset:(urn:li:dataPlatform:kafka,kafkax.mongodb.test_db.purchases,PROD)"
             ]
         }
     },

diff --git a/metadata-ingestion/tests/integration/kafka-connect/kafka_connect_mongo_to_file.yml b/metadata-ingestion/tests/integration/kafka-connect/kafka_connect_mongo_to_file.yml
@@ -19,6 +19,7 @@ source:
     convert_lineage_urns_to_lowercase: true
     platform_instance_map:   # optional
       mysql: mysql1      # optional
+      kafka: kafkax
     connect_to_platform_map: # optional
       postgres_source:     # optional - Connector name
         postgres: postgres1  # optional - Platform to instance map

diff --git a/metadata-ingestion/tests/integration/kafka-connect/kafka_connect_to_file.yml b/metadata-ingestion/tests/integration/kafka-connect/kafka_connect_to_file.yml
@@ -22,6 +22,7 @@ source:
     connect_to_platform_map: # optional
       postgres_source:     # optional - Connector name
         postgres: postgres1  # optional - Platform to instance map
+        kafka: kafka1
     generic_connectors:   # optional - Generic connector lineage info
       - connector_name: generic-connector
         source_dataset: generic-dataset

diff --git a/perf-test/README.md b/perf-test/README.md
@@ -17,6 +17,11 @@ pip3 install locust
 Note that it supports python versions 3.6 and up. Refer to
 this [guide](https://docs.locust.io/en/stable/installation.html) for more details.
 
+You will also need to import requirements in order to run the Locustfile scripts:
+```shell
+pip3 install -r requirements.txt
+```
+
 ## Locustfiles
 
 [Locustfiles](./locustfiles) define how the users will behave once they are spawned. Refer to