-
Notifications
You must be signed in to change notification settings - Fork 7.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into ask-assistant
* master: refactor(core): Decouple workflow created, saved, deleted events from internal hooks (no-changelog) (#10264) fix(core): Fix oauth2 callback and add integration tests (no-changelog) (#10272) fix(n8n Form Trigger Node): Improve copy and a few tweaks (no-changelog) (#10243) fix(core): Fix expressions in webhook nodes(Form, Webhook) to access previous node's data (#10247) refactor(core): Port endpoints config (no-changelog) (#10268) feat(AWS Lambda Node): Add support for paired items (no-changelog) (#10270) fix: Loop node no input data shown (#10224) fix(core): Make OAuth1/OAuth2 callback not require auth (#10263) 🚀 Release 1.53.0 (#10266) fix(core): Upgrade @n8n/vm2 to address CVE‑2023‑37466 (#10265) feat(Calendly Trigger Node): Add OAuth Credentials Support (#10251) test(core): Improve and expand log streaming tests (no-changelog) (#10261) refactor(editor): Migrate `WorkflowExecutionsListView.vue` to composition API (no-changelog) (#10198) fix(core): Restore log event `n8n.workflow.failed` (#10253) test(core): Stop showing JWT warning during test runs (no-changelog) (#10255) fix(Postgres Node): Expressions in query parameters for Postgres executeQuery operation (#10217) fix(editor): Fix workflow execution list scrolling after filter change (#10226)
- Loading branch information
Showing
70 changed files
with
1,603 additions
and
702 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| import { Config, Env, Nested } from '../decorators'; | ||
|
|
||
| @Config | ||
| class PrometheusMetricsConfig { | ||
| /** Whether to enable the `/metrics` endpoint to expose Prometheus metrics. */ | ||
| @Env('N8N_METRICS') | ||
| readonly enable: boolean = false; | ||
|
|
||
| /** Prefix for Prometheus metric names. */ | ||
| @Env('N8N_METRICS_PREFIX') | ||
| readonly prefix: string = 'n8n_'; | ||
|
|
||
| /** Whether to expose system and Node.js metrics. See: https://www.npmjs.com/package/prom-client */ | ||
| @Env('N8N_METRICS_INCLUDE_DEFAULT_METRICS') | ||
| readonly includeDefaultMetrics = true; | ||
|
|
||
| /** Whether to include a label for workflow ID on workflow metrics. */ | ||
| @Env('N8N_METRICS_INCLUDE_WORKFLOW_ID_LABEL') | ||
| readonly includeWorkflowIdLabel: boolean = false; | ||
|
|
||
| /** Whether to include a label for node type on node metrics. */ | ||
| @Env('N8N_METRICS_INCLUDE_NODE_TYPE_LABEL') | ||
| readonly includeNodeTypeLabel: boolean = false; | ||
|
|
||
| /** Whether to include a label for credential type on credential metrics. */ | ||
| @Env('N8N_METRICS_INCLUDE_CREDENTIAL_TYPE_LABEL') | ||
| readonly includeCredentialTypeLabel: boolean = false; | ||
|
|
||
| /** Whether to expose metrics for API endpoints. See: https://www.npmjs.com/package/express-prom-bundle */ | ||
| @Env('N8N_METRICS_INCLUDE_API_ENDPOINTS') | ||
| readonly includeApiEndpoints: boolean = false; | ||
|
|
||
| /** Whether to include a label for the path of API endpoint calls. */ | ||
| @Env('N8N_METRICS_INCLUDE_API_PATH_LABEL') | ||
| readonly includeApiPathLabel: boolean = false; | ||
|
|
||
| /** Whether to include a label for the HTTP method of API endpoint calls. */ | ||
| @Env('N8N_METRICS_INCLUDE_API_METHOD_LABEL') | ||
| readonly includeApiMethodLabel: boolean = false; | ||
|
|
||
| /** Whether to include a label for the status code of API endpoint calls. */ | ||
| @Env('N8N_METRICS_INCLUDE_API_STATUS_CODE_LABEL') | ||
| readonly includeApiStatusCodeLabel: boolean = false; | ||
|
|
||
| /** Whether to include metrics for cache hits and misses. */ | ||
| @Env('N8N_METRICS_INCLUDE_CACHE_METRICS') | ||
| readonly includeCacheMetrics: boolean = false; | ||
|
|
||
| /** Whether to include metrics derived from n8n's internal events */ | ||
| @Env('N8N_METRICS_INCLUDE_MESSAGE_EVENT_BUS_METRICS') | ||
| readonly includeMessageEventBusMetrics: boolean = false; | ||
| } | ||
|
|
||
| @Config | ||
| export class EndpointsConfig { | ||
| /** Max payload size in MiB */ | ||
| @Env('N8N_PAYLOAD_SIZE_MAX') | ||
| readonly payloadSizeMax: number = 16; | ||
|
|
||
| @Nested | ||
| readonly metrics: PrometheusMetricsConfig; | ||
|
|
||
| /** Path segment for REST API endpoints. */ | ||
| @Env('N8N_ENDPOINT_REST') | ||
| readonly rest: string = 'rest'; | ||
|
|
||
| /** Path segment for form endpoints. */ | ||
| @Env('N8N_ENDPOINT_FORM') | ||
| readonly form: string = 'form'; | ||
|
|
||
| /** Path segment for test form endpoints. */ | ||
| @Env('N8N_ENDPOINT_FORM_TEST') | ||
| readonly formTest: string = 'form-test'; | ||
|
|
||
| /** Path segment for waiting form endpoints. */ | ||
| @Env('N8N_ENDPOINT_FORM_WAIT') | ||
| readonly formWaiting: string = 'form-waiting'; | ||
|
|
||
| /** Path segment for webhook endpoints. */ | ||
| @Env('N8N_ENDPOINT_WEBHOOK') | ||
| readonly webhook: string = 'webhook'; | ||
|
|
||
| /** Path segment for test webhook endpoints. */ | ||
| @Env('N8N_ENDPOINT_WEBHOOK_TEST') | ||
| readonly webhookTest: string = 'webhook-test'; | ||
|
|
||
| /** Path segment for waiting webhook endpoints. */ | ||
| @Env('N8N_ENDPOINT_WEBHOOK_WAIT') | ||
| readonly webhookWaiting: string = 'webhook-waiting'; | ||
|
|
||
| /** Whether to disable n8n's UI (frontend). */ | ||
| @Env('N8N_DISABLE_UI') | ||
| readonly disableUi: boolean = false; | ||
|
|
||
| /** Whether to disable production webhooks on the main process, when using webhook-specific processes. */ | ||
| @Env('N8N_DISABLE_PRODUCTION_MAIN_PROCESS') | ||
| readonly disableProductionWebhooksOnMainProcess: boolean = false; | ||
|
|
||
| /** Colon-delimited list of additional endpoints to not open the UI on. */ | ||
| @Env('N8N_ADDITIONAL_NON_UI_ROUTES') | ||
| readonly additionalNonUIRoutes: string = ''; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.