Skip to content

Commit

Permalink
Merge branch 'current' into sr-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
Astralidea authored Oct 20, 2023
2 parents f30dfad + 6142879 commit 041ce33
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 47 deletions.
2 changes: 1 addition & 1 deletion website/docs/community/resources/viewpoint.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ id: "viewpoint"

In 2015-2016, a team of folks at RJMetrics had the opportunity to observe, and participate in, a significant evolution of the analytics ecosystem. The seeds of dbt were conceived in this environment, and the viewpoint below was written to reflect what we had learned and how we believed the world should be different. **dbt is our attempt to address the workflow challenges we observed, and as such, this viewpoint is the most foundational statement of the dbt project's goals.**

The remainder of this document is largely unedited from [the original post](https://blog.getdbt.com/building-a-mature-analytics-workflow/).
The remainder of this document is largely unedited from [the original post](https://getdbt.com/blog/building-a-mature-analytics-workflow).

:::

Expand Down
2 changes: 1 addition & 1 deletion website/docs/docs/build/incremental-models.md
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ models:
# `DBT_INTERNAL_DEST` and `DBT_INTERNAL_SOURCE` are the standard aliases for the target table and temporary table, respectively, during an incremental run using the merge strategy.
```

Alternatively, here are the same same configurations configured within a model file:
Alternatively, here are the same configurations configured within a model file:

```sql
-- in models/my_incremental_model.sql
Expand Down
68 changes: 28 additions & 40 deletions website/docs/docs/core/connect-data-platform/bigquery-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ my-bigquery-db:
dev:
type: bigquery
method: oauth
project: [GCP project id]
dataset: [the name of your dbt dataset] # You can also use "schema" here
threads: [1 or more]
[<optional_config>](#optional-configurations): <value>
project: GCP_PROJECT_ID
dataset: DBT_DATASET_NAME # You can also use "schema" here
threads: 4 # Must be a value of 1 or greater
[OPTIONAL_CONFIG](#optional-configurations): VALUE
```

</File>
Expand All @@ -90,14 +90,7 @@ If you do not specify a `project`/`database` and are using the `oauth` method, d

See [docs](https://developers.google.com/identity/protocols/oauth2) on using OAuth 2.0 to access Google APIs.

<Tabs
defaultValue="refresh"
values={[
{label: 'Refresh token', value: 'refresh'},
{label: 'Temporary token', value: 'temp'},
]}>

<TabItem value="refresh">
#### Refresh token

Using the refresh token and client information, dbt will mint new access tokens as necessary.

Expand All @@ -110,21 +103,19 @@ my-bigquery-db:
dev:
type: bigquery
method: oauth-secrets
project: [GCP project id]
dataset: [the name of your dbt dataset] # You can also use "schema" here
threads: [1 or more]
refresh_token: [token]
client_id: [client id]
client_secret: [client secret]
token_uri: [redirect URI]
[<optional_config>](#optional-configurations): <value>
project: GCP_PROJECT_ID
dataset: DBT_DATASET_NAME # You can also use "schema" here
threads: 4 # Must be a value of 1 or greater
refresh_token: TOKEN
client_id: CLIENT_ID
client_secret: CLIENT_SECRET
token_uri: REDIRECT_URI
[OPTIONAL_CONFIG](#optional-configurations): VALUE
```

</File>

</TabItem>

<TabItem value="temp">
#### Temporary token

dbt will use the one-time access token, no questions asked. This approach makes sense if you have an external deployment process that can mint new access tokens and update the profile file accordingly.

Expand All @@ -137,18 +128,15 @@ my-bigquery-db:
dev:
type: bigquery
method: oauth-secrets
project: [GCP project id]
dataset: [the name of your dbt dataset] # You can also use "schema" here
threads: [1 or more]
token: [temporary access token] # refreshed + updated by external process
[<optional_config>](#optional-configurations): <value>
project: GCP_PROJECT_ID
dataset: DBT_DATASET_NAME # You can also use "schema" here
threads: 4 # Must be a value of 1 or greater
token: TEMPORARY_ACCESS_TOKEN # refreshed + updated by external process
[OPTIONAL_CONFIG](#optional-configurations): VALUE
```

</File>

</TabItem>

</Tabs>

### Service Account File

Expand All @@ -161,11 +149,11 @@ my-bigquery-db:
dev:
type: bigquery
method: service-account
project: [GCP project id]
dataset: [the name of your dbt dataset]
threads: [1 or more]
keyfile: [/path/to/bigquery/keyfile.json]
[<optional_config>](#optional-configurations): <value>
project: GCP_PROJECT_ID
dataset: DBT_DATASET_NAME
threads: 4 # Must be a value of 1 or greater
keyfile: /PATH/TO/BIGQUERY/keyfile.json
[OPTIONAL_CONFIG](#optional-configurations): VALUE
```

</File>
Expand All @@ -189,10 +177,10 @@ my-bigquery-db:
dev:
type: bigquery
method: service-account-json
project: [GCP project id]
dataset: [the name of your dbt dataset]
threads: [1 or more]
[<optional_config>](#optional-configurations): <value>
project: GCP_PROJECT_ID
dataset: DBT_DATASET_NAME
threads: 4 # Must be a value of 1 or greater
[OPTIONAL_CONFIG](#optional-configurations): VALUE

# These fields come from the service account json keyfile
keyfile_json:
Expand Down
2 changes: 1 addition & 1 deletion website/docs/docs/use-dbt-semantic-layer/tableau.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Visit the [Tableau documentation](https://help.tableau.com/current/pro/desktop/e
The following Tableau features aren't supported at this time, however, the dbt Semantic Layer may support some of this functionality in a future release:

- Updating the data source page
- Using "Extract" mode to view yur data
- Using "Extract" mode to view your data
- Unioning Tables
- Writing Custom SQL
- Table Extensions
Expand Down
2 changes: 1 addition & 1 deletion website/docs/reference/node-selection/syntax.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dbt's node selection syntax makes it possible to run only specific resources in
| [compile](/reference/commands/compile) | `--select`, `--exclude`, `--selector`, `--inline` |
| [freshness](/reference/commands/source) | `--select`, `--exclude`, `--selector` |
| [build](/reference/commands/build) | `--select`, `--exclude`, `--selector`, `--resource-type`, `--defer` |
| [docs generate](/reference/commands/cmd-docs) | `--select`, `--exclude`, `--selector`, `--defer` |
| [docs generate](/reference/commands/cmd-docs) | `--select`, `--exclude`, `--selector` |

:::info Nodes and resources

Expand Down
6 changes: 3 additions & 3 deletions website/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ var siteSettings = {
announcementBar: {
id: "biweekly-demos",
content:
"Register now for Coalesce 2023. The Analytics Engineering Conference!",
backgroundColor: "#7444FD",
"Join our weekly demos and dbt Cloud in action!",
backgroundColor: "#047377",
textColor: "#fff",
isCloseable: true,
},
announcementBarActive: true,
announcementBarLink: "https://coalesce.getdbt.com/",
announcementBarLink: "https://www.getdbt.com/resources/dbt-cloud-demos-with-experts?utm_source=docs&utm_medium=event&utm_campaign=q1-2024_cloud-demos-with-experts_awareness",
// Set community spotlight member on homepage
// This is the ID for a specific file under docs/community/spotlight
communitySpotlightMember: "faith-lierheimer",
Expand Down

0 comments on commit 041ce33

Please sign in to comment.