|
|
@@ -181,16 +181,8 @@ SECURE_HSTS_PRELOAD = getattr(configuration, 'SECURE_HSTS_PRELOAD', False)
|
|
|
SECURE_HSTS_SECONDS = getattr(configuration, 'SECURE_HSTS_SECONDS', 0)
|
|
|
SECURE_SSL_REDIRECT = getattr(configuration, 'SECURE_SSL_REDIRECT', False)
|
|
|
SENTRY_CONFIG = getattr(configuration, 'SENTRY_CONFIG', {})
|
|
|
-# TODO: Remove in NetBox v4.7
|
|
|
-SENTRY_DSN = getattr(configuration, 'SENTRY_DSN', None)
|
|
|
SENTRY_ENABLED = getattr(configuration, 'SENTRY_ENABLED', False)
|
|
|
-# TODO: Remove in NetBox v4.7
|
|
|
-SENTRY_SAMPLE_RATE = getattr(configuration, 'SENTRY_SAMPLE_RATE', 1.0)
|
|
|
-# TODO: Remove in NetBox v4.7
|
|
|
-SENTRY_SEND_DEFAULT_PII = getattr(configuration, 'SENTRY_SEND_DEFAULT_PII', False)
|
|
|
SENTRY_TAGS = getattr(configuration, 'SENTRY_TAGS', {})
|
|
|
-# TODO: Remove in NetBox v4.7
|
|
|
-SENTRY_TRACES_SAMPLE_RATE = getattr(configuration, 'SENTRY_TRACES_SAMPLE_RATE', 0)
|
|
|
SESSION_COOKIE_NAME = getattr(configuration, 'SESSION_COOKIE_NAME', 'sessionid')
|
|
|
SESSION_COOKIE_PATH = CSRF_COOKIE_PATH
|
|
|
SESSION_COOKIE_SECURE = getattr(configuration, 'SESSION_COOKIE_SECURE', False)
|
|
|
@@ -637,31 +629,21 @@ MAINTENANCE_EXEMPT_PATHS = (
|
|
|
# Sentry
|
|
|
#
|
|
|
|
|
|
-# Warn on the presence of deprecated Sentry config parameters
|
|
|
-for config_param in ('SENTRY_DSN', 'SENTRY_SAMPLE_RATE', 'SENTRY_SEND_DEFAULT_PII', 'SENTRY_TRACES_SAMPLE_RATE'):
|
|
|
- if hasattr(configuration, config_param):
|
|
|
- warnings.warn(
|
|
|
- f"{config_param} is deprecated and will be removed in NetBox v4.7. Use SENTRY_CONFIG instead.",
|
|
|
- DeprecationWarning,
|
|
|
- )
|
|
|
-
|
|
|
if SENTRY_ENABLED:
|
|
|
try:
|
|
|
import sentry_sdk
|
|
|
except ModuleNotFoundError:
|
|
|
raise ImproperlyConfigured("SENTRY_ENABLED is True but the sentry-sdk package is not installed.")
|
|
|
|
|
|
- # Construct default Sentry initialization parameters from legacy SENTRY_* config parameters
|
|
|
+ # Build the Sentry initialization parameters
|
|
|
sentry_config = {
|
|
|
- 'dsn': SENTRY_DSN,
|
|
|
- 'sample_rate': SENTRY_SAMPLE_RATE,
|
|
|
- 'send_default_pii': SENTRY_SEND_DEFAULT_PII,
|
|
|
- 'traces_sample_rate': SENTRY_TRACES_SAMPLE_RATE,
|
|
|
+ 'sample_rate': 1.0,
|
|
|
+ 'send_default_pii': False,
|
|
|
+ 'traces_sample_rate': 0,
|
|
|
# TODO: Support proxy routing
|
|
|
'http_proxy': HTTP_PROXIES.get('http') if HTTP_PROXIES else None,
|
|
|
'https_proxy': HTTP_PROXIES.get('https') if HTTP_PROXIES else None,
|
|
|
}
|
|
|
- # Override/extend the default parameters with any provided via SENTRY_CONFIG
|
|
|
sentry_config.update(SENTRY_CONFIG)
|
|
|
# Check for a DSN
|
|
|
if not sentry_config.get('dsn'):
|