DM-48476: times-square Sentry

Support for lsst-sqre/times-square#90
lsst-sqre · Jan 17, 2025 · 5b2689c · 5b2689c
1 parent 7a733de
commit 5b2689c
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 2 deletions.
diff --git a/applications/times-square/README.md b/applications/times-square/README.md
@@ -34,10 +34,12 @@ An API service for managing and rendering parameterized Jupyter notebooks.
 | config.profile | string | `"production"` | Run profile: "production" or "development" |
 | config.redisCacheUrl | string | Points to embedded Redis | URL for Redis html / noteburst job cache database |
 | config.redisQueueUrl | string | Points to embedded Redis | URL for Redis arq queue database |
+| config.sentryTracesSampleRate | float | `0` |  |
 | config.updateSchema | bool | false to disable schema upgrades | Whether to run the database migration job |
 | config.worker.enableLivenessCheck | bool | `true` | Enable liveness checks for the arq queue |
 | fullnameOverride | string | `""` | Override the full name for resources (includes the release name) |
 | global.baseUrl | string | Set by times-square Argo CD Application | Base URL for the environment |
+| global.enviromentName | string | Set by times-square Argo CD Application | Name of enviroment |
 | global.host | string | Set by times-square Argo CD Application | Host name for ingress |
 | global.vaultSecretsPathPrefix | string | Set by times-square Argo CD Application | Base path for Vault secrets |
 | image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the times-square image |

diff --git a/applications/times-square/secrets.yaml b/applications/times-square/secrets.yaml
@@ -16,3 +16,8 @@ TS_SLACK_WEBHOOK_URL:
   copy:
     application: mobu
     key: app-alert-webhook
+TS_SENTRY_DSN:
+  description: >-
+    The Sentry DSN for the the times-square Sentry project.
+    This is a URL that includes an authentication token that tells the Sentry SDK where to send events.
+    It can be found here: https://rubin-observatory.sentry.io/settings/projects/times-square/keys/
diff --git a/applications/times-square/templates/configmap.yaml b/applications/times-square/templates/configmap.yaml
@@ -9,6 +9,7 @@ data:
   SAFIR_PROFILE: {{ .Values.config.profile | quote }}
   SAFIR_LOG_LEVEL: {{ .Values.config.logLevel | quote }}
   TS_ENVIRONMENT_URL: {{ .Values.global.baseUrl | quote }}
+  TS_ENVIRONMENT_NAME: {{ .Values.global.environmentName | quote }}
   TS_PATH_PREFIX: {{ .Values.ingress.path }}
   TS_DATABASE_URL: {{ required "config.databaseUrl must be set" .Values.config.databaseUrl | quote }}
   TS_REDIS_URL: {{ required "config.redisCacheUrl must be set" .Values.config.redisCacheUrl | quote }}
@@ -18,3 +19,4 @@ data:
   TS_GITHUB_ORGS: {{ .Values.config.githubOrgs | quote }}
   TS_CHECK_RUN_TIMEOUT: {{ .Values.config.githubCheckRunTimeout | quote }}
   TS_DEFAULT_EXECUTION_TIMEOUT: {{ .Values.config.defaultExecutionTimeout | quote }}
+  TS_SENTRY_TRACES_SAMPLE_RATE: {{ .Values.config.sentryTracesSampleRate | quote }}
diff --git a/applications/times-square/templates/deployment.yaml b/applications/times-square/templates/deployment.yaml
@@ -79,11 +79,11 @@ spec:
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: /
+              path: /healthcheck
               port: http
           readinessProbe:
             httpGet:
-              path: /
+              path: /healthcheck
               port: http
           resources:
             {{- toYaml .Values.resources.timesSquare | nindent 12 }}
@@ -121,6 +121,11 @@ spec:
                 secretKeyRef:
                   name: {{ template "times-square.fullname" . }}-secret
                   key: "TS_SLACK_WEBHOOK_URL"
+            - name: "TS_SENTRY_DSN"
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "times-square.fullname" . }}-secret
+                  key: "TS_SENTRY_DSN"
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/applications/times-square/templates/worker-deployment.yaml b/applications/times-square/templates/worker-deployment.yaml
@@ -102,6 +102,11 @@ spec:
                 secretKeyRef:
                   name: {{ template "times-square.fullname" . }}-secret
                   key: "TS_SLACK_WEBHOOK_URL"
+            - name: "TS_SENTRY_DSN"
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "times-square.fullname" . }}-secret
+                  key: "TS_SENTRY_DSN"
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/applications/times-square/values-idfdev.yaml b/applications/times-square/values-idfdev.yaml
@@ -10,6 +10,7 @@ config:
   enableGitHubApp: "True"
   githubCheckRunTimeout: "600" # 10 minutes
   defaultExecutionTimeout: "60" # 1 minute
+  sentryTracesSampleRate: 1.0
 cloudsql:
   enabled: true
   instanceConnectionName: "science-platform-dev-7696:us-central1:science-platform-dev-e9e11de2"

diff --git a/applications/times-square/values.yaml b/applications/times-square/values.yaml
@@ -146,6 +146,9 @@ config:
   # -- Default execution timeout for notebooks in seconds
   defaultExecutionTimeout: "300" # 5 minutes
 
+  # Sentry tracing sample rate
+  sentryTracesSampleRate: 0.0
+
   worker:
     # -- Enable liveness checks for the arq queue
     enableLivenessCheck: true
@@ -229,6 +232,10 @@ global:
   # @default -- Set by times-square Argo CD Application
   baseUrl: ""
 
+  # -- Name of enviroment
+  # @default -- Set by times-square Argo CD Application
+  enviromentName: ""
+
   # -- Host name for ingress
   # @default -- Set by times-square Argo CD Application
   host: ""

diff --git a/environments/templates/applications/rsp/times-square.yaml b/environments/templates/applications/rsp/times-square.yaml
@@ -28,6 +28,8 @@ spec:
           value: "https://{{ .Values.fqdn }}"
         - name: "global.vaultSecretsPathPrefix"
           value: {{ .Values.vaultPathPrefix | quote }}
+        - name: "global.environmentName"
+          value: {{ .Values.name | quote }}
       valueFiles:
         - "values.yaml"
         - "values-{{ .Values.name }}.yaml"