Skip to content

Commit e4cef6f

Browse files
mayurinehatemayurinehate
authored
Merge branch 'master' into fix/looker-metadata-extraction-flag
2 parents 6738c2f + 0562c7a commit e4cef6f

File tree

38 files changed

+2055
-312
lines changed

38 files changed

+2055
-312
lines changed

‎.github/actions/docker-custom-build-and-push/action.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,11 @@ runs:
9797
cache-to: |
9898
type=inline
9999
- name: Upload image locally for testing (if not publishing)
100-
uses: ishworkh/docker-image-artifact-upload@v1
100+
uses: ishworkh/container-image-artifact-upload@v2.0.0
101101
if: ${{ inputs.publish != 'true' }}
102102
with:
103103
image: ${{ steps.single_tag.outputs.SINGLE_TAG }}
104+
retention_days: "2"
104105

105106
# Code for building multi-platform images and pushing to Docker Hub.
106107
- name: Set up QEMU

‎.github/workflows/build-and-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
run: |
111111
./gradlew :datahub-frontend:build :datahub-web-react:build --parallel
112112
env:
113-
NODE_OPTIONS: "--max-old-space-size=3072"
113+
NODE_OPTIONS: "--max-old-space-size=4096"
114114
- name: Gradle compile (jdk8) for legacy Spark
115115
if: ${{ matrix.command == 'except_metadata_ingestion' && needs.setup.outputs.backend_change == 'true' }}
116116
run: |

‎.github/workflows/docker-postgres-setup.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
with:
5353
images: |
5454
acryldata/datahub-postgres-setup
55-
tags: ${{ needs.setup.outputs.tag }}
55+
image_tag: ${{ needs.setup.outputs.tag }}
5656
username: ${{ secrets.ACRYL_DOCKER_USERNAME }}
5757
password: ${{ secrets.ACRYL_DOCKER_PASSWORD }}
5858
publish: ${{ needs.setup.outputs.publish == 'true' }}

‎.github/workflows/docker-unified.yml

