From e4895d6f2e1a73b60810e7e734c7f9b33b24a6ef Mon Sep 17 00:00:00 2001 From: Falk Reimann Date: Fri, 28 May 2021 11:32:53 +0200 Subject: [PATCH] [Swift] Remove sentry Seems that the Sentry logger causes a import of requests before the monkey patch of the eventlet happens. https://github.com/eventlet/eventlet/issues/371#issuecomment-779967181 With Wallaby this seems now be an issue and causes a loop when importing the modules like here: https://github.com/eventlet/eventlet/issues/677 although it is not dnspython >= 2 related. --- openstack/swift/templates/_utils.tpl | 7 ------- openstack/swift/templates/etc/_account-server.conf.tpl | 3 --- .../swift/templates/etc/_container-server.conf.tpl | 3 --- openstack/swift/templates/etc/_object-expirer.conf.tpl | 3 --- openstack/swift/templates/etc/_object-server.conf.tpl | 3 --- openstack/swift/templates/etc/_proxy-server.conf.tpl | 3 --- .../swift/templates/object-expirer-deployment.yaml | 7 ------- openstack/swift/templates/sentry.yaml | 10 ---------- openstack/swift/values.yaml | 3 --- 9 files changed, 42 deletions(-) delete mode 100644 openstack/swift/templates/sentry.yaml diff --git a/openstack/swift/templates/_utils.tpl b/openstack/swift/templates/_utils.tpl index 2376cf217d..49e300f4f5 100644 --- 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 index edf6ff4c53..1d867f9659 100644 --- 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 index 3be58cec69..5f5abd4343 100644 --- 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 index b0f6ec2833..dbb932f756 100644 --- 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 index e38a14a6d5..242eba969d 100644 --- 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 index 8bd188432f..eb2a68f97c 100644 --- 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 index 237d9eea4c..dade74f764 100644 --- 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 deleted file mode 100644 index a8d764524d..0000000000 --- a/openstack/swift/templates/sentry.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{{- if .Values.sentry.enabled }} -apiVersion: "sentry.sap.cc/v1" -kind: "SentryProject" -metadata: - name: swift-sentry - -spec: - name: swift # slug of the project you want to use - team: openstack # slug of the team where the project should be created (if it doesn't exist) -{{- end }} diff --git a/openstack/swift/values.yaml b/openstack/swift/values.yaml index 37ea111146..269696e0a1 100644 --- 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