From c1eddbbe0252d33b57769e4981aedcf121d8b20c Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Wed, 11 Oct 2023 10:28:17 +0100 Subject: [PATCH 1/3] Add SENTRY_ENV to deployment --- helm/flowforge/README.md | 5 +++-- helm/flowforge/templates/deployment.yaml | 4 ++++ helm/flowforge/values.schema.json | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/helm/flowforge/README.md b/helm/flowforge/README.md index 16bc33c1..631426e1 100644 --- a/helm/flowforge/README.md +++ b/helm/flowforge/README.md @@ -81,9 +81,10 @@ Enables FlowForge Telemetry - `forge.telemetry.posthog.apikey` enables posthog logging if set (not default) - `forge.telemetry.posthog.apiurl` sets posthog target host (default `https://app.posthog.com`) - `forge.telemetry.posthog.capture_pageview` (default `true`) - - `forge.telemetry.sentry.frontend_dsn` enables sentry reporting if set - - `forge.telemetry.sentry.backend_dsn` enables sentry reporting if set + - `forge.telemetry.sentry.frontend_dsn` enables sentry reporting if set (default unset) + - `forge.telemetry.sentry.backend_dsn` enables sentry reporting if set (default unset) - `forge.telemetry.sentry.production_mode` rate limit reporting (default `true`) + - `forge.telemetry.sentry.environment` set as SENTRY_ENV environment variable (default unset) - `forge.telemetry.backend.prometheus.enabled` enables the `/metrics` endpoint on the forge app for scraping by Prometheus ### Support diff --git a/helm/flowforge/templates/deployment.yaml b/helm/flowforge/templates/deployment.yaml index 8d27da35..089ff2c8 100644 --- a/helm/flowforge/templates/deployment.yaml +++ b/helm/flowforge/templates/deployment.yaml @@ -58,6 +58,10 @@ spec: - name: NODE_EXTRA_CA_CERTS value: /usr/local/ssl-certs/chain.pem {{- end }} + {{- if .Values.forge.telemetry.sentry.environment }} + - name: SENTRY_ENV + valeu: {{ .Values.forge.telemetry.sentry.environment }} + {{- end }} volumeMounts: - name: config mountPath: /usr/src/forge/etc diff --git a/helm/flowforge/values.schema.json b/helm/flowforge/values.schema.json index d45171d3..9c45efe8 100644 --- a/helm/flowforge/values.schema.json +++ b/helm/flowforge/values.schema.json @@ -254,6 +254,9 @@ }, "production_mode": { "type": "boolean" + }, + "environment": { + "type": "string" } } }, From 1777b204974b22eac0de1648468ba7fa38ac697d Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Wed, 11 Oct 2023 10:41:21 +0100 Subject: [PATCH 2/3] Update helm/flowforge/templates/deployment.yaml Co-authored-by: Pez Cuckow --- helm/flowforge/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/flowforge/templates/deployment.yaml b/helm/flowforge/templates/deployment.yaml index 089ff2c8..94e3c6d5 100644 --- a/helm/flowforge/templates/deployment.yaml +++ b/helm/flowforge/templates/deployment.yaml @@ -60,7 +60,7 @@ spec: {{- end }} {{- if .Values.forge.telemetry.sentry.environment }} - name: SENTRY_ENV - valeu: {{ .Values.forge.telemetry.sentry.environment }} + value: {{ .Values.forge.telemetry.sentry.environment }} {{- end }} volumeMounts: - name: config From 7995a320d907dc86c7d5a3a7a0b690380c730c27 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Wed, 11 Oct 2023 10:41:45 +0100 Subject: [PATCH 3/3] Update helm/flowforge/README.md Co-authored-by: Pez Cuckow --- helm/flowforge/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/flowforge/README.md b/helm/flowforge/README.md index 631426e1..fc50c990 100644 --- a/helm/flowforge/README.md +++ b/helm/flowforge/README.md @@ -84,7 +84,7 @@ Enables FlowForge Telemetry - `forge.telemetry.sentry.frontend_dsn` enables sentry reporting if set (default unset) - `forge.telemetry.sentry.backend_dsn` enables sentry reporting if set (default unset) - `forge.telemetry.sentry.production_mode` rate limit reporting (default `true`) - - `forge.telemetry.sentry.environment` set as SENTRY_ENV environment variable (default unset) + - `forge.telemetry.sentry.environment` set SENTRY_ENV environment variable, which overrides NODE_ENV for the reported environment (default unset) - `forge.telemetry.backend.prometheus.enabled` enables the `/metrics` endpoint on the forge app for scraping by Prometheus ### Support