+24-24
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ jobs:
186186
- name: Checkout # adding checkout step just to make trivy upload happy
187187
uses: acryldata/sane-checkout-action@v3
188188
- name: Download image
189-
uses: ishworkh/docker-image-artifact-download@v1
189+
uses: ishworkh/container-image-artifact-download@v2.0.0
190190
if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' }}
191191
with:
192192
image: ${{ env.DATAHUB_GMS_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
@@ -257,7 +257,7 @@ jobs:
257257
- name: Checkout # adding checkout step just to make trivy upload happy
258258
uses: acryldata/sane-checkout-action@v3
259259
- name: Download image
260-
uses: ishworkh/docker-image-artifact-download@v1
260+
uses: ishworkh/container-image-artifact-download@v2.0.0
261261
if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' }}
262262
with:
263263
image: ${{ env.DATAHUB_MAE_CONSUMER_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
@@ -328,7 +328,7 @@ jobs:
328328
- name: Checkout # adding checkout step just to make trivy upload happy
329329
uses: acryldata/sane-checkout-action@v3
330330
- name: Download image
331-
uses: ishworkh/docker-image-artifact-download@v1
331+
uses: ishworkh/container-image-artifact-download@v2.0.0
332332
if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' }}
333333
with:
334334
image: ${{ env.DATAHUB_MCE_CONSUMER_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
@@ -399,7 +399,7 @@ jobs:
399399
- name: Checkout # adding checkout step just to make trivy upload happy
400400
uses: acryldata/sane-checkout-action@v3
401401
- name: Download image
402-
uses: ishworkh/docker-image-artifact-download@v1
402+
uses: ishworkh/container-image-artifact-download@v2.0.0
403403
if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' }}
404404
with:
405405
image: ${{ env.DATAHUB_UPGRADE_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
@@ -446,7 +446,7 @@ jobs:
446446
./gradlew :datahub-frontend:dist -x test -x yarnTest -x yarnLint --parallel
447447
mv ./datahub-frontend/build/distributions/datahub-frontend-*.zip datahub-frontend.zip
448448
env:
449-
NODE_OPTIONS: "--max-old-space-size=3072"
449+
NODE_OPTIONS: "--max-old-space-size=4096"
450450
- name: Build and push
451451
uses: ./.github/actions/docker-custom-build-and-push
452452
with:
@@ -472,7 +472,7 @@ jobs:
472472
- name: Checkout # adding checkout step just to make trivy upload happy
473473
uses: actions/checkout@v4
474474
- name: Download image
475-
uses: ishworkh/docker-image-artifact-download@v1
475+
uses: ishworkh/container-image-artifact-download@v2.0.0
476476
if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' }}
477477
with:
478478
image: ${{ env.DATAHUB_FRONTEND_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
@@ -533,7 +533,7 @@ jobs:
533533
- name: Checkout # adding checkout step just to make trivy upload happy
534534
uses: acryldata/sane-checkout-action@v3
535535
- name: Download image
536-
uses: ishworkh/docker-image-artifact-download@v1
536+
uses: ishworkh/container-image-artifact-download@v2.0.0
537537
if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' }}
538538
with:
539539
image: ${{ env.DATAHUB_KAFKA_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
@@ -594,7 +594,7 @@ jobs:
594594
- name: Checkout # adding checkout step just to make trivy upload happy
595595
uses: acryldata/sane-checkout-action@v3
596596
- name: Download image
597-
uses: ishworkh/docker-image-artifact-download@v1
597+
uses: ishworkh/container-image-artifact-download@v2.0.0
598598
if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' }}
599599
with:
600600
image: ${{ env.DATAHUB_MYSQL_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
@@ -655,7 +655,7 @@ jobs:
655655
- name: Checkout # adding checkout step just to make trivy upload happy
656656
uses: acryldata/sane-checkout-action@v3
657657
- name: Download image
658-
uses: ishworkh/docker-image-artifact-download@v1
658+
uses: ishworkh/container-image-artifact-download@v2.0.0
659659
if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' }}
660660
with:
661661
image: ${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
@@ -727,7 +727,7 @@ jobs:
727727
- name: Check out the repo
728728
uses: acryldata/sane-checkout-action@v3
729729
- name: Download Base Image
730-
uses: ishworkh/docker-image-artifact-download@v1
730+
uses: ishworkh/container-image-artifact-download@v2.0.0
731731
if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' && needs.setup.outputs.ingestion_base_change == 'true' }}
732732
with:
733733
image: ${{ env.DATAHUB_INGESTION_BASE_IMAGE }}:${{ needs.setup.outputs.ingestion_base_change == 'true' && needs.setup.outputs.unique_tag || 'head' }}
@@ -775,7 +775,7 @@ jobs:
775775
- name: Check out the repo
776776
uses: acryldata/sane-checkout-action@v3
777777
- name: Download Base Image
778-
uses: ishworkh/docker-image-artifact-download@v1
778+
uses: ishworkh/container-image-artifact-download@v2.0.0
779779
if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' && needs.setup.outputs.ingestion_base_change == 'true' }}
780780
with:
781781
image: ${{ env.DATAHUB_INGESTION_BASE_IMAGE }}:${{ needs.setup.outputs.ingestion_base_change == 'true' && needs.setup.outputs.unique_tag || 'head' }}
@@ -836,7 +836,7 @@ jobs:
836836
if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish =='true' }}
837837
run: ./gradlew :metadata-ingestion:codegen
838838
- name: Download Base Image
839-
uses: ishworkh/docker-image-artifact-download@v1
839+
uses: ishworkh/container-image-artifact-download@v2.0.0
840840
if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' && needs.setup.outputs.ingestion_base_change == 'true' }}
841841
with:
842842
image: ${{ env.DATAHUB_INGESTION_BASE_IMAGE }}:${{ needs.setup.outputs.ingestion_base_change == 'true' && needs.setup.outputs.unique_slim_tag || 'head-slim' }}
@@ -883,7 +883,7 @@ jobs:
883883
- name: Checkout # adding checkout step just to make trivy upload happy
884884
uses: acryldata/sane-checkout-action@v3
885885
- name: Download image Slim Image
886-
uses: ishworkh/docker-image-artifact-download@v1
886+
uses: ishworkh/container-image-artifact-download@v2.0.0
887887
if: ${{ needs.datahub_ingestion_slim_build.outputs.needs_artifact_download == 'true' }}
888888
with:
889889
image: ${{ env.DATAHUB_INGESTION_IMAGE }}:${{ needs.datahub_ingestion_slim_build.outputs.tag }}
@@ -937,7 +937,7 @@ jobs:
937937
if: ${{ needs.setup.outputs.ingestion_change == 'true' || needs.setup.outputs.publish == 'true' || needs.setup.outputs.pr-publish == 'true' }}
938938
run: ./gradlew :metadata-ingestion:codegen
939939
- name: Download Base Image
940-
uses: ishworkh/docker-image-artifact-download@v1
940+
uses: ishworkh/container-image-artifact-download@v2.0.0
941941
if: ${{ needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' && needs.setup.outputs.ingestion_base_change == 'true' }}
942942
with:
943943
image: ${{ env.DATAHUB_INGESTION_BASE_IMAGE }}:${{ needs.setup.outputs.ingestion_base_change == 'true' && needs.setup.outputs.unique_tag || 'head' }}
@@ -982,7 +982,7 @@ jobs:
982982
- name: Checkout # adding checkout step just to make trivy upload happy
983983
uses: acryldata/sane-checkout-action@v3
984984
- name: Download image Full Image
985-
uses: ishworkh/docker-image-artifact-download@v1
985+
uses: ishworkh/container-image-artifact-download@v2.0.0
986986
if: ${{ needs.datahub_ingestion_full_build.outputs.needs_artifact_download == 'true' }}
987987
with:
988988
image: ${{ env.DATAHUB_INGESTION_IMAGE }}:${{ needs.datahub_ingestion_full_build.outputs.tag }}
@@ -1079,47 +1079,47 @@ jobs:
10791079
- name: Disk Check
10801080
run: df -h . && docker images
10811081
- name: Download GMS image
1082-
uses: ishworkh/docker-image-artifact-download@v1
1082+
uses: ishworkh/container-image-artifact-download@v2.0.0
10831083
if: ${{ ( needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' ) && needs.gms_build.result == 'success' }}
10841084
with:
10851085
image: ${{ env.DATAHUB_GMS_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
10861086
- name: Download Frontend image
1087-
uses: ishworkh/docker-image-artifact-download@v1
1087+
uses: ishworkh/container-image-artifact-download@v2.0.0
10881088
if: ${{ ( needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' ) && needs.frontend_build.result == 'success' }}
10891089
with:
10901090
image: ${{ env.DATAHUB_FRONTEND_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
10911091
- name: Download Kafka Setup image
1092-
uses: ishworkh/docker-image-artifact-download@v1
1092+
uses: ishworkh/container-image-artifact-download@v2.0.0
10931093
if: ${{ ( needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' ) && needs.kafka_setup_build.result == 'success' }}
10941094
with:
10951095
image: ${{ env.DATAHUB_KAFKA_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
10961096
- name: Download Mysql Setup image
1097-
uses: ishworkh/docker-image-artifact-download@v1
1097+
uses: ishworkh/container-image-artifact-download@v2.0.0
10981098
if: ${{ ( needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' ) && needs.mysql_setup_build.result == 'success' }}
10991099
with:
11001100
image: ${{ env.DATAHUB_MYSQL_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
11011101
- name: Download Elastic Setup image
1102-
uses: ishworkh/docker-image-artifact-download@v1
1102+
uses: ishworkh/container-image-artifact-download@v2.0.0
11031103
if: ${{ ( needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' ) && needs.elasticsearch_setup_build.result == 'success' }}
11041104
with:
11051105
image: ${{ env.DATAHUB_ELASTIC_SETUP_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
11061106
- name: Download MCE Consumer image
1107-
uses: ishworkh/docker-image-artifact-download@v1
1107+
uses: ishworkh/container-image-artifact-download@v2.0.0
11081108
if: ${{ ( needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' ) && needs.mce_consumer_build.result == 'success' }}
11091109
with:
11101110
image: ${{ env.DATAHUB_MCE_CONSUMER_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
11111111
- name: Download MAE Consumer image
1112-
uses: ishworkh/docker-image-artifact-download@v1
1112+
uses: ishworkh/container-image-artifact-download@v2.0.0
11131113
if: ${{ ( needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' ) && needs.mae_consumer_build.result == 'success' }}
11141114
with:
11151115
image: ${{ env.DATAHUB_MAE_CONSUMER_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
11161116
- name: Download upgrade image
1117-
uses: ishworkh/docker-image-artifact-download@v1
1117+
uses: ishworkh/container-image-artifact-download@v2.0.0
11181118
if: ${{ ( needs.setup.outputs.publish != 'true' && needs.setup.outputs.pr-publish != 'true' ) && needs.datahub_upgrade_build.result == 'success' }}
11191119
with:
11201120
image: ${{ env.DATAHUB_UPGRADE_IMAGE }}:${{ needs.setup.outputs.unique_tag }}
11211121
- name: Download datahub-ingestion-slim image
1122-
uses: ishworkh/docker-image-artifact-download@v1
1122+
uses: ishworkh/container-image-artifact-download@v2.0.0
11231123
if: ${{ needs.datahub_ingestion_slim_build.outputs.needs_artifact_download == 'true' && needs.datahub_ingestion_slim_build.result == 'success' }}
11241124
with:
11251125
image: ${{ env.DATAHUB_INGESTION_IMAGE }}:${{ needs.datahub_ingestion_slim_build.outputs.tag }}

‎datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ private AnalyticsChart getTopUsersChart(OperationContext opContext) {
125125
final DateRange trailingMonthDateRange = dateUtil.getTrailingMonthDateRange();
126126
final List<String> columns = ImmutableList.of("Name", "Title", "Email");
127127

128-
final String topUsersTitle = "Top Users";
128+
final String topUsersTitle = "Top Users (Last 30 Days)";
129129
final List<Row> topUserRows =
130130
_analyticsService.getTopNTableChart(
131131
_analyticsService.getUsageIndexName(),
@@ -198,7 +198,7 @@ private Row buildNewUsersRow(@Nonnull final SearchEntity entity) {
198198
private AnalyticsChart getNewUsersChart(OperationContext opContext) {
199199
try {
200200
final List<String> columns = ImmutableList.of("Name", "Title", "Email");
201-
final String newUsersTitle = "New Users";
201+
final String newUsersTitle = "Active Users (Last 30 Days)";
202202
final SearchResult result = searchForNewUsers(opContext);
203203
final List<Row> newUserRows = new ArrayList<>();
204204
for (SearchEntity entity : result.getEntities()) {

‎datahub-graphql-core/src/main/resources/entity.graphql

+5
Original file line numberDiff line numberDiff line change
@@ -3838,6 +3838,11 @@ enum CorpUserStatus {
38383838
A User that has been provisioned and logged in
38393839
"""
38403840
ACTIVE
3841+
3842+
"""
3843+
A user that has been suspended
3844+
"""
3845+
SUSPENDED
38413846
}
38423847

38433848
union ResolvedActor = CorpUser | CorpGroup

‎datahub-web-react/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ node {
1616
}
1717

1818
// Version of node to use.
19-
version = '21.2.0'
19+
version = '22.12.0'
2020

2121
// Version of Yarn to use.
2222
yarnVersion = '1.22.22'
@@ -93,7 +93,6 @@ task yarnLintFix(type: YarnTask, dependsOn: [yarnInstall, yarnGenerate]) {
9393
}
9494

9595
task yarnBuild(type: YarnTask, dependsOn: [yarnInstall, yarnGenerate]) {
96-
environment = [NODE_OPTIONS: "--max-old-space-size=3072 --openssl-legacy-provider"]
9796
args = ['run', 'build']
9897

9998
outputs.cacheIf { true }

‎datahub-web-react/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"analyze": "source-map-explorer 'dist/assets/*.js'",
9191
"start": "yarn run generate && vite",
9292
"ec2-dev": "yarn run generate && CI=true;export CI;vite",
93-
"build": "yarn run generate && NODE_OPTIONS='--max-old-space-size=3072 --openssl-legacy-provider' CI=false vite build",
93+
"build": "yarn run generate && NODE_OPTIONS='--max-old-space-size=4096 --openssl-legacy-provider' CI=false vite build",
9494
"test": "vitest",
9595
"generate": "graphql-codegen --config codegen.yml",
9696
"lint": "eslint . --ext .ts,.tsx --quiet && yarn format-check && yarn type-check",

0 commit comments

Comments
 (0)