diff --git a/applications/mobu/README.md b/applications/mobu/README.md index 9d38885ed0..dea54853b6 100644 --- a/applications/mobu/README.md +++ b/applications/mobu/README.md @@ -25,6 +25,8 @@ Continuous integration testing | config.metrics.schemaManager.suffix | string | `""` | Suffix to add to all registered subjects. This is sometimes useful for experimentation during development. | | config.pathPrefix | string | `"/mobu"` | Prefix for mobu's API routes. | | config.profile | string | `"production"` | One of 'production' or 'development'. 'production' configures structured JSON logging, and 'development' configures unstructured human readable logging. | +| config.sentryEnvironment | string | `nil` | The environment to report to Sentry | +| config.sentryTracesSampleConfig | float | `0` | Sentry tracing config: a float to specify a percentage, or "errors" to send all transactions with errors. | | config.slackAlerts | bool | `true` | Whether to send alerts and status to Slack. | | fullnameOverride | string | `""` | Override the full name for resources (includes the release name) | | global.baseUrl | string | Set by Argo CD | Base URL for the environment | diff --git a/applications/mobu/secrets.yaml b/applications/mobu/secrets.yaml index c9257c8e5a..92e1b15e18 100644 --- a/applications/mobu/secrets.yaml +++ b/applications/mobu/secrets.yaml @@ -68,3 +68,10 @@ github-refresh-app-webhook-secret: This value is also configured in the GitHub UI for the matching GitHub application. If we need to change this value, the Phalanx secret must be updated, and the value must be changed in the GitHub UI. + +sentry-dsn: + description: >- + The Sentry DSN for the mobu 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/mobu/keys/ diff --git a/applications/mobu/templates/deployment.yaml b/applications/mobu/templates/deployment.yaml index bbc6df1ca4..85b8670a32 100644 --- a/applications/mobu/templates/deployment.yaml +++ b/applications/mobu/templates/deployment.yaml @@ -40,6 +40,13 @@ spec: secretKeyRef: name: {{ template "mobu.fullname" . }}-gafaelfawr-token key: "token" + - name: "MOBU_SENTRY_ENVIRONMENT" + value: {{ .Values.global.environmentName }} + - name: "MOBU_SENTRY_DSN" + valueFrom: + secretKeyRef: + name: {{ template "mobu.fullname" . }}-secret + key: "sentry-dsn" {{- if .Values.config.githubRefreshApp }} - name: "MOBU_GITHUB_REFRESH_APP_WEBHOOK_SECRET" valueFrom: diff --git a/applications/mobu/tests/github_ci_app_enabled_test.yaml b/applications/mobu/tests/github_ci_app_enabled_test.yaml index 71d655b111..e2fc066186 100644 --- a/applications/mobu/tests/github_ci_app_enabled_test.yaml +++ b/applications/mobu/tests/github_ci_app_enabled_test.yaml @@ -75,4 +75,6 @@ tests: suffix: "" pathPrefix: /mobu profile: production + sentryEnvironment: null + sentryTracesSampleConfig: 0 slackAlerts: true diff --git a/applications/mobu/tests/github_disabled_test.yaml b/applications/mobu/tests/github_disabled_test.yaml index e93b49a2f4..fc4c7f7fc5 100644 --- a/applications/mobu/tests/github_disabled_test.yaml +++ b/applications/mobu/tests/github_disabled_test.yaml @@ -28,6 +28,8 @@ tests: suffix: "" pathPrefix: /mobu profile: production + sentryEnvironment: null + sentryTracesSampleConfig: 0 slackAlerts: true - it: "Should not inject GitHub CI app secrets into the Deployment env" template: "deployment.yaml" diff --git a/applications/mobu/tests/github_refresh_app_enabled_test.yaml b/applications/mobu/tests/github_refresh_app_enabled_test.yaml index 4ca3ae67a2..7b8887a112 100644 --- a/applications/mobu/tests/github_refresh_app_enabled_test.yaml +++ b/applications/mobu/tests/github_refresh_app_enabled_test.yaml @@ -53,4 +53,6 @@ tests: suffix: "" pathPrefix: /mobu profile: production + sentryEnvironment: null + sentryTracesSampleConfig: 0 slackAlerts: true diff --git a/applications/mobu/values-idfdev.yaml b/applications/mobu/values-idfdev.yaml index 9d242e4c9c..88a151d0bc 100644 --- a/applications/mobu/values-idfdev.yaml +++ b/applications/mobu/values-idfdev.yaml @@ -6,6 +6,7 @@ config: profile: development metrics: enabled: true + sentryTracesSampleConfig: errors githubRefreshApp: acceptedGithubOrgs: - lsst-sqre diff --git a/applications/mobu/values.yaml b/applications/mobu/values.yaml index af1056d436..00813bb845 100644 --- a/applications/mobu/values.yaml +++ b/applications/mobu/values.yaml @@ -43,6 +43,13 @@ config: # @default -- disabled. githubCiApp: null + # -- The environment to report to Sentry + sentryEnvironment: null + + # -- Sentry tracing config: a float to specify a percentage, or "errors" to + # send all transactions with errors. + sentryTracesSampleConfig: 0.0 + # -- Log level. Set to 'DEBUG' to include the output from all flocks in the # main mobu log. logLevel: INFO diff --git a/environments/templates/applications/infrastructure/mobu.yaml b/environments/templates/applications/infrastructure/mobu.yaml index cdcd785b4e..ab4c5804a4 100644 --- a/environments/templates/applications/infrastructure/mobu.yaml +++ b/environments/templates/applications/infrastructure/mobu.yaml @@ -28,6 +28,8 @@ spec: value: "https://{{ .Values.fqdn }}" - name: "global.vaultSecretsPath" value: {{ .Values.vaultPathPrefix | quote }} + - name: "global.environmentName" + value: {{ .Values.name | quote }} valueFiles: - "values.yaml" - "values-{{ .Values.name }}.yaml"