[neutron] add support for enabling sentry_sdk

This change adds a new environment variable in neutron deployments to enable using the sentry_sdk for logging. Needs updated logging config and new images. Co-authored-by: Sven Rosenzweig <[email protected]>
sapcc · Nov 5, 2024 · 118f23f · 118f23f
1 parent 3a76163
commit 118f23f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 0 deletions.
diff --git a/openstack/neutron/templates/deployment-aci-agent.yaml b/openstack/neutron/templates/deployment-aci-agent.yaml
@@ -52,6 +52,8 @@ spec:
           env:
             - name: DEBUG_CONTAINER
               value: "false"
+            - name: SENTRY_USE_SDK
+              value: "{{$.Values.global.neutron_use_sentry_sdk | default false }}"
             - name: SENTRY_DSN
               valueFrom:
                 secretKeyRef:

diff --git a/openstack/neutron/templates/deployment-cc-fabric-agent.yaml b/openstack/neutron/templates/deployment-cc-fabric-agent.yaml
@@ -64,6 +64,8 @@ spec:
           resources:
 {{ toYaml $.Values.pod.resources.cc_fabric_agent | indent 12 }}
           env:
+            - name: SENTRY_USE_SDK
+              value: "{{$.Values.global.neutron_use_sentry_sdk | default false }}"
             - name: SENTRY_DSN
               valueFrom:
                 secretKeyRef:

diff --git a/openstack/neutron/templates/deployment-ironic-agent.yaml b/openstack/neutron/templates/deployment-ironic-agent.yaml
@@ -42,6 +42,8 @@ spec:
             periodSeconds: 30
             timeoutSeconds: 10
           env:
+            - name: SENTRY_USE_SDK
+              value: "{{$.Values.global.neutron_use_sentry_sdk | default false }}"
             - name: SENTRY_DSN
               valueFrom:
                 secretKeyRef:

diff --git a/openstack/neutron/templates/deployment-rpc-server.yaml b/openstack/neutron/templates/deployment-rpc-server.yaml
@@ -67,6 +67,8 @@ spec:
               value: "9125"
             - name: STATSD_PREFIX
               value: "openstack"
+            - name: SENTRY_USE_SDK
+              value: "{{$.Values.global.neutron_use_sentry_sdk | default false }}"
             - name: SENTRY_DSN
               valueFrom:
                 secretKeyRef:

diff --git a/openstack/neutron/templates/deployment-server.yaml b/openstack/neutron/templates/deployment-server.yaml
@@ -102,6 +102,8 @@ spec:
               value: "9125"
             - name: STATSD_PREFIX
               value: "openstack"
+            - name: SENTRY_USE_SDK
+              value: "{{$.Values.global.neutron_use_sentry_sdk | default false }}"
             - name: SENTRY_DSN
               valueFrom:
                 secretKeyRef:

diff --git a/openstack/neutron/templates/statefulset-network-agent-apod.yaml b/openstack/neutron/templates/statefulset-network-agent-apod.yaml
@@ -99,6 +99,8 @@ spec:
           imagePullPolicy: IfNotPresent
           command: ["dumb-init", "neutron-dhcp-agent", "--config-file", "/etc/neutron/neutron.conf", "--config-dir", "/etc/neutron/secrets", "--config-file", "/etc/neutron/dhcp-agent.ini", "--config-file", "/etc/neutron/linux-bridge.ini", "--config-file", "/etc/neutron/az-{{ $az }}.conf"]
           env:
+            - name: SENTRY_USE_SDK
+              value: "{{$.Values.global.neutron_use_sentry_sdk | default false }}"
             - name: SENTRY_DSN
               valueFrom:
                 secretKeyRef:
@@ -143,6 +145,8 @@ spec:
           imagePullPolicy: IfNotPresent
           command: ["dumb-init", "neutron-linuxbridge-agent", "--config-file", "/etc/neutron/neutron.conf", "--config-dir", "/etc/neutron/secrets", "--config-file", "/etc/neutron/plugins/ml2/ml2_conf.ini", "--config-file", "/etc/neutron/linux-bridge.ini", "--config-file", "/etc/neutron/apod-{{ $apod }}.conf"]
           env:
+            - name: SENTRY_USE_SDK
+              value: "{{$.Values.global.neutron_use_sentry_sdk | default false }}"
             - name: SENTRY_DSN
               valueFrom:
                 secretKeyRef:
@@ -188,6 +192,8 @@ spec:
           imagePullPolicy: IfNotPresent
           command: ["dumb-init", "neutron-metadata-agent", "--config-file", "/etc/neutron/neutron.conf", "--config-dir", "/etc/neutron/secrets","--config-file", "/etc/neutron/metadata-agent.ini"]
           env:
+            - name: SENTRY_USE_SDK
+              value: "{{$.Values.global.neutron_use_sentry_sdk | default false }}"
             - name: SENTRY_DSN
               valueFrom:
                 secretKeyRef:

diff --git a/openstack/neutron/templates/statefulset-network-agent.yaml b/openstack/neutron/templates/statefulset-network-agent.yaml
@@ -90,6 +90,8 @@ spec:
           imagePullPolicy: IfNotPresent
           command: ["dumb-init", "neutron-dhcp-agent", "--config-file", "/etc/neutron/neutron.conf", "--config-dir", "/etc/neutron/secrets", "--config-file", "/etc/neutron/dhcp-agent.ini", "--config-file", "/etc/neutron/linux-bridge.ini", "--config-file", "/etc/neutron/az-{{ $az }}.conf"]
           env:
+            - name: SENTRY_USE_SDK
+              value: "{{$.Values.global.neutron_use_sentry_sdk | default false }}"
             - name: SENTRY_DSN
               valueFrom:
                 secretKeyRef:

diff --git a/openstack/neutron/values.yaml b/openstack/neutron/values.yaml
@@ -18,6 +18,7 @@ global:
   domain_seeds:
     skip_hcm_domain: false
   linkerd_requested: false
+  neutron_use_sentry_sdk: false
 
 api_workers: 12
 rpc_workers: 5