Skip to content

Commit 667efd6

Browse files
Merge pull request #387 from metabase/docs-time-grouping-params->master
[auto-build] docs-time-grouping-params -> master
2 parents be4f0ff + 6e1342b commit 667efd6

33 files changed

+1518
-660
lines changed

_docs/master/api.html

Lines changed: 368 additions & 293 deletions
Large diffs are not rendered by default.

_docs/master/configuring-metabase/config-template.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,20 +128,27 @@ config:
128128
ee-openai-api-key: null
129129
ee-openai-model: gpt-4-turbo-preview
130130
email-from-address: [email protected]
131+
email-from-address-override: [email protected]
131132
email-from-name: null
132133
email-max-recipients-per-second: null
133134
email-reply-to: null
134135
email-smtp-host: null
136+
email-smtp-host-override: null
135137
email-smtp-password: null
138+
email-smtp-password-override: null
136139
email-smtp-port: null
140+
email-smtp-port-override: null
137141
email-smtp-security: none
142+
email-smtp-security-override: ssl
138143
email-smtp-username: null
144+
email-smtp-username-override: null
139145
embedding-app-origins-interactive: null
140146
embedding-app-origins-sdk: localhost:*
141147
embedding-homepage: hidden
142148
embedding-secret-key: null
143149
enable-embedding-interactive: false
144150
enable-embedding-sdk: false
151+
enable-embedding-simple: false
145152
enable-embedding-static: false
146153
enable-password-login: true
147154
enable-pivoted-exports: true
@@ -257,6 +264,7 @@ config:
257264
site-url: null
258265
slack-app-token: null
259266
slack-bug-report-channel: metabase-bugs
267+
smtp-override-enabled: false
260268
source-address-header: X-Forwarded-For
261269
sql-jdbc-fetch-size: 500
262270
ssh-heartbeat-interval-sec: 180

_docs/master/configuring-metabase/environment-variables.md

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,16 @@ This feature is experimental.
437437

438438
The email address you want to use for the sender of emails.
439439

440+
### `MB_EMAIL_FROM_ADDRESS_OVERRIDE`
441+
442+
> Only available on Metabase [Pro](/product/pro) and [Enterprise](/product/enterprise) plans.
443+
444+
- Type: string
445+
- Default: `[email protected]`
446+
- [Configuration file name](./config-file): `email-from-address-override`
447+
448+
The email address you want to use for the sender of emails from your custom SMTP server.
449+
440450
### `MB_EMAIL_FROM_NAME`
441451

442452
- Type: string
@@ -471,6 +481,16 @@ The email address you want the replies to go to, if different from the from addr
471481

472482
The address of the SMTP server that handles your emails.
473483

484+
### `MB_EMAIL_SMTP_HOST_OVERRIDE`
485+
486+
> Only available on Metabase [Pro](/product/pro) and [Enterprise](/product/enterprise) plans.
487+
488+
- Type: string
489+
- Default: `null`
490+
- [Configuration file name](./config-file): `email-smtp-host-override`
491+
492+
The address of the custom SMTP server that handles your emails.
493+
474494
### `MB_EMAIL_SMTP_PASSWORD`
475495

476496
- Type: string
@@ -479,6 +499,16 @@ The address of the SMTP server that handles your emails.
479499

480500
SMTP password.
481501

502+
### `MB_EMAIL_SMTP_PASSWORD_OVERRIDE`
503+
504+
> Only available on Metabase [Pro](/product/pro) and [Enterprise](/product/enterprise) plans.
505+
506+
- Type: string
507+
- Default: `null`
508+
- [Configuration file name](./config-file): `email-smtp-password-override`
509+
510+
Custom SMTP server password.
511+
482512
### `MB_EMAIL_SMTP_PORT`
483513

484514
- Type: integer
@@ -487,6 +517,16 @@ SMTP password.
487517

488518
The port your SMTP server uses for outgoing emails.
489519

520+
### `MB_EMAIL_SMTP_PORT_OVERRIDE`
521+
522+
> Only available on Metabase [Pro](/product/pro) and [Enterprise](/product/enterprise) plans.
523+
524+
- Type: integer
525+
- Default: `null`
526+
- [Configuration file name](./config-file): `email-smtp-port-override`
527+
528+
The port your custom SMTP server uses for outgoing emails. Only ports 465, 587, and 2525 are supported.
529+
490530
### `MB_EMAIL_SMTP_SECURITY`
491531

492532
- Type: keyword
@@ -495,6 +535,16 @@ The port your SMTP server uses for outgoing emails.
495535

496536
SMTP secure connection protocol. (tls, ssl, starttls, or none).
497537

538+
### `MB_EMAIL_SMTP_SECURITY_OVERRIDE`
539+
540+
> Only available on Metabase [Pro](/product/pro) and [Enterprise](/product/enterprise) plans.
541+
542+
- Type: keyword
543+
- Default: `:ssl`
544+
- [Configuration file name](./config-file): `email-smtp-security-override`
545+
546+
SMTP secure connection protocol for your custom server. (tls, ssl, or starttls).
547+
498548
### `MB_EMAIL_SMTP_USERNAME`
499549

