Skip to content

Commit

Permalink
Merge branch 'datahub-project:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
shirshanka authored Nov 23, 2023
2 parents 1f74fca + a62d52e commit b282b8b
Show file tree
Hide file tree
Showing 25 changed files with 401 additions and 121 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import ExpandingStat from '../../dataset/shared/ExpandingStat';
const StatText = styled.span`
color: ${ANTD_GRAY[8]};
@media (min-width: 1024px) {
width: 100%;
white-space: nowrap;
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import ExpandingStat from './ExpandingStat';
const StatText = styled.span<{ color: string }>`
color: ${(props) => props.color};
@media (min-width: 1160px) {
width: 100%;
white-space: nowrap;
`;

Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose-without-neo4j.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ services:
mysql:
container_name: mysql
hostname: mysql
image: mysql:5.7
image: mysql:${DATAHUB_MYSQL_VERSION:-5.7}
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --default-authentication-plugin=mysql_native_password
ports:
- ${DATAHUB_MAPPED_MYSQL_PORT:-3306}:3306
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ services:
mysql:
container_name: mysql
hostname: mysql
image: mysql:5.7
image: mysql:${DATAHUB_MYSQL_VERSION:-5.7}
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin --default-authentication-plugin=mysql_native_password
ports:
- ${DATAHUB_MAPPED_MYSQL_PORT:-3306}:3306
Expand Down
2 changes: 1 addition & 1 deletion docker/mysql/docker-compose.mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
mysql:
container_name: mysql
hostname: mysql
image: mysql:5.7
image: mysql:${DATAHUB_MYSQL_VERSION:-5.7}
env_file: env/docker.env
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ services:
test: mysqladmin ping -h mysql -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
timeout: 5s
hostname: mysql
image: mysql:5.7
image: mysql:${DATAHUB_MYSQL_VERSION:-5.7}
ports:
- ${DATAHUB_MAPPED_MYSQL_PORT:-3306}:3306
restart: on-failure
Expand Down
2 changes: 1 addition & 1 deletion docker/quickstart/docker-compose.quickstart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ services:
test: mysqladmin ping -h mysql -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
timeout: 5s
hostname: mysql
image: mysql:5.7
image: mysql:${DATAHUB_MYSQL_VERSION:-5.7}
ports:
- ${DATAHUB_MAPPED_MYSQL_PORT:-3306}:3306
restart: on-failure
Expand Down
9 changes: 9 additions & 0 deletions docker/quickstart/quickstart_version_mapping.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,27 @@ quickstart_version_map:
default:
composefile_git_ref: master
docker_tag: head
mysql_tag: 5.7
# default: # Use this to pin default to a specific version.
# composefile_git_ref: fd1bd51541a132017a648f4a2f037eec8f70ba26 # v0.10.0 + quickstart compose file fixes
# docker_tag: v0.10.0

head:
composefile_git_ref: master
docker_tag: head
mysql_tag: 5.7

# v0.13.0 we upgraded MySQL image for EOL
v0.13.0:
composefile_git_ref: master
docker_tag: head
mysql_tag: 8.2

# v0.9.6 images contain security vulnerabilities
v0.9.6:
composefile_git_ref: v0.9.6.1
docker_tag: v0.9.6.1
mysql_tag: 5.7

# If stable is not defined the latest released version will be used.
# stable:
Expand Down
1 change: 1 addition & 0 deletions docs-website/sidebars.js
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,7 @@ module.exports = {
},
{
"Managed DataHub Release History": [
"docs/managed-datahub/release-notes/v_0_2_13",
"docs/managed-datahub/release-notes/v_0_2_12",
"docs/managed-datahub/release-notes/v_0_2_11",
"docs/managed-datahub/release-notes/v_0_2_10",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
.feature {
flex-direction: row;
padding: 1.75rem;
color: var(--ifm-hero-text-color);
margin: 0rem 2rem 1rem 0rem;
min-height: 14rem;
max-height: 15rem;
overflow: hidden;
text-decoration: none !important;

img {
width: 1.5rem;
height: 1.5rem;
margin-right: 0.75rem;
}
svg {
width: 1.5rem;
height: 1.5rem;
margin-right: 0.75rem;
}
strong,
span {
display: block;
margin-bottom: 0.75rem;
}
strong {
font-weight: 600;
font-size: 1.1rem;
}

span {
font-size: 1rem;
line-height: 1.25em;
}
&:hover {
border-color: var(--ifm-color-primary);
}
}
21 changes: 21 additions & 0 deletions docs-website/src/pages/docs/_components/FeatureCard/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React from "react";
import clsx from "clsx";
import styles from "./featurecard.module.scss";
import useBaseUrl from "@docusaurus/useBaseUrl";
import Link from "@docusaurus/Link";

const FeatureCard = ({icon, title, description, to}) => {
return (
<div className="col col--4">
<Link to={useBaseUrl(to)} className={clsx("card", styles.feature)}>
<div>
{icon}
<strong>{title}&nbsp;→</strong>
<span>{description}</span>
</div>
</Link>
</div>
);
};

export default FeatureCard;
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@


.feature {
flex-direction: row;
padding: 0.675rem;
color: var(--ifm-text-color);
margin: 0.5rem;
min-height: calc(100% - 1rem);
text-decoration: none !important;
img {
width: 1.5rem;
height: 1.5rem;
margin-right: 0.75rem;
}
svg {
width: 1.5rem;
height: 1.5rem;
margin-right: 0.75rem;
}
strong,
span {
display: block;
margin-bottom: 0.25rem;
}
strong {
font-weight: 600;
}

span {
font-size: 0.875rem;
line-height: 1.25em;
}
&:hover {
border-color: var(--ifm-color-primary);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import React from "react";
import FeatureCard from '../FeatureCard'
import {
EyeTwoTone,
HeartTwoTone,
ApiTwoTone,
AlertTwoTone,
CompassTwoTone,
ProfileTwoTone,
} from "@ant-design/icons";

const featureCardContent = [
{
title: "Data Discovery",
description: "Search your entire data ecosystem, including dashboards, datasets, ML models, and raw files.",
to: "docs/how/search",
icon: <EyeTwoTone />
},
{
title: "Data Governance",
description: "Define ownership and track PII.",
to: "https://www.acryldata.io/blog/the-3-must-haves-of-metadata-management-part-2?utm_source=datahub&utm_medium=referral&utm_content=blog",
icon: <CompassTwoTone />
},
{
title: "Data Quality Control",
description: "Improve data quality through metadata tests, assertions, data freshness checks, and data contracts.",
to: "https://www.acryldata.io/blog/data-contracts-in-datahub-combining-verifiability-with-holistic-data-management?utm_source=datahub&utm_medium=referral&utm_content=blog",
icon: <AlertTwoTone />
},
{
title: "UI-based Ingestion",
description: "Easily set up integrations in minutes using DataHub's intuitive UI-based ingestion feature.",
to: "docs/ui-ingestion",
icon: <ProfileTwoTone />
},
{
title: "APIs and SDKs",
description: "For users who prefer programmatic control, DataHub offers a comprehensive set of APIs and SDKs.",
to: "docs/api/datahub-apis",
icon: <ApiTwoTone />
},
{
title: "Vibrant Community",
description: "Our community provides support through office hours, workshops, and a Slack channel.",
to: "docs/slack",
icon: <HeartTwoTone />
}
]

const FeatureCards = () => {
return (
<div style={{ padding: "2vh 0" }}>
<div className="container" style={{ padding: "0"}}>
<div className="row row--no-gutters">
{featureCardContent.map((props, idx) => (
<FeatureCard key={idx} {...props} />
))}
</div>
</div>
</div>
);
};

export default FeatureCards;
22 changes: 22 additions & 0 deletions docs-website/src/pages/docs/_components/QuickstartCard/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import React from "react";
import clsx from "clsx";
import styles from "./quickstartcard.module.scss";
import Link from "@docusaurus/Link";
import useBaseUrl from "@docusaurus/useBaseUrl";


const QuickstartCard = ({ icon, title, to, color, fontColor }) => {
return (
<div className="col col--6">
<Link to={to} className={clsx("card", styles.feature)} style={{ background: color, color: fontColor}}>
<img src={useBaseUrl(`/img/${icon}.svg`)} />
<div style={{ margin: "auto 0"}}>
<strong>{title}&nbsp;→</strong>
</div>
</Link>
</div>
);
};


export default QuickstartCard;
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
.feature {
flex-direction: row;
height: 10rem;
flex-shrink: 0;
padding: 3rem;
color: var(--ifm-text-color);
margin: 0rem 2rem 1rem 0rem;
min-height: calc(100% - 1rem);
text-decoration: none !important;


img {
width: 3rem;
height: 3rem;
margin: auto 1rem;
}
svg {
width: 1.5rem;
height: 1.5rem;
margin-right: 0.75rem;
}
strong,
span {
display: block;
margin-bottom: 0.25rem;
}
strong {
font-weight: 600;
padding: auto 0;
}

span {
font-size: 0.875rem;
line-height: 1.25em;
}
&:hover {
border-color: var(--ifm-color-primary);
}

.quickstart-text {
margin: auto 0;
}

}

.quickstart-text {
margin: auto 0;
}
35 changes: 35 additions & 0 deletions docs-website/src/pages/docs/_components/QuickstartCards/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import React from "react";
import QuickstartCard from '../QuickstartCard'

const quickstartContent = [
{
title: "Quickstart with DataHub",
icon: "datahub-logo-color-mark",
to: "quickstart",
color: '#FFF',
fontColor: '#091013',
},
{
title: "Learn about Managed DataHub",
icon: "acryl-logo-transparent-mark",
to: "managed-datahub/managed-datahub-overview",
color: '#091013',
fontColor: '#FFF',
}
]

const QuickstartCards = () => {
return (
<div style={{ padding: "2vh 0" }}>
<div className="container" style={{ padding: "0"}}>
<div className="row row--no-gutters">
{quickstartContent.map((props, idx) => (
<QuickstartCard key={idx} {...props} />
))}
</div>
</div>
</div>
);
};

export default QuickstartCards;
Loading

0 comments on commit b282b8b

Please sign in to comment.