Skip to content

scheduler services: Use the global value for .sentry.environment

Nicolas Dandrimont requested to merge mr/scheduler-services-sentry-environment into production

The one we were trying to pull is not set, so the envvar is empty and events get mixed up.

Helm diff output: 
$ ./helm-diff.sh swh
[swh] Comparing changes between branches production and mr/scheduler-services-sentry-environment...
Switched to branch 'production'
Your branch is up to date with 'origin/production'.
[swh] Generate config in production branch for swh/values/default.yaml...
[swh] Generate config in production branch for swh/values/minikube.yaml...
[swh] Generate config in production branch for swh/values/production.yaml...
[swh] Generate config in production branch for swh/values/production-cassandra.yaml...
[swh] Generate config in production branch for swh/values/staging.yaml...
[swh] Generate config in production branch for swh/values/staging-cassandra.yaml...
Switched to branch 'mr/scheduler-services-sentry-environment'
[swh] Generate config in mr/scheduler-services-sentry-environment branch for swh/values/default.yaml...
[swh] Generate config in mr/scheduler-services-sentry-environment branch for swh/values/minikube.yaml...
[swh] Generate config in mr/scheduler-services-sentry-environment branch for swh/values/production.yaml...
[swh] Generate config in mr/scheduler-services-sentry-environment branch for swh/values/production-cassandra.yaml...
[swh] Generate config in mr/scheduler-services-sentry-environment branch for swh/values/staging.yaml...
[swh] Generate config in mr/scheduler-services-sentry-environment branch for swh/values/staging-cassandra.yaml...


------------- diff for swh/values/default.yaml -------------

No differences


------------- diff for swh/values/minikube.yaml -------------

No differences


------------- diff for swh/values/production.yaml -------------

--- /tmp/swh-chart.swh.L1LH4f8l/production.yaml.before	2023-09-28 11:47:12.595562732 +0200
+++ /tmp/swh-chart.swh.L1LH4f8l/production.yaml.after	2023-09-28 11:47:13.031566288 +0200
@@ -13470,21 +13470,21 @@
           env:
             - name: STATSD_HOST
               value: "prometheus-statsd-exporter"
             - name: STATSD_PORT
               value: "9125"
             - name: SWH_CONFIG_FILENAME
               value: /etc/swh/config.yml
             - name: LOG_LEVEL
               value: "INFO"
             - name: SWH_SENTRY_ENVIRONMENT
-              value: 
+              value: production
             - name: SWH_MAIN_PACKAGE
               value: swh.scheduler
             - name: SWH_SENTRY_DSN
               valueFrom:
                 secretKeyRef:
                   name: scheduler-sentry-secrets
                   key: sentry-dsn
                   # if the setting doesn't exist, sentry issue pushes will be disabled
                   optional: false
             - name: SWH_SENTRY_DISABLE_LOGGING_EVENTS
@@ -13590,21 +13590,21 @@
           env:
             - name: STATSD_HOST
               value: "prometheus-statsd-exporter"
             - name: STATSD_PORT
               value: "9125"
             - name: SWH_CONFIG_FILENAME
               value: /etc/swh/config.yml
             - name: LOG_LEVEL
               value: "INFO"
             - name: SWH_SENTRY_ENVIRONMENT
-              value: 
+              value: production
             - name: SWH_MAIN_PACKAGE
               value: swh.scheduler
             - name: SWH_SENTRY_DSN
               valueFrom:
                 secretKeyRef:
                   name: scheduler-sentry-secrets
                   key: sentry-dsn
                   # if the setting doesn't exist, sentry issue pushes will be disabled
                   optional: false
             - name: SWH_SENTRY_DISABLE_LOGGING_EVENTS
@@ -13729,21 +13729,21 @@
           env:
             - name: STATSD_HOST
               value: "prometheus-statsd-exporter"
             - name: STATSD_PORT
               value: "9125"
             - name: SWH_CONFIG_FILENAME
               value: /etc/swh/config.yml
             - name: LOG_LEVEL
               value: "INFO"
             - name: SWH_SENTRY_ENVIRONMENT
-              value: 
+              value: production
             - name: SWH_MAIN_PACKAGE
               value: swh.scheduler
             - name: SWH_SENTRY_DSN
               valueFrom:
                 secretKeyRef:
                   name: scheduler-sentry-secrets
                   key: sentry-dsn
                   # if the setting doesn't exist, sentry issue pushes will be disabled
                   optional: false
             - name: SWH_SENTRY_DISABLE_LOGGING_EVENTS


------------- diff for swh/values/production-cassandra.yaml -------------

No differences


------------- diff for swh/values/staging.yaml -------------

--- /tmp/swh-chart.swh.L1LH4f8l/staging.yaml.before	2023-09-28 11:47:12.755564036 +0200
+++ /tmp/swh-chart.swh.L1LH4f8l/staging.yaml.after	2023-09-28 11:47:13.179567501 +0200
@@ -8837,21 +8837,21 @@
           env:
             - name: STATSD_HOST
               value: "prometheus-statsd-exporter"
             - name: STATSD_PORT
               value: "9125"
             - name: SWH_CONFIG_FILENAME
               value: /etc/swh/config.yml
             - name: LOG_LEVEL
               value: "INFO"
             - name: SWH_SENTRY_ENVIRONMENT
-              value: 
+              value: staging
             - name: SWH_MAIN_PACKAGE
               value: swh.scheduler
             - name: SWH_SENTRY_DSN
               valueFrom:
                 secretKeyRef:
                   name: scheduler-sentry-secrets
                   key: sentry-dsn
                   # if the setting doesn't exist, sentry issue pushes will be disabled
                   optional: false
             - name: SWH_SENTRY_DISABLE_LOGGING_EVENTS
@@ -8961,21 +8961,21 @@
           env:
             - name: STATSD_HOST
               value: "prometheus-statsd-exporter"
             - name: STATSD_PORT
               value: "9125"
             - name: SWH_CONFIG_FILENAME
               value: /etc/swh/config.yml
             - name: LOG_LEVEL
               value: "INFO"
             - name: SWH_SENTRY_ENVIRONMENT
-              value: 
+              value: staging
             - name: SWH_MAIN_PACKAGE
               value: swh.scheduler
             - name: SWH_SENTRY_DSN
               valueFrom:
                 secretKeyRef:
                   name: scheduler-sentry-secrets
                   key: sentry-dsn
                   # if the setting doesn't exist, sentry issue pushes will be disabled
                   optional: false
             - name: SWH_SENTRY_DISABLE_LOGGING_EVENTS
@@ -9104,21 +9104,21 @@
           env:
             - name: STATSD_HOST
               value: "prometheus-statsd-exporter"
             - name: STATSD_PORT
               value: "9125"
             - name: SWH_CONFIG_FILENAME
               value: /etc/swh/config.yml
             - name: LOG_LEVEL
               value: "INFO"
             - name: SWH_SENTRY_ENVIRONMENT
-              value: 
+              value: staging
             - name: SWH_MAIN_PACKAGE
               value: swh.scheduler
             - name: SWH_SENTRY_DSN
               valueFrom:
                 secretKeyRef:
                   name: scheduler-sentry-secrets
                   key: sentry-dsn
                   # if the setting doesn't exist, sentry issue pushes will be disabled
                   optional: false
             - name: SWH_SENTRY_DISABLE_LOGGING_EVENTS


------------- diff for swh/values/staging-cassandra.yaml -------------

No differences

Merge request reports