Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Swift] Remove sentry #2515

Merged
merged 1 commit into from May 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions openstack/swift/templates/_utils.tpl
Expand Up @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions openstack/swift/templates/etc/_account-server.conf.tpl
Expand Up @@ -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 }}

Expand Down
3 changes: 0 additions & 3 deletions openstack/swift/templates/etc/_container-server.conf.tpl
Expand Up @@ -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 }}

Expand Down
3 changes: 0 additions & 3 deletions openstack/swift/templates/etc/_object-expirer.conf.tpl
Expand Up @@ -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 }}
Expand Down
3 changes: 0 additions & 3 deletions openstack/swift/templates/etc/_object-server.conf.tpl
Expand Up @@ -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 }}

Expand Down
3 changes: 0 additions & 3 deletions openstack/swift/templates/etc/_proxy-server.conf.tpl
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions openstack/swift/templates/object-expirer-deployment.yaml
Expand Up @@ -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:
Expand Down
10 changes: 0 additions & 10 deletions openstack/swift/templates/sentry.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions openstack/swift/values.yaml
Expand Up @@ -91,9 +91,6 @@ memcached_servers:
- memcached
# - memcached-tokens

sentry:
enabled: false

# Deploy Swift Prometheus alerts.
alerts:
enabled: true
Expand Down