Skip to content

Commit

Permalink
Merge branch 'current' into expand-footprint-of-recommendation
Browse files Browse the repository at this point in the history
  • Loading branch information
dataders authored Jun 13, 2023
2 parents 6bb0fd7 + c45cccc commit 263b9d0
Show file tree
Hide file tree
Showing 24 changed files with 138 additions and 61 deletions.
8 changes: 2 additions & 6 deletions website/docs/docs/build/incremental-models.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,7 @@ Transaction management is used to ensure this is executed as a single unit of wo

## What if the columns of my incremental model change?

:::tip New `on_schema_change` config in dbt version `v0.21.0`

Incremental models can now be configured to include an optional `on_schema_change` parameter to enable additional control when incremental model columns change. These options enable dbt to continue running incremental models in the presence of schema changes, resulting in fewer `--full-refresh` scenarios and saving query costs.

:::
Incremental models can be configured to include an optional `on_schema_change` parameter to enable additional control when incremental model columns change. These options enable dbt to continue running incremental models in the presence of schema changes, resulting in fewer `--full-refresh` scenarios and saving query costs.

You can configure the `on_schema_change` setting as follows.

Expand Down Expand Up @@ -253,7 +249,7 @@ the reliability of your `unique_key`, or the availability of certain features.
* [Snowflake](/reference/resource-configs/snowflake-configs#merge-behavior-incremental-models): `merge` (default), `delete+insert` (optional), `append` (optional)
* [BigQuery](/reference/resource-configs/bigquery-configs#merge-behavior-incremental-models): `merge` (default), `insert_overwrite` (optional)
* [Databricks](/reference/resource-configs/databricks-configs#incremental-models): `append` (default), `insert_overwrite` (optional), `merge` (optional, Delta-only)
*[Spark](/reference/resource-configs/spark-configs#incremental-models): `append` (default), `insert_overwrite` (optional), `merge` (optional, Delta-only)
* [Spark](/reference/resource-configs/spark-configs#incremental-models): `append` (default), `insert_overwrite` (optional), `merge` (optional, Delta-only)

<VersionBlock firstVersion="1.3">

Expand Down
12 changes: 6 additions & 6 deletions website/docs/docs/cloud/about-cloud/regions-ip-addresses.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ dbt Cloud is [hosted](/docs/cloud/about-cloud/architecture) in multiple regions
[dbt Cloud Enterprise](https://www.getdbt.com/pricing/) plans can choose to have their account hosted in any of the below regions. Organizations **must** choose a single region per dbt Cloud account. If you need to run dbt Cloud in multiple regions, we recommend using multiple dbt Cloud accounts.


| Region | Location | Access URL | IP addresses | Developer plan | Team plan | Enterprise plan |
|--------|----------|------------|--------------|-----------------|------------|------------------|
| North America [^1] | AWS us-east-1 (N. Virginia) | cloud.getdbt.com | 52.45.144.63 <br /> 54.81.134.249 <br />52.22.161.231 ||||
| EMEA [^1] | AWS eu-central-1 (Frankfurt) | emea.dbt.com | 3.123.45.39 <br /> 3.126.140.248 <br /> 3.72.153.148 ||||
| APAC [^1] | AWS ap-southeast-2 (Sydney)| au.dbt.com | 52.65.89.235 <br /> 3.106.40.33 <br /> 13.239.155.206 <br />||||
| Virtual Private dbt or Single tenant | Customized | Customized | Ask [Support](/guides/legacy/getting-help#dbt-cloud-support) for your IPs ||||
| Region | Location | Access URL | Auth URL | Audience URN | IP addresses | Developer plan | Team plan | Enterprise plan |
|--------|----------|------------|------------|------------|--------------|-----------------|------------|------------------|
| North America [^1] | AWS us-east-1 (N. Virginia) | cloud.getdbt.com | us-production-mt.us.auth0.com | urn:auth0:us-production-mt | 52.45.144.63 <br /> 54.81.134.249 <br />52.22.161.231 ||||
| EMEA [^1] | AWS eu-central-1 (Frankfurt) | emea.dbt.com | us-production-mt.us.auth0.com | urn:auth0:us-production-mt | 3.123.45.39 <br /> 3.126.140.248 <br /> 3.72.153.148 ||||
| APAC [^1] | AWS ap-southeast-2 (Sydney)| au.dbt.com | us-production-mt.us.auth0.com | urn:auth0:us-production-mt | 52.65.89.235 <br /> 3.106.40.33 <br /> 13.239.155.206 <br />||||
| Virtual Private dbt or Single tenant | Customized | Customized | Ask [Support](/guides/legacy/getting-help#dbt-cloud-support) for your Auth IP | Ask [Support](/guides/legacy/getting-help#dbt-cloud-support) for your Audience URN | Ask [Support](/guides/legacy/getting-help#dbt-cloud-support) for your IPs ||||


[^1]: These regions support [multi-tenant](/docs/cloud/about-cloud/tenancy) deployment environments hosted by dbt Labs.
23 changes: 15 additions & 8 deletions website/docs/docs/cloud/dbt-cloud-ide/lint-format.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ With the dbt Cloud IDE, you can seamlessly use [SQLFluff](https://sqlfluff.com/)

### Enable linting

1. To enable linting, make sure you've opened a `.sql` file.
1. To enable linting, make sure you open a `.sql` file and click the **Code Quality** tab.
2. Click on the **`</> Config`** button on the bottom right side of the [console section](/docs/cloud/dbt-cloud-ide/ide-user-interface#console-section), below the **File editor**.
3. In the code quality tool config pop up, you have the option to select **sqlfluff** or **sqlfmt**.
4. To lint your code, select the **sqlfluff** radio button. (Use sqlfmt to [format](#format) your code)
5. Once you've selected the **sqlfluff** radio button, go back to the console section (below the **File editor**) to select the **Lint** or **Fix** dropdown button:
- The **Lint** button displays linting issues in the IDE as wavy underlines in the **File editor**. You can hover over an underlined issue to display the details and actions, including a **Quick Fix** option to fix all or specific issues. After linting, you'll see a message confirming the outcome. Linting doesn't rerun after saving. Click on the **Lint** button again to rerun linting.
- The **Fix** dropdown button auto-fixes errors in the **File editor**. Once you've auto-fixed, you'll see a message confirming the outcome.
- For any code errors, use the **Code Quality** tab to view and debug them.
- **Lint** button &mdash; Displays linting issues in the IDE as wavy underlines in the **File editor**. You can hover over an underlined issue to display the details and actions, including a **Quick Fix** option to fix all or specific issues. After linting, you'll see a message confirming the outcome. Linting doesn't rerun after saving. Click **Lint** again to rerun linting.
- **Fix** button &mdash; Automatically fixes linting errors in the **File editor**. When fixing is complete, you'll see a message confirming the outcome.
- Use the **Code Quality** tab to view and debug any code errors.

<Lightbox src="/img/docs/dbt-cloud/cloud-ide/ide-lint-format-console.gif" width="95%" title="Use the Lint or Fix button in the console section to lint or auto-fix your code."/>

Expand Down Expand Up @@ -137,11 +137,13 @@ The Cloud IDE formatting integrations take care of manual tasks like code format

### Format SQL

To format your SQL code, dbt Cloud integrates with [sqlfmt](http://sqlfmt.com/), which is an uncompromising SQL query formatter that provides one way to format the SQL query and Jinja.
To format your SQL code, dbt Cloud integrates with [sqlfmt](http://sqlfmt.com/), which is an uncompromising SQL query formatter that provides one way to format the SQL query and Jinja.

By default, the IDE uses sqlfmt rules to format your code, making the **Format** button available and convenient to use right away. However, if you have a file named .sqlfluff in the root directory of your dbt project, the IDE will default to SQLFluff rules instead.

To enable formatting:

1. Make sure you open a `.sql` file.
1. Make sure you open a `.sql` file and click on the **Code Quality** tab.
2. Click on the **`</> Config`** button on the right side of the console.
3. In the code quality tool config pop-up, you have the option to select sqlfluff or sqlfmt.
4. To format your code, select the **sqlfmt** radio button. (Use sqlfluff to [lint](#linting) your code).
Expand Down Expand Up @@ -170,17 +172,22 @@ To format your Python code, dbt Cloud integrates with [Black](https://black.read

<Lightbox src="/img/docs/dbt-cloud/cloud-ide/python-black.gif" width="95%" title="Format Python files using Black."/>

## Troubleshooting
## FAQs

<details>
<summary>Can I nest <code>.sqlfluff</code> files?</summary>

To ensure optimal code quality, consistent code, and styles, it's highly recommended you have one main `.sqlfluff` configuration file in the root folder of your project. Having multiple files can result in various different SQL styles in your project. <br /><br />
To ensure optimal code quality, consistent code, and styles &mdash; it's highly recommended you have one main `.sqlfluff` configuration file in the root folder of your project. Having multiple files can result in various different SQL styles in your project. <br /><br />

However, you can customize and include an additional child `.sqlfluff` configuration file within specific subfolders of your dbt project. <br /><br />By nesting a `.sqlfluff` file in a subfolder, SQLFluff will apply the rules defined in that subfolder's configuration file to any files located within it. The rules specified in the parent `.sqlfluff` file will be used for all other files and folders outside of the subfolder. This hierarchical approach allows for tailored linting rules while maintaining consistency throughout your project. Refer to [SQLFluff documentation](https://docs.sqlfluff.com/en/stable/configuration.html#configuration-files) for more info.

</details>

<details>
<summary>Can I run SQLFluff commands from the terminal?</summary>

Currently, running SQLFluff commands from the terminal isn't supported.
</details>

## Next steps

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ To delete a user in dbt Cloud, you must be an account owner or have admin privil
If you are on a **Teams** plan and you're deleting users to reduce the number of billable seats, follow these steps to lower the license count to avoid being overcharged:

1. In **Account Settings**, select **Billing**.
2. Enter the number of developer seats you want and make sure you fill in all the payment details, including the **Billing Address** section. Leaving these blank won't allow you to save your changes.
3. Press **Update Payment Information** to save your changes.
2. Enter the number of developer seats you want and make sure you fill in all the payment details, including the **Billing Address** section. If you leave any field blank, you won't be able to save your changes.
3. Click **Update Payment Information** to save your changes.

<Lightbox src="/img/docs/dbt-cloud/change-developer-seats.png" width="85%" title="Developer seats" />
<Lightbox src="/img/docs/dbt-cloud/faq-account-settings-billing.jpg" width="85%" title="The **Billing** page in your **Account Settings**" />

Great work! After completing these steps, your dbt Cloud user count and billing count should now be the same.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ need to select the appropriate directory and then register a new application.

4. Configure the **Redirect URI**. The table below shows the appropriate
Redirect URI values for single-tenant and multi-tenant deployments. For most
enterprise use-cases, you will want to use the single-tenant Redirect URI. Replace `YOUR_ACCESS_URL` with the [appropriate Access URL](/docs/cloud/about-cloud/regions-ip-addresses) for your region and plan.
enterprise use-cases, you will want to use the single-tenant Redirect URI. Replace `YOUR_AUTH_URL` with the [appropriate Auth URL](/docs/cloud/about-cloud/regions-ip-addresses) for your region and plan.


| Application Type | Redirect URI |
| ----- | ----- |
| Single-Tenant _(recommended)_ | `https://YOUR_ACCESS_URL/complete/azure_single_tenant` |
| Multi-Tenant | `https://YOUR_ACCESS_URL/complete/azure_multi_tenant` |
| Single-Tenant _(recommended)_ | `https://YOUR_AUTH_URL/login/callback?connection=<login slug>` |
| Multi-Tenant | `https://YOUR_AUTH_URL/login/callback` |


5. Save the App registration to continue setting up Azure AD SSO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ Client Secret for use in dbt Cloud.

6. Save the **Consent screen** settings to navigate back to the **Create OAuth client
id** page.
7. Use the following configuration values when creating your Credentials, replacing `YOUR_ACCESS_URL` with the [appropriate Access URL](/docs/cloud/about-cloud/regions-ip-addresses) for your region and plan.
7. Use the following configuration values when creating your Credentials, replacing `YOUR_ACCESS_URL` and `YOUR_AUTH_URL` with the [appropriate Access URL and Auth URL](/docs/cloud/about-cloud/regions-ip-addresses) for your region and plan.

| Config | Value |
| ------ | ----- |
| **Application type** | Web application |
| **Name** | dbt Cloud |
| **Authorized Javascript origins** | `https://YOUR_ACCESS_URL` |
| **Authorized Redirect URIs** | `https://YOUR_ACCESS_URL/complete/gsuite` |
| **Authorized Redirect URIs** | `https://YOUR_AUTH_URL/login/callback` |

<Lightbox src="/img/docs/dbt-cloud/dbt-cloud-enterprise/gsuite/gsuite-sso-credentials.png" title="GSuite Credentials configuration"/>

Expand Down
6 changes: 3 additions & 3 deletions website/docs/docs/cloud/manage-access/set-up-sso-okta.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ dashes. For example, the _login slug_ for dbt Labs would be
`dbt-labs`. Login slugs must be unique across all dbt Cloud accounts,
so pick a slug that uniquely identifies your company.

On the **SAML Settings** page, enter the following values, replacing `YOUR_ACCESS_URL` with the [appropriate Access URL](/docs/cloud/about-cloud/regions-ip-addresses) for your region and plan:
On the **SAML Settings** page, enter the following values, replacing `YOUR_AUTH_URL` and `YOUR_AUDIENCE_URN` with the [appropriate Auth URL and Audience URN](/docs/cloud/about-cloud/regions-ip-addresses) for your region and plan:

* **Single sign on URL**: `https://YOUR_ACCESS_URL/complete/okta`
* **Audience URI (SP Entity ID)**: `https://YOUR_ACCESS_URL/`
* **Single sign on URL**: `https://YOUR_AUTH_URL/login/callback?connection=<login slug>`
* **Audience URI (SP Entity ID)**: `YOUR_AUDIENCE_URN:<login slug>`
* **Relay State**: `<login slug>`

<Lightbox
Expand Down
22 changes: 11 additions & 11 deletions website/docs/docs/cloud/manage-access/set-up-sso-saml-2.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ Login slugs must be unique across all dbt Cloud accounts, so pick a slug that un

When prompted for the SAML 2.0 application configurations, supply the following values:

* Single sign on URL: `https://YOUR_ACCESS_URL/complete/saml`
* Audience URI (SP Entity ID): `https://YOUR_ACCESS_URL/`
* Single sign on URL: `https://YOUR_AUTH_URL/login/callback?connection=<login slug>`
* Audience URI (SP Entity ID): `YOUR_AUDIENCE_URN:<login slug>`
- Relay State: `<login slug>`

Additionally, you may configure the IdP attributes passed from your identity provider into dbt Cloud. We recommend using the following values:
Expand Down Expand Up @@ -140,8 +140,8 @@ Login slugs must be unique across all dbt Cloud accounts, so pick a slug that un

1. On the **SAML Settings** page, enter the following values:

* **Single sign on URL**: `https://YOUR_ACCESS_URL/complete/okta`
* **Audience URI (SP Entity ID)**: `https://YOUR_ACCESS_URL/`
* **Single sign on URL**: `https://YOUR_AUTH_URL/login/callback?connection=<login slug>`
* **Audience URI (SP Entity ID)**: `YOUR_AUDIENCE_URN:<login slug>`
* **Relay State**: `<login slug>`

<Lightbox collapsed={false} src="/img/docs/dbt-cloud/dbt-cloud-enterprise/okta/okta-3-saml-settings-top.png" title="Configure the app's SAML Settings"/>
Expand Down Expand Up @@ -241,8 +241,8 @@ Login slugs must be unique across all dbt Cloud accounts, so pick a slug that un
2. Download the **IDP metadata**.
3. Copy the **SSO URL** and **Entity ID** and download the **Certificate** (or **SHA-256 fingerprint**, if needed).
4. Enter the following values on the **Service Provider Details** window:
* **ACS URL**: `https://YOUR_ACCESS_URL/complete/saml`
* **Audience URI (SP Entity ID)**: `https://YOUR_ACCESS_URL/`
* **ACS URL**: `https://YOUR_AUTH_URL/login/callback?connection=<login slug>`
* **Audience URI (SP Entity ID)**: `YOUR_AUDIENCE_URN:<login slug>`
- **Start URL**: `<login slug>`
5. Select the **Signed response** checkbox.
6. The default **Name ID** is the primary email. Multi-value input is not supported.
Expand Down Expand Up @@ -311,8 +311,8 @@ Follow these steps to set up single sign-on (SSO) with dbt Cloud:

| Field | Value |
| ----- | ----- |
| **Identifier (Entity ID)** | Base URL for dbt Cloud. Use `https://YOUR_ACCESS_URL/`. |
| **Reply URL (Assertion Consumer Service URL)** | Use `https://YOUR_ACCESS_URL/complete/saml`. |
| **Identifier (Entity ID)** | Use `YOUR_AUDIENCE_URN:<login slug>`. |
| **Reply URL (Assertion Consumer Service URL)** | Use `https://YOUR_AUTH_URL/login/callback?connection=<login slug>`. |
| **Relay State** | The slug you will configure in dbt Cloud. It's usually your company name, but you can pick anything you'd like. |
14. Click **Save** at the top of the form.

Expand Down Expand Up @@ -369,9 +369,9 @@ Login slugs must be unique across all dbt Cloud accounts, so pick a slug that un
3. Under the **Configuration tab**, input the following values:

- **RelayState:** `<login slug>`
- **Audience (EntityID):** https://YOUR_ACCESS_URL/
- **ACS (Consumer) URL Validator:** https://YOUR_ACCESS_URL/complete/saml
- **ACS (Consumer) URL:** https://YOUR_ACCESS_URL/complete/saml
- **Audience (EntityID):** `YOUR_AUDIENCE_URN:<login slug>`
- **ACS (Consumer) URL Validator:** `https://YOUR_AUTH_URL/login/callback?connection=<login slug>`
- **ACS (Consumer) URL:** `https://YOUR_AUTH_URL/login/callback?connection=<login slug>`

4. Next, go to the **Parameters tab**. You must have a parameter for the Email, First Name, and Last Name attributes and include all parameters in the SAML assertions. When you add the custom parameters, make sure you select the **Include in SAML assertion** checkbox.

Expand Down
6 changes: 6 additions & 0 deletions website/docs/docs/cloud/secure/ip-restrictions.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,9 @@ It is possible to put an IP range on one list and then a sub-range or IP address
## Enabling Restrictions

Once you are done adding all your ranges, IP restrictions can be enabled by selecting the **Enable IP restrictions** button and clicking **Save**. If your IP address is in any of the denylist ranges, you won’t be able to save or enable IP restrictions - this is done to prevent accidental account lockouts. If you do get locked out due to IP changes on your end, please reach out to [email protected]

Once enabled, when someone attempts to access dbt Cloud from a restricted IP, they will encounter one of the following messages depending on whether they use email & password or SSO login.

<Lightbox src="/img/docs/dbt-cloud/ip-restricted-email.png" title="IP restricted access denied message for email logins"/>

<Lightbox src="/img/docs/dbt-cloud/ip-restricted-sso.png" title="IP restricted access denied message for SSO logins"/>
Loading

0 comments on commit 263b9d0

Please sign in to comment.