From 91e8fffbe1a015ad918c43b04f476e807829edea Mon Sep 17 00:00:00 2001
From: Nawaz Dhandala <hello@nawazdhandala.com>
Date: Tue, 13 Jan 2026 22:20:43 +0000
Subject: [PATCH] feat: Add Inbound Email configuration for Incoming Email
 Monitor feature

---
 HelmChart/Public/oneuptime/templates/_helpers.tpl |  6 ++++++
 HelmChart/Public/oneuptime/values.yaml            | 12 ++++++++++++
 config.example.env                                | 11 ++++++++++-
 docker-compose.base.yml                           |  5 +++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl
index 12ecfd2582..f01da64d14 100644
--- a/HelmChart/Public/oneuptime/templates/_helpers.tpl
+++ b/HelmChart/Public/oneuptime/templates/_helpers.tpl
@@ -97,6 +97,12 @@ Usage:
   value: {{ $.Values.vapid.publicKey }}
 - name: VAPID_SUBJECT
   value: {{ $.Values.vapid.subject }}
+- name: INBOUND_EMAIL_PROVIDER
+  value: {{ default "SendGrid" $.Values.inboundEmail.provider | quote }}
+- name: INBOUND_EMAIL_DOMAIN
+  value: {{ default "" $.Values.inboundEmail.domain | quote }}
+- name: INBOUND_EMAIL_WEBHOOK_SECRET
+  value: {{ default "" $.Values.inboundEmail.webhookSecret | quote }}
 - name: SERVER_ACCOUNTS_HOSTNAME
   value: {{ $.Release.Name }}-accounts.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
 - name: SERVER_SERVER_MONITOR_INGEST_HOSTNAME
diff --git a/HelmChart/Public/oneuptime/values.yaml b/HelmChart/Public/oneuptime/values.yaml
index 67351f73cb..61d34b08f3 100644
--- a/HelmChart/Public/oneuptime/values.yaml
+++ b/HelmChart/Public/oneuptime/values.yaml
@@ -861,5 +861,17 @@ gitHubApp:
   privateKey:
   webhookSecret:
 
+# Inbound Email Configuration
+# Required for Incoming Email Monitor feature
+# See documentation: https://oneuptime.com/docs/self-hosted/sendgrid-inbound-email
+inboundEmail:
+  # Email provider type (currently only SendGrid is supported)
+  provider: SendGrid
+  # The domain configured for inbound email (e.g., inbound.yourdomain.com)
+  # Required for the Incoming Email Monitor feature to work
+  domain:
+  # Optional webhook secret for validating incoming webhooks from the email provider
+  webhookSecret:
+
 keda:
   enabled: true
diff --git a/config.example.env b/config.example.env
index 7eb6134535..e391f37050 100644
--- a/config.example.env
+++ b/config.example.env
@@ -364,4 +364,13 @@ GITHUB_APP_NAME=
 GITHUB_APP_CLIENT_ID=
 GITHUB_APP_CLIENT_SECRET=
 GITHUB_APP_PRIVATE_KEY=
-GITHUB_APP_WEBHOOK_SECRET=
\ No newline at end of file
+GITHUB_APP_WEBHOOK_SECRET=
+
+# Inbound Email Configuration
+# Required for Incoming Email Monitor feature
+# See documentation: https://oneuptime.com/docs/self-hosted/sendgrid-inbound-email
+INBOUND_EMAIL_PROVIDER=SendGrid
+# The domain configured for inbound email (e.g., inbound.yourdomain.com)
+INBOUND_EMAIL_DOMAIN=
+# Optional webhook secret for validating incoming webhooks
+INBOUND_EMAIL_WEBHOOK_SECRET=
\ No newline at end of file
diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index 48b5b22994..837f5e442b 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -148,6 +148,11 @@ x-common-runtime-variables: &common-runtime-variables
     GITHUB_APP_PRIVATE_KEY: ${GITHUB_APP_PRIVATE_KEY}
     GITHUB_APP_WEBHOOK_SECRET: ${GITHUB_APP_WEBHOOK_SECRET}
 
+    # Inbound Email Configuration (for Incoming Email Monitor)
+    INBOUND_EMAIL_PROVIDER: ${INBOUND_EMAIL_PROVIDER}
+    INBOUND_EMAIL_DOMAIN: ${INBOUND_EMAIL_DOMAIN}
+    INBOUND_EMAIL_WEBHOOK_SECRET: ${INBOUND_EMAIL_WEBHOOK_SECRET}
+
 services: