Skip to content

Commit

Permalink
Merge branch 'master' into athena-databases
Browse files Browse the repository at this point in the history
  • Loading branch information
fiskus authored Sep 26, 2022
2 parents 872d988 + e29591d commit 8a7a5f7
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 46 deletions.
70 changes: 35 additions & 35 deletions catalog/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions catalog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"ajv-formats": "^2.1.1",
"aws-sdk": "^2.1204.0",
"brace": "^0.11.1",
"classnames": "^2.3.1",
"classnames": "^2.3.2",
"connected-react-router": "^6.9.3",
"cross-env": "^7.0.3",
"date-fns": "^2.29.2",
Expand Down Expand Up @@ -222,12 +222,12 @@
"svg-url-loader": "^7.1.1",
"terser-webpack-plugin": "^5.3.6",
"ts-jest": "^27.1.5",
"ts-loader": "^9.3.1",
"ts-loader": "^9.4.1",
"typescript": "^4.8.3",
"url-loader": "^4.1.1",
"util": "^0.12.4",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.11.0"
"webpack-dev-server": "^4.11.1"
}
}
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
* [Changed] Fixed config and docs mistyping: `ui.athena.defaultWorkflow` should be `ui.athena.defaultWorkgroup` ([#3067](https://github.com/quiltdata/quilt/pull/3067))

## Docs
* [Added] Fix four-deep headers so auto-link generation works ([#3100](https://github.com/quiltdata/quilt/pull/3100))
* [Added] Object deletion example ([#3097](https://github.com/quiltdata/quilt/pull/3097))
* [Added] Using R with Quilt ([#3089](https://github.com/quiltdata/quilt/pull/3089))
* [Added] Querying metadata with Athena ([#2901](https://github.com/quiltdata/quilt/pull/2901))
Expand Down
16 changes: 8 additions & 8 deletions docs/technical-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ only allowing necessary traffic.
### Sizing
The Quilt CloudFormation template will automatically configure appropriate instance sizes for RDS, ECS (Fargate), Lambda and Elasticsearch Service. Some users may choose to adjust the size and configuration of their Elasticsearch cluster. All other services should use the default settings.

#### Elasticsearch Service Configuration
### Elasticsearch Service Configuration
By default, Quilt configures an Elasticsearch cluster with 3 master nodes and 2 data nodes. Please contact the Quilt support team before adjusting the size and configuration of your cluster to avoid disruption.

### Cost
Expand All @@ -55,7 +55,7 @@ The infrastructure costs of running a Quilt stack vary with usage. Baseline infr
### Health and Monitoring
To check the status of your Quilt stack after bring-up or update, check the stack health in the CloudFormation console.

#### Elasticsearch Cluster
### Elasticsearch Cluster
If you notice slow or incomplete search results, check the status of the Quilt Elasticsearch cluster. To find the Quilt search cluster from CloudFormation, click on the Quilt stack, then "Resources." Click on the "Search" resource.

If your cluster status is not "Green" (healthy), please contact Quilt support. Causes of unhealthy search clusters include:
Expand Down Expand Up @@ -249,9 +249,9 @@ users to be able to sign up.
![](imgs/default-role.png)


### Single sign-on (SSO)
## Single sign-on (SSO)

#### Google
### Google

You can enable users on your Google domain to sign in to Quilt.
Refer to [Google's instructions on OAuth2 user agents](https://developers.google.com/identity/protocols/OAuth2UserAgent)
Expand All @@ -263,7 +263,7 @@ In the template menu (CloudFormation or Service Catalog), select Google under *U

![](./imgs/google_auth.png)

#### Active Directory
### Active Directory

1. Go to Azure Portal > Active Directory > App Registrations
1. Click New Registration
Expand All @@ -285,7 +285,7 @@ and hybrid flows, and check the box to issue ID tokens

![](./imgs/active-directory.png)

#### Okta
### Okta

1. Go to Okta > Admin > Applications
1. Click `Add Application`
Expand All @@ -306,7 +306,7 @@ and hybrid flows, and check the box to issue ID tokens

![](./imgs/okta-sso-general.png)

#### OneLogin
### OneLogin

1. Go to Administration : Applications > Custom Connectors
1. Click `New Connector`
Expand All @@ -327,7 +327,7 @@ Quilt
![](./imgs/onelogin-sso.png)
![](./imgs/onelogin-users.png)

#### Enabling SSO in CloudFormation
### Enabling SSO in CloudFormation

Now you can connect Quilt to your SSO provider.
In the Quilt template
Expand Down

0 comments on commit 8a7a5f7

Please sign in to comment.