[Swift] Remove sentry

Seems that the Sentry logger causes a import of requests before the monkey patch of the eventlet happens. eventlet/eventlet#371 (comment) With Wallaby this seems now be an issue and causes a loop when importing the modules like here: eventlet/eventlet#677 although it is not dnspython >= 2 related.
sapcc · May 28, 2021 · e4895d6 · e4895d6
1 parent d942d66
commit e4895d6
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 42 deletions.
diff --git a/openstack/swift/templates/_utils.tpl b/openstack/swift/templates/_utils.tpl
@@ -126,13 +126,6 @@ checksum/object.ring: {{ include "swift/templates/object-ring.yaml" . | sha256su
         secretKeyRef:
           name: swift-secret
           key: {{ $cluster_id }}_service_password
-    {{- if $context.Values.sentry.enabled }}
-    - name: SENTRY_DSN
-      valueFrom:
-        secretKeyRef:
-          name: sentry
-          key: swift.DSN.public
-    {{- end }}
   {{- $resources_cpu := index $cluster (printf "proxy_%s_resources_cpu" $kind) }}
   {{- $resources_memory := index $cluster (printf "proxy_%s_resources_memory" $kind) }}
   resources:

diff --git a/openstack/swift/templates/etc/_account-server.conf.tpl b/openstack/swift/templates/etc/_account-server.conf.tpl
@@ -20,9 +20,6 @@ log_level = DEBUG
 {{- else -}}
 log_level = INFO
 {{- end }}
-{{- if .Values.sentry.enabled }}
-log_custom_handlers = swift_sentry.sentry_logger
-{{- end }}
 
 fallocate_reserve = {{ .Values.fallocate_reserve }}
 

diff --git a/openstack/swift/templates/etc/_container-server.conf.tpl b/openstack/swift/templates/etc/_container-server.conf.tpl
@@ -20,9 +20,6 @@ log_level = DEBUG
 {{- else -}}
 log_level = INFO
 {{- end }}
-{{- if .Values.sentry.enabled }}
-log_custom_handlers = swift_sentry.sentry_logger
-{{- end }}
 
 fallocate_reserve = {{ .Values.fallocate_reserve }}
 

diff --git a/openstack/swift/templates/etc/_object-expirer.conf.tpl b/openstack/swift/templates/etc/_object-expirer.conf.tpl
@@ -4,9 +4,6 @@ log_level = DEBUG
 {{- else -}}
 log_level = INFO
 {{- end }}
-{{- if .Values.sentry.enabled }}
-log_custom_handlers = swift_sentry.sentry_logger
-{{- end }}
 
 [object-expirer]
 concurrency = {{ .Values.object_expirer_concurrency }}

diff --git a/openstack/swift/templates/etc/_object-server.conf.tpl b/openstack/swift/templates/etc/_object-server.conf.tpl
@@ -24,9 +24,6 @@ log_level = DEBUG
 {{- else -}}
 log_level = INFO
 {{- end }}
-{{- if .Values.sentry.enabled }}
-log_custom_handlers = swift_sentry.sentry_logger
-{{- end }}
 
 fallocate_reserve = {{ .Values.fallocate_reserve }}
 

diff --git a/openstack/swift/templates/etc/_proxy-server.conf.tpl b/openstack/swift/templates/etc/_proxy-server.conf.tpl
@@ -22,9 +22,6 @@ log_level = DEBUG
 {{- else -}}
 log_level = INFO
 {{- end }}
-{{- if $context.sentry.enabled }}
-log_custom_handlers = swift_sentry.sentry_logger
-{{- end }}
 
 [pipeline:main]
 # Rocky or higher pipeline

diff --git a/openstack/swift/templates/object-expirer-deployment.yaml b/openstack/swift/templates/object-expirer-deployment.yaml
@@ -61,13 +61,6 @@ spec:
                 secretKeyRef:
                   name: swift-secret
                   key: hash_path_suffix
-            {{- if $.Values.sentry.enabled }}
-            - name: SENTRY_DSN
-              valueFrom:
-                secretKeyRef:
-                  name: sentry
-                  key: swift.DSN.public
-            {{- end }}
           resources:
             # observed usage: CPU = 1m-300m, RAM = 50-180 MiB
             requests:

diff --git a/openstack/swift/templates/sentry.yaml b/openstack/swift/templates/sentry.yaml
diff --git a/openstack/swift/values.yaml b/openstack/swift/values.yaml
@@ -91,9 +91,6 @@ memcached_servers:
   - memcached
 #  - memcached-tokens
 
-sentry:
-  enabled: false
-
 # Deploy Swift Prometheus alerts.
 alerts:
   enabled: true