diff --git a/src/sentry/uptime/migrations/0008_uptime_url_suffix.py b/src/sentry/uptime/migrations/0008_uptime_url_suffix.py index cbd42a0d41728..f1ea789154cca 100644 --- a/src/sentry/uptime/migrations/0008_uptime_url_suffix.py +++ b/src/sentry/uptime/migrations/0008_uptime_url_suffix.py @@ -38,10 +38,28 @@ class Migration(CheckedMigration): ), migrations.RunSQL( """ - ALTER TABLE "uptime_uptimesubscription" ADD COLUMN "url_suffix" character varying(255) NOT NULL DEFAULT ''; + ALTER TABLE "uptime_uptimesubscription" ADD COLUMN "url_domain_suffix" character varying(255) NOT NULL DEFAULT ''; """, reverse_sql=""" - ALTER TABLE "uptime_uptimesubscription" DROP COLUMN "url_suffix"; + ALTER TABLE "uptime_uptimesubscription" DROP COLUMN "url_domain_suffix"; + """, + hints={"tables": ["uptime_uptimesubscription"]}, + ), + migrations.RunSQL( + """ + ALTER TABLE "uptime_uptimesubscription" ADD COLUMN "host_whois_orgname" character varying(255) NOT NULL DEFAULT ''; + """, + reverse_sql=""" + ALTER TABLE "uptime_uptimesubscription" DROP COLUMN "host_whois_orgname"; + """, + hints={"tables": ["uptime_uptimesubscription"]}, + ), + migrations.RunSQL( + """ + ALTER TABLE "uptime_uptimesubscription" ADD COLUMN "host_whois_orgid" character varying(255) NOT NULL DEFAULT ''; + """, + reverse_sql=""" + ALTER TABLE "uptime_uptimesubscription" DROP COLUMN "host_whois_orgid"; """, hints={"tables": ["uptime_uptimesubscription"]}, ), @@ -54,7 +72,17 @@ class Migration(CheckedMigration): ), migrations.AddField( model_name="uptimesubscription", - name="url_suffix", + name="url_domain_suffix", + field=models.CharField(db_index=True, default="", max_length=255), + ), + migrations.AddField( + model_name="uptimesubscription", + name="host_whois_orgname", + field=models.CharField(db_index=True, default="", max_length=255), + ), + migrations.AddField( + model_name="uptimesubscription", + name="host_whois_orgid", field=models.CharField(db_index=True, default="", max_length=255), ), ], diff --git a/src/sentry/uptime/models.py b/src/sentry/uptime/models.py index 5279d26b60609..62de7baaa4375 100644 --- a/src/sentry/uptime/models.py +++ b/src/sentry/uptime/models.py @@ -26,8 +26,13 @@ class UptimeSubscription(BaseRemoteSubscription, DefaultFieldsModel): url = models.CharField(max_length=255) # The domain of the url, extracted via TLDExtract url_domain = models.CharField(max_length=255, db_index=True, default="") - # The suffix of the url, extracted via TLDExtract - url_suffix = models.CharField(max_length=255, db_index=True, default="") + # The suffix of the url, extracted via TLDExtract. This can be a public suffix, such as .com, .gov.uk, .com.au, or + # a private suffix, such as vercel.dev + url_domain_suffix = models.CharField(max_length=255, db_index=True, default="") + # Org name of the host of the url + host_whois_orgname = models.CharField(max_length=255, db_index=True, default="") + # Org id of the host of the url + host_whois_orgid = models.CharField(max_length=255, db_index=True, default="") # How frequently to run the check in seconds interval_seconds = models.IntegerField() # How long to wait for a response from the url before we assume a timeout