From f7c629ec9b755553b680343d4b4939b41274ca56 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 20 Aug 2020 22:19:49 +0200 Subject: [PATCH] root: when error_reporting is enabled, don't sent pii data by default --- docs/installation/kubernetes.md | 1 + helm/templates/configmap.yaml | 1 + helm/values.yaml | 1 + passbook/lib/default.yml | 1 + passbook/root/settings.py | 3 ++- 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/installation/kubernetes.md b/docs/installation/kubernetes.md index 8e704e9a8..48d3e141a 100644 --- a/docs/installation/kubernetes.md +++ b/docs/installation/kubernetes.md @@ -20,6 +20,7 @@ config: # Enable error reporting error_reporting: enabled: false + send_pii: false # Log level used by web and worker # Can be either debug, info, warning, error log_level: warning diff --git a/helm/templates/configmap.yaml b/helm/templates/configmap.yaml index ef2a137b6..edae93bed 100644 --- a/helm/templates/configmap.yaml +++ b/helm/templates/configmap.yaml @@ -22,4 +22,5 @@ data: error_reporting: enabled: {{ .Values.config.error_reporting.enabled }} environment: {{ .Values.config.error_reporting.environment }} + send_pii: {{ .Values.config.error_reporting.send_pii }} log_level: "{{ .Values.config.log_level }}" diff --git a/helm/values.yaml b/helm/values.yaml index 585cc4e83..c34eb1388 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -13,6 +13,7 @@ config: error_reporting: enabled: false environment: customer + send_pii: false # Log level used by web and worker # Can be either debug, info, warning, error log_level: warning diff --git a/passbook/lib/default.yml b/passbook/lib/default.yml index 82a2a5805..fb8bea44f 100644 --- a/passbook/lib/default.yml +++ b/passbook/lib/default.yml @@ -18,6 +18,7 @@ log_level: warning error_reporting: enabled: false environment: customer + send_pii: false passbook: # Optionally add links to the footer on the login page diff --git a/passbook/root/settings.py b/passbook/root/settings.py index 877f9d3d8..f471e3520 100644 --- a/passbook/root/settings.py +++ b/passbook/root/settings.py @@ -275,11 +275,12 @@ if not DEBUG and _ERROR_REPORTING: sentry_init( dsn="https://33cdbcb23f8b436dbe0ee06847410b67@sentry.beryju.org/3", integrations=[DjangoIntegration(), CeleryIntegration()], - send_default_pii=True, before_send=before_send, release="passbook@%s" % __version__, traces_sample_rate=1.0, environment=CONFIG.y("error_reporting.environment", "customer"), + transaction_style="function_name", + send_default_pii=CONFIG.y_bool("error_reporting.send_pii", False), )