Skip to content

Commit

Permalink
fix: drop sentry support
Browse files Browse the repository at this point in the history
  • Loading branch information
Ian2012 committed Jul 19, 2024
1 parent 3a734e2 commit 6185459
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 48 deletions.
1 change: 0 additions & 1 deletion .github/environments/disabled/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ DRYDOCK_DEBUG: false
DRYDOCK_ENABLE_CELERY_TUNING: false
DRYDOCK_ENABLE_MULTITENANCY: false
DRYDOCK_ENABLE_SCORM: false
DRYDOCK_ENABLE_SENTRY: false
DRYDOCK_POD_LIFECYCLE: false
DRYDOCK_AUTO_TLS: false
DRYDOCK_NEWRELIC_LICENSE_KEY: ""
Expand Down
1 change: 0 additions & 1 deletion .github/environments/enabled/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ DRYDOCK_DEBUG: true
DRYDOCK_ENABLE_CELERY_TUNING: true
DRYDOCK_ENABLE_MULTITENANCY: true
DRYDOCK_ENABLE_SCORM: true
DRYDOCK_ENABLE_SENTRY: true
DRYDOCK_POD_LIFECYCLE: true
DRYDOCK_AUTO_TLS: true
DRYDOCK_NEWRELIC_LICENSE_KEY: "your_newrelic_license_key"
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Extra plugins added:
- A patch that allows for the tuning of celery workers via `DRYDOCK_ENABLE_CELERY_TUNING`
- Allows caddy to catch requests for multiple domains through `DRYDOCK_ENABLE_MULTITENANCY`
- Add scorm matcher to caddy through `DRYDOCK_ENABLE_SCORM`
- A patch that allows for the use of sentry via `DRYDOCK_ENABLE_SENTRY` and `DRYDOCK_SENTRY_DSN`
- Patch for cms and lms worker pods to allow pod probes and lifecycle to work properly. Enabled via `DRYDOCK_POD_LIFECYCLE`

Version compatibility matrix
Expand Down Expand Up @@ -70,8 +69,6 @@ The following configuration options are available:
- `DRYDOCK_ENABLE_CELERY_TUNING`: Whether to enable celery tuning. Defaults to `true`.
- `DRYDOCK_ENABLE_MULTITENANCY`: Whether to enable multitennacy. Defaults to `true`.
- `DRYDOCK_ENABLE_SCORM`: Whether to enable scorm. Defaults to `true`.
- `DRYDOCK_ENABLE_SENTRY`: Whether to enable sentry. Defaults to `true`.
- `DRYDOCK_SENTRY_DSN`: The sentry DSN. Defaults to `""`.
- `DRYDOCK_POD_LIFECYCLE`: Whether to enable pod lifecycle. Defaults to `true`.
- `NGINX_STATIC_CACHE_CONFIG`: A list of dictionaries with settings for different services to cache their assets in NGINX.
The following is an example of the expected values:
Expand Down
22 changes: 0 additions & 22 deletions drydock/patches/cms-env
Original file line number Diff line number Diff line change
@@ -1,25 +1,3 @@
{% if DRYDOCK_ENABLE_CELERY_TUNING -%}
CELERY_ACKS_LATE: true
{% endif %}
{% if DRYDOCK_ENABLE_SENTRY -%}
# eox plugin settings must be defined in the ENV patches. If defined in python settings patches, they won't
# take effect since plugins settings are loaded before Tutor loads its settings.
EOX_CORE_SENTRY_INTEGRATION_DSN: "{{ DRYDOCK_SENTRY_DSN }}"
EOX_CORE_SENTRY_IGNORED_ERRORS: [
{
"exc_class": "xmodule.exceptions.NotFoundError"
},
{
"exc_class": "openedx.core.djangoapps.user_authn.exceptions.AuthFailedError",
"exc_text": [".*Email or password is incorrect"]
},
{
"exc_class": "opaque_keys.InvalidKeyError",
"exc_text": [".*No enrollment found for user.*"]
},
{
"exc_class": "opaque_keys.NotFoundError",
"exc_text": [".*No course found by course id.*"]
},
]
{% endif %}
19 changes: 0 additions & 19 deletions drydock/patches/lms-env
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
{% if DRYDOCK_ENABLE_CELERY_TUNING -%}
CELERY_ACKS_LATE: true
{% endif %}
{% if DRYDOCK_ENABLE_SENTRY -%}
# eox plugin settings must be defined in the ENV patches. If defined in python settings patches, they won't
# take effect since plugins settings are loaded before Tutor loads its settings.
EOX_CORE_SENTRY_INTEGRATION_DSN: "{{ DRYDOCK_SENTRY_DSN }}"
EOX_CORE_SENTRY_IGNORED_ERRORS: [
{
"exc_class": "openedx.core.djangoapps.user_authn.exceptions.AuthFailedError",
"exc_text": ["AuthFailedError.*Email or password is incorrect"]
},
{
"exc_class": "opaque_keys.InvalidKeyError",
"exc_text": [".*No enrollment found for user.*"]
},
{
"exc_class": "opaque_keys.NotFoundError",
"exc_text": [".*No course found by course id.*"]
},
]
{% endif %}
2 changes: 0 additions & 2 deletions drydock/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ def get_sync_waves_for_resource(resource_name: str) -> SYNC_WAVES_ORDER_ATTRS_TY
"ENABLE_CELERY_TUNING": True,
"ENABLE_MULTITENANCY": True,
"ENABLE_SCORM": True,
"ENABLE_SENTRY": True,
"SENTRY_DSN": "",
"POD_LIFECYCLE": True,
"BYPASS_CADDY": False,
"PDB_MINAVAILABLE_PERCENTAGE_LMS": 0,
Expand Down

0 comments on commit 6185459

Please sign in to comment.