Commit 37f7ee6e authored by hynek's avatar hynek 🤤
Browse files

Merge branch '373-do-not-send-pii-to-sentry' into 'master'

Resolve "do not send pii to sentry"

Closes #373

See merge request !353
parents f026f796 b453928a
......@@ -108,7 +108,8 @@ EMAIL_PORT = env("DJANGO_EMAIL_PORT", default=25)
EMAIL_USE_TLS = env("DJANGO_EMAIL_USE_TLS", default=True)
DEFAULT_FROM_EMAIL = env(
"DJANGO_DEFAULT_FROM_EMAIL", default="Discuss Data <noreply@discuss-data.net>",
"DJANGO_DEFAULT_FROM_EMAIL",
default="Discuss Data <noreply@discuss-data.net>",
)
# https://docs.djangoproject.com/en/dev/ref/settings/#server-email
SERVER_EMAIL = env("DJANGO_SERVER_EMAIL", default=DEFAULT_FROM_EMAIL)
......@@ -197,9 +198,6 @@ sentry_sdk.init(
dsn="https://824e439c530d423e989185abee8c5cc2@dev2.discuss-data.net/2",
integrations=[DjangoIntegration(), RedisIntegration()],
environment=env("ENVIRONMENT", default="local"),
# If you wish to associate users to errors (assuming you are using
# django.contrib.auth) you may enable sending PII data.
send_default_pii=True,
)
# Sentry django-Q reporter
......
......@@ -3,7 +3,12 @@
/* Initialize Sentry
* see https://docs.sentry.io/platforms/javascript/
*/
Sentry.init({ dsn: 'https://824e439c530d423e989185abee8c5cc2@dev2.discuss-data.net/2' });
Sentry.init({
dsn: 'https://824e439c530d423e989185abee8c5cc2@dev2.discuss-data.net/2',
integrations: [new Sentry.Integrations.BrowserTracing({
tracingOrigins: ["0.0.0.0", "localhost", "discuss-data.net", "dev.discuss-data.net"],
})],
});
$(document).ready(function(){
/*show sentry feedback*/
......
......@@ -33,6 +33,7 @@ function pathsConfig(appName) {
bootstrapSass: `${vendorsRoot}/bootstrap/scss`,
vendorsJs: [
`${vendorsRoot}/@sentry/browser/build/bundle.js`,
`${vendorsRoot}/@sentry/tracing/build/bundle.tracing.js`,
`${vendorsRoot}/jquery/dist/jquery.js`,
`${vendorsRoot}/popper.js/dist/umd/popper.js`,
`${vendorsRoot}/bootstrap/dist/js/bootstrap.js`,
......
This diff is collapsed.
......@@ -11,9 +11,9 @@
"private": true,
"devDependencies": {
"@semantic-release/gitlab-config": "^8.0.0",
"@sentry/browser": "^5.27.2",
"@sentry/cli": "^1.58.0",
"@sentry/tracing": "^5.27.2",
"@sentry/browser": "^5.27.6",
"@sentry/cli": "^1.59.0",
"@sentry/tracing": "^5.27.6",
"autoprefixer": "^9.8.6",
"bootstrap": "^4.5.3",
"browser-sync": "^2.26.13",
......@@ -33,7 +33,7 @@
"jquery": "^3.5.1",
"pixrem": "^5.0.0",
"popper.js": "^1.16.0",
"semantic-release": "^17.2.2",
"semantic-release": "^17.3.0",
"typeahead.js": "^0.11.1"
},
"engines": {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment