Skip to content

Commit

Permalink
Merge pull request #9 from datahub-project/master
Browse files Browse the repository at this point in the history
Update local fork
  • Loading branch information
kkorchak authored Nov 2, 2023
2 parents 62e420a + f42cb95 commit e51c107
Show file tree
Hide file tree
Showing 43 changed files with 5,351 additions and 4,685 deletions.
2 changes: 1 addition & 1 deletion datahub-web-react/src/app/entity/group/GroupProfile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import NonExistentEntityPage from '../shared/entity/NonExistentEntityPage';
const messageStyle = { marginTop: '10%' };

export enum TabType {
Assets = 'Assets',
Assets = 'Owner Of',
Members = 'Members',
}

Expand Down
2 changes: 1 addition & 1 deletion datahub-web-react/src/app/entity/user/UserProfile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export interface Props {
}

export enum TabType {
Assets = 'Assets',
Assets = 'Owner Of',
Groups = 'Groups',
}
const ENABLED_TAB_TYPES = [TabType.Assets, TabType.Groups];
Expand Down
6 changes: 5 additions & 1 deletion docker/docker-compose-with-cassandra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,10 @@ services:
retries: 5
timeout: 5s
volumes:
- zkdata:/var/lib/zookeeper
# See https://stackoverflow.com/a/61008432 for why we need two volumes.
# See also: https://docs.confluent.io/platform/current/installation/docker/operations/external-volumes.html#data-volumes-for-kafka-and-zk
- zkdata:/var/lib/zookeeper/data
- zklogs:/var/lib/zookeeper/log
networks:
default:
name: datahub_network
Expand All @@ -210,3 +213,4 @@ volumes:
neo4jdata:
broker:
zkdata:
zklogs:
6 changes: 5 additions & 1 deletion docker/docker-compose-without-neo4j.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,15 @@ services:
retries: 3
timeout: 5s
volumes:
- zkdata:/var/lib/zookeeper
# See https://stackoverflow.com/a/61008432 for why we need two volumes.
# See also: https://docs.confluent.io/platform/current/installation/docker/operations/external-volumes.html#data-volumes-for-kafka-and-zk
- zkdata:/var/lib/zookeeper/data
- zklogs:/var/lib/zookeeper/log
networks:
default:
name: datahub_network
volumes:
esdata:
broker:
zkdata:
zklogs:
6 changes: 5 additions & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,10 @@ services:
retries: 3
timeout: 5s
volumes:
- zkdata:/var/lib/zookeeper
# See https://stackoverflow.com/a/61008432 for why we need two volumes.
# See also: https://docs.confluent.io/platform/current/installation/docker/operations/external-volumes.html#data-volumes-for-kafka-and-zk
- zkdata:/var/lib/zookeeper/data
- zklogs:/var/lib/zookeeper/log
networks:
default:
name: datahub_network
Expand All @@ -204,3 +207,4 @@ volumes:
neo4jdata:
broker:
zkdata:
zklogs:
4 changes: 3 additions & 1 deletion docker/quickstart/docker-compose-m1.quickstart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,13 @@ services:
ports:
- ${DATAHUB_MAPPED_ZK_PORT:-2181}:2181
volumes:
- zkdata:/var/lib/zookeeper
- zkdata:/var/lib/zookeeper/data
- zklogs:/var/lib/zookeeper/log
version: '3.9'
volumes:
broker: null
esdata: null
mysqldata: null
neo4jdata: null
zkdata: null
zklogs: null
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,12 @@ services:
ports:
- ${DATAHUB_MAPPED_ZK_PORT:-2181}:2181
volumes:
- zkdata:/var/lib/zookeeper
- zkdata:/var/lib/zookeeper/data
- zklogs:/var/lib/zookeeper/log
version: '3.9'
volumes:
broker: null
esdata: null
mysqldata: null
zkdata: null
zklogs: null
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,12 @@ services:
ports:
- ${DATAHUB_MAPPED_ZK_PORT:-2181}:2181
volumes:
- zkdata:/var/lib/zookeeper
- zkdata:/var/lib/zookeeper/data
- zklogs:/var/lib/zookeeper/log
version: '3.9'
volumes:
broker: null
esdata: null
mysqldata: null
zkdata: null
zklogs: null
4 changes: 3 additions & 1 deletion docker/quickstart/docker-compose.quickstart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,13 @@ services:
ports:
- ${DATAHUB_MAPPED_ZK_PORT:-2181}:2181
volumes:
- zkdata:/var/lib/zookeeper
- zkdata:/var/lib/zookeeper/data
- zklogs:/var/lib/zookeeper/log
version: '3.9'
volumes:
broker: null
esdata: null
mysqldata: null
neo4jdata: null
zkdata: null
zklogs: null
16 changes: 7 additions & 9 deletions docs-website/sidebars.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,8 @@ module.exports = {
{
"Frontend Authentication": [
"docs/authentication/guides/jaas",
{
"OIDC Authentication": [
"docs/authentication/guides/sso/configure-oidc-react",
"docs/authentication/guides/sso/configure-oidc-react-google",
"docs/authentication/guides/sso/configure-oidc-react-okta",
"docs/authentication/guides/sso/configure-oidc-react-azure",
"docs/authentication/guides/sso/configure-oidc-behind-proxy",
],
},
"docs/authentication/guides/sso/configure-oidc-react",
"docs/authentication/guides/sso/configure-oidc-behind-proxy",
],
},
"docs/authentication/introducing-metadata-service-authentication",
Expand Down Expand Up @@ -625,6 +618,11 @@ module.exports = {
type: "doc",
id: "docs/managed-datahub/chrome-extension",
},
{
type: "doc",
id: "docs/managed-datahub/subscription-and-notification",
className: "saasOnly",
},
{
"Managed DataHub Release History": [
"docs/managed-datahub/release-notes/v_0_2_12",
Expand Down
18 changes: 10 additions & 8 deletions docs/authentication/guides/sso/configure-oidc-behind-proxy.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Configuring Frontend to use a Proxy when communicating with SSO Provider
*Authored on 22/08/2023*
# OIDC Proxy Configuration

The `datahub-frontend-react` server can be configured to use an http proxy when retrieving the openid-configuration.
This can be needed if your infrastructure is locked down and disallows connectivity by default, using proxies for fine-grained egress control.
_Authored on 22/08/2023_

The `datahub-frontend-react` server can be configured to use an http proxy when retrieving the openid-configuration.
This can be needed if your infrastructure is locked down and disallows connectivity by default, using proxies for fine-grained egress control.

## Configure http proxy and non proxy hosts

Expand All @@ -17,7 +18,8 @@ HTTP_NON_PROXY_HOSTS=localhost|datahub-gms (or any other hosts that you would li
```

## Optional: provide custom truststore
If your upstream proxy performs SSL termination to inspect traffic, this will result in different (self-signed) certificates for HTTPS connections.

If your upstream proxy performs SSL termination to inspect traffic, this will result in different (self-signed) certificates for HTTPS connections.
The default truststore used in the `datahub-frontend-react` docker image will not trust these kinds of connections.
To address this, you can copy or mount your own truststore (provided by the proxy or network administrators) into the docker container.

Expand All @@ -36,8 +38,8 @@ FROM linkedin/datahub-frontend-react:<version>
COPY /truststore-directory /certificates
```

Building this Dockerfile will result in your own custom docker image on your local machine.
You will then be able to tag it, publish it to your own registry, etc.
Building this Dockerfile will result in your own custom docker image on your local machine.
You will then be able to tag it, publish it to your own registry, etc.

#### Option b) Mount truststore from your host machine using a docker volume

Expand All @@ -51,7 +53,7 @@ Adapt your docker-compose.yml to include a new volume mount in the `datahub-fron
- /truststore-directory:/certificates
```

### Reference new truststore
### Reference new truststore

Add the following environment values to the `datahub-frontend-react` container:

Expand Down
127 changes: 0 additions & 127 deletions docs/authentication/guides/sso/configure-oidc-react-azure.md

This file was deleted.

Loading

0 comments on commit e51c107

Please sign in to comment.