500550
- Type: string
@@ -503,6 +553,16 @@ SMTP secure connection protocol. (tls, ssl, starttls, or none).
503553

504554
SMTP username.
505555

556+
### `MB_EMAIL_SMTP_USERNAME_OVERRIDE`
557+
558+
> Only available on Metabase [Pro](/product/pro) and [Enterprise](/product/enterprise) plans.
559+
560+
- Type: string
561+
- Default: `null`
562+
- [Configuration file name](./config-file): `email-smtp-username-override`
563+
564+
Custom SMTP server username.
565+
506566
### `MB_EMBEDDING_APP_ORIGIN [DEPRECATED]`
507567

508568
> Only available on Metabase [Pro](/product/pro) and [Enterprise](/product/enterprise) plans.
@@ -579,6 +639,14 @@ Allow admins to embed Metabase via interactive embedding?
579639

580640
Allow admins to embed Metabase via the SDK?
581641

642+
### `MB_ENABLE_EMBEDDING_SIMPLE`
643+
644+
- Type: boolean
645+
- Default: `false`
646+
- [Configuration file name](./config-file): `enable-embedding-simple`
647+
648+
Allow admins to embed Metabase via Embedded Analytics JS?
649+
582650
### `MB_ENABLE_EMBEDDING_STATIC`
583651

584652
- Type: boolean
@@ -1650,6 +1718,16 @@ The name of the channel where bug reports should be posted.
16501718

16511719
The name of the channel to which Metabase files should be initially uploaded.
16521720

1721+
### `MB_SMTP_OVERRIDE_ENABLED`
1722+
1723+
> Only available on Metabase [Pro](/product/pro) and [Enterprise](/product/enterprise) plans.
1724+
1725+
- Type: boolean
1726+
- Default: `false`
1727+
- [Configuration file name](./config-file): `smtp-override-enabled`
1728+
1729+
Whether to use the custom SMTP server rather than the standard settings.
1730+
16531731
### `MB_SOURCE_ADDRESS_HEADER`
16541732

16551733
- Type: string

_docs/master/databases/sync-scan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ LIMIT 0
140140

141141
By default, this query runs against your database during setup and again every hour. This scanning query is fast with most relational databases but can be slower with MongoDB and some [community-built database drivers](../developers-guide/community-drivers). Syncing can't be turned off completely, otherwise Metabase wouldn't work.
142142

143-
Here's the kind of data that syncs get and why:
143+
Here's the kind of data that gets synced and why:
144144

145145
| What | Why |
146146
| ---------------- | -------------------------------------------- |

_docs/master/developers-guide/driver-changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ layout: new-docs
3434

3535
- Added a feature `:expressions/today` for drivers that support generating a date for the current day.
3636

37+
- Added the driver multi-method `driver/set-database-used!` for drivers to set a database on the connection with statements like `USE DATABASE`.
38+
39+
## Metabase 0.55.9
40+
41+
- Add multi-method `driver/do-with-resilient-connection` for executing functions in a context where closed connections may be automatically reopened
42+
43+
3744
## Metabase 0.55.0
3845

3946
- Add the multi-method `->date` that allows the driver to control how to cast strings and temporal types to dates.

_docs/master/developers-guide/e2e-tests.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,17 @@ Prior to running Cypress against Metabase® Enterprise Edition™, set `MB_EDITI
223223

224224
**Enterprise instance will start without a premium token!**
225225

226-
If you want to test premium features (feature flags), valid tokens need to be available to all Cypress tests. We achieve this by prefixing environment variables with `CYPRESS_`.
227-
You should provide two tokens that correspond to the `EE/PRO` self-hosted (all features enabled) and `STARTER` Cloud (no features enabled) Metabase plans. For more information, please see [Metabase pricing page](/pricing/). (note: only a few tests require the no features token)
226+
If you want to test premium features (feature flags), valid tokens need to be available to all Cypress tests.
227+
You should provide 4 tokens:
228228

229-
- `CYPRESS_ALL_FEATURES_TOKEN`
230-
- `CYPRESS_NO_FEATURES_TOKEN`
229+
- MB_ALL_FEATURES_TOKEN: all feature enabled, including new feature not released yet to customers
230+
- MB_STARTER_CLOUD_TOKEN: only 'hosting' feature enabled to simulate the starter plan on cloud
231+
- MB_PRO_CLOUD_TOKEN: PRO features enabled + 'hosting' to simulate the pro plan on cloud
232+
- MB_PRO_SELF_HOSTED_TOKEN: PRO features but no 'hosting' to simulate the pro self-hosted plan
231233

232-
```
233-
MB_EDITION=ee ENTERPRISE_TOKEN=xxxxxx yarn test-cypress
234-
```
234+
You can configure these via ENVs or via the `cypress.env.json` file (see `cypress.env.json.example` for an example).
235+
236+
For more information, please see [Metabase pricing page](/pricing/).
235237

236238
If you navigate to the `/admin/settings/license` page, the license input field should display the active token. Be careful when sharing screenshots!
237239

0 commit comments

Comments
 (0)