Skip to content

Open-source status page, incident response and uptime monitoring

๐ŸŒ koyeb (#1404)

Thibault Le Ouayfc7b170ce32a
diff --git a/apps/checker/cmd/main.go b/apps/checker/cmd/main.go
index 497f6fbfa..5e46489d3 100644
--- a/apps/checker/cmd/main.go
+++ b/apps/checker/cmd/main.go
@@ -31,15 +31,26 @@ func main() {
}()
// environment variables.
- flyRegion := env("FLY_REGION", env("REGION", "local"))
+ var region string
cronSecret := env("CRON_SECRET", "")
tinyBirdToken := env("TINYBIRD_TOKEN", "")
logLevel := env("LOG_LEVEL", "warn")
cloudProvider := env("CLOUD_PROVIDER", "fly")
+ switch cloudProvider {
+ case "fly":
+ region = env("FLY_REGION", env("REGION", "local"))
+
+ case "koyeb":
+ region = fmt.Sprintf("koyeb_%s", env("KOYEB_REGION", env("REGION", "local")))
+
+ case "railway":
+ region = fmt.Sprintf("railway_%s", env("RAILWAY_REPLICA_REGION", env("REGION", "local")))
+ default:
+ log.Fatal().Msgf("unsupported cloud provider: %s", cloudProvider)
+ }
logger.Configure(logLevel)
- // packages.
httpClient := &http.Client{
Timeout: 45 * time.Second,
}
@@ -51,7 +62,7 @@ func main() {
h := &handlers.Handler{
Secret: cronSecret,
CloudProvider: cloudProvider,
- Region: flyRegion,
+ Region: region,
TbClient: tinybirdClient,
}
@@ -63,7 +74,7 @@ func main() {
router.POST("/tcp/:region", h.TCPHandlerRegion)
router.GET("/health", func(c *gin.Context) {
- c.JSON(http.StatusOK, gin.H{"message": "pong", "fly_region": flyRegion})
+ c.JSON(http.StatusOK, gin.H{"message": "pong", "region": region, "provider": cloudProvider})
})
httpServer := &http.Server{
diff --git a/apps/checker/handlers/checker.go b/apps/checker/handlers/checker.go
index fd72bdde4..f6801df5f 100644
--- a/apps/checker/handlers/checker.go
+++ b/apps/checker/handlers/checker.go
@@ -65,6 +65,7 @@ func (h Handler) HTTPCheckerHandler(c *gin.Context) {
}
}
+
var req request.HttpCheckerRequest
if err := c.ShouldBindJSON(&req); err != nil {
log.Ctx(ctx).Error().Err(err).Msg("failed to decode checker request")
diff --git a/apps/checker/handlers/tcp.go b/apps/checker/handlers/tcp.go
index d5ad60215..1954d0cf1 100644
--- a/apps/checker/handlers/tcp.go
+++ b/apps/checker/handlers/tcp.go
@@ -86,11 +86,10 @@ func (h Handler) TCPHandler(c *gin.Context) {
trigger = req.Trigger
}
-
var response checker.TCPResponse
var retry int
- if req.Retry == 0 {
+ if req.Retry == 0 {
retry = int(req.Retry)
} else {
retry = 3
@@ -123,14 +122,13 @@ func (h Handler) TCPHandler(c *gin.Context) {
break
}
-
id, err := uuid.NewV7()
if err != nil {
return fmt.Errorf("error while generating uuid %w", err)
}
data := TCPData{
- ID: id.String(),
+ ID: id.String(),
WorkspaceID: workspaceId,
Timestamp: res.TCPStart,
Error: 0,
@@ -206,7 +204,7 @@ func (h Handler) TCPHandler(c *gin.Context) {
return
}
data := TCPData{
- ID: id.String(),
+ ID: id.String(),
WorkspaceID: workspaceId,
CronTimestamp: req.CronTimestamp,
ErrorMessage: err.Error(),
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/search-params.ts b/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/search-params.ts
index 73cd4f370..8bc6264e7 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/search-params.ts
+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/logs/search-params.ts
@@ -1,5 +1,5 @@
import { PERIODS, STATUS, TRIGGER } from "@/data/metrics.client";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import { endOfDay } from "date-fns";
import { startOfDay } from "date-fns";
import {
@@ -13,9 +13,9 @@ import {
export const searchParamsParsers = {
period: parseAsStringLiteral(PERIODS).withDefault("1d"),
- regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)).withDefault(
+ regions: parseAsArrayOf(parseAsStringLiteral(monitorRegions)).withDefault(
// FIXME: readonly
- flyRegions as unknown as (typeof flyRegions)[number][],
+ monitorRegions as unknown as (typeof monitorRegions)[number][],
),
status: parseAsStringLiteral(STATUS),
trigger: parseAsStringLiteral(TRIGGER),
diff --git a/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/search-params.ts b/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/search-params.ts
index 257a0c917..0c8c92f9f 100644
--- a/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/search-params.ts
+++ b/apps/dashboard/src/app/(dashboard)/monitors/[id]/overview/search-params.ts
@@ -1,5 +1,5 @@
import { INTERVALS } from "@/data/metrics.client";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import {
createSearchParamsCache,
parseAsArrayOf,
@@ -12,9 +12,9 @@ const PERCENTILE = ["p50", "p75", "p90", "p95", "p99"] as const;
export const searchParamsParsers = {
period: parseAsStringLiteral(PERIOD).withDefault("1d"),
- regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)).withDefault(
+ regions: parseAsArrayOf(parseAsStringLiteral(monitorRegions)).withDefault(
// FIXME: readonly
- flyRegions as unknown as (typeof flyRegions)[number][],
+ monitorRegions as unknown as (typeof monitorRegions)[number][],
),
percentile: parseAsStringLiteral(PERCENTILE).withDefault("p50"),
interval: parseAsNumberLiteral(INTERVALS).withDefault(30),
diff --git a/apps/dashboard/src/components/chart/chart-area-latency.tsx b/apps/dashboard/src/components/chart/chart-area-latency.tsx
index ebe2a6b1a..55c92cb04 100644
--- a/apps/dashboard/src/components/chart/chart-area-latency.tsx
+++ b/apps/dashboard/src/components/chart/chart-area-latency.tsx
@@ -20,7 +20,7 @@ import {
} from "@/components/ui/chart";
import { type PERCENTILES, mapLatency } from "@/data/metrics.client";
import { useTRPC } from "@/lib/trpc/client";
-import type { flyRegions } from "@openstatus/db/src/schema/constants";
+import type { monitorRegions } from "@openstatus/db/src/schema/constants";
import { useQuery } from "@tanstack/react-query";
import { ChartTooltipNumber } from "./chart-tooltip-number";
@@ -46,7 +46,7 @@ export function ChartAreaLatency({
percentile: (typeof PERCENTILES)[number];
period: "1d" | "7d" | "14d";
type: "http" | "tcp";
- regions: (typeof flyRegions)[number][];
+ regions: (typeof monitorRegions)[number][];
}) {
const trpc = useTRPC();
diff --git a/apps/dashboard/src/components/chart/chart-area-timing-phases.tsx b/apps/dashboard/src/components/chart/chart-area-timing-phases.tsx
index a1d282a38..f6488d900 100644
--- a/apps/dashboard/src/components/chart/chart-area-timing-phases.tsx
+++ b/apps/dashboard/src/components/chart/chart-area-timing-phases.tsx
@@ -24,7 +24,7 @@ import {
mapTimingPhases,
} from "@/data/metrics.client";
import { useTRPC } from "@/lib/trpc/client";
-import type { flyRegions } from "@openstatus/db/src/schema/constants";
+import type { monitorRegions } from "@openstatus/db/src/schema/constants";
import { useQuery } from "@tanstack/react-query";
import {
ChartTooltipNumber,
@@ -70,7 +70,7 @@ export function ChartAreaTimingPhases({
period: "1d" | "7d" | "14d";
percentile: (typeof PERCENTILES)[number];
interval: (typeof INTERVALS)[number];
- regions: (typeof flyRegions)[number][];
+ regions: (typeof monitorRegions)[number][];
type: "http";
}) {
const trpc = useTRPC();
diff --git a/apps/dashboard/src/components/chart/chart-line-regions.tsx b/apps/dashboard/src/components/chart/chart-line-regions.tsx
index 362c79df1..3fafa43f6 100644
--- a/apps/dashboard/src/components/chart/chart-line-regions.tsx
+++ b/apps/dashboard/src/components/chart/chart-line-regions.tsx
@@ -13,45 +13,51 @@ import {
import { regionColors } from "@/data/regions";
import { useIsMobile } from "@/hooks/use-mobile";
import { cn } from "@/lib/utils";
-import { flyRegionsDict } from "@openstatus/utils";
+import { regionDict } from "@openstatus/utils";
import { ChartTooltipNumber } from "./chart-tooltip-number";
const chartConfig = {
- ams: { label: flyRegionsDict.ams.location, color: regionColors.ams },
- arn: { label: flyRegionsDict.arn.location, color: regionColors.arn },
- atl: { label: flyRegionsDict.atl.location, color: regionColors.atl },
- bog: { label: flyRegionsDict.bog.location, color: regionColors.bog },
- bom: { label: flyRegionsDict.bom.location, color: regionColors.bom },
- bos: { label: flyRegionsDict.bos.location, color: regionColors.bos },
- cdg: { label: flyRegionsDict.cdg.location, color: regionColors.cdg },
- den: { label: flyRegionsDict.den.location, color: regionColors.den },
- dfw: { label: flyRegionsDict.dfw.location, color: regionColors.dfw },
- ewr: { label: flyRegionsDict.ewr.location, color: regionColors.ewr },
- eze: { label: flyRegionsDict.eze.location, color: regionColors.eze },
- fra: { label: flyRegionsDict.fra.location, color: regionColors.fra },
- gdl: { label: flyRegionsDict.gdl.location, color: regionColors.gdl },
- gig: { label: flyRegionsDict.gig.location, color: regionColors.gig },
- gru: { label: flyRegionsDict.gru.location, color: regionColors.gru },
- hkg: { label: flyRegionsDict.hkg.location, color: regionColors.hkg },
- iad: { label: flyRegionsDict.iad.location, color: regionColors.iad },
- jnb: { label: flyRegionsDict.jnb.location, color: regionColors.jnb },
- lax: { label: flyRegionsDict.lax.location, color: regionColors.lax },
- lhr: { label: flyRegionsDict.lhr.location, color: regionColors.lhr },
- mad: { label: flyRegionsDict.mad.location, color: regionColors.mad },
- mia: { label: flyRegionsDict.mia.location, color: regionColors.mia },
- nrt: { label: flyRegionsDict.nrt.location, color: regionColors.nrt },
- ord: { label: flyRegionsDict.ord.location, color: regionColors.ord },
- otp: { label: flyRegionsDict.otp.location, color: regionColors.otp },
- phx: { label: flyRegionsDict.phx.location, color: regionColors.phx },
- qro: { label: flyRegionsDict.qro.location, color: regionColors.qro },
- scl: { label: flyRegionsDict.scl.location, color: regionColors.scl },
- sjc: { label: flyRegionsDict.sjc.location, color: regionColors.sjc },
- sea: { label: flyRegionsDict.sea.location, color: regionColors.sea },
- sin: { label: flyRegionsDict.sin.location, color: regionColors.sin },
- syd: { label: flyRegionsDict.syd.location, color: regionColors.syd },
- waw: { label: flyRegionsDict.waw.location, color: regionColors.waw },
- yul: { label: flyRegionsDict.yul.location, color: regionColors.yul },
- yyz: { label: flyRegionsDict.yyz.location, color: regionColors.yyz },
+ ams: { label: regionDict.ams.location, color: regionColors.ams },
+ arn: { label: regionDict.arn.location, color: regionColors.arn },
+ atl: { label: regionDict.atl.location, color: regionColors.atl },
+ bog: { label: regionDict.bog.location, color: regionColors.bog },
+ bom: { label: regionDict.bom.location, color: regionColors.bom },
+ bos: { label: regionDict.bos.location, color: regionColors.bos },
+ cdg: { label: regionDict.cdg.location, color: regionColors.cdg },
+ den: { label: regionDict.den.location, color: regionColors.den },
+ dfw: { label: regionDict.dfw.location, color: regionColors.dfw },
+ ewr: { label: regionDict.ewr.location, color: regionColors.ewr },
+ eze: { label: regionDict.eze.location, color: regionColors.eze },
+ fra: { label: regionDict.fra.location, color: regionColors.fra },
+ gdl: { label: regionDict.gdl.location, color: regionColors.gdl },
+ gig: { label: regionDict.gig.location, color: regionColors.gig },
+ gru: { label: regionDict.gru.location, color: regionColors.gru },
+ hkg: { label: regionDict.hkg.location, color: regionColors.hkg },
+ iad: { label: regionDict.iad.location, color: regionColors.iad },
+ jnb: { label: regionDict.jnb.location, color: regionColors.jnb },
+ lax: { label: regionDict.lax.location, color: regionColors.lax },
+ lhr: { label: regionDict.lhr.location, color: regionColors.lhr },
+ mad: { label: regionDict.mad.location, color: regionColors.mad },
+ mia: { label: regionDict.mia.location, color: regionColors.mia },
+ nrt: { label: regionDict.nrt.location, color: regionColors.nrt },
+ ord: { label: regionDict.ord.location, color: regionColors.ord },
+ otp: { label: regionDict.otp.location, color: regionColors.otp },
+ phx: { label: regionDict.phx.location, color: regionColors.phx },
+ qro: { label: regionDict.qro.location, color: regionColors.qro },
+ scl: { label: regionDict.scl.location, color: regionColors.scl },
+ sjc: { label: regionDict.sjc.location, color: regionColors.sjc },
+ sea: { label: regionDict.sea.location, color: regionColors.sea },
+ sin: { label: regionDict.sin.location, color: regionColors.sin },
+ syd: { label: regionDict.syd.location, color: regionColors.syd },
+ waw: { label: regionDict.waw.location, color: regionColors.waw },
+ yul: { label: regionDict.yul.location, color: regionColors.yul },
+ yyz: { label: regionDict.yyz.location, color: regionColors.yyz },
+ koyeb_fra: { label: regionDict.ams.location, color: regionColors.koyeb_fra },
+ koyeb_par: { label: regionDict.arn.location, color: regionColors.koyeb_par },
+ koyeb_sfo: { label: regionDict.atl.location, color: regionColors.koyeb_sfo },
+ koyeb_sin: { label: regionDict.bog.location, color: regionColors.koyeb_sin },
+ koyeb_tyo: { label: regionDict.bom.location, color: regionColors.koyeb_tyo },
+ koyeb_was: { label: regionDict.bos.location, color: regionColors.koyeb_was },
} satisfies ChartConfig;
export type TrendPoint = {
@@ -71,8 +77,6 @@ export function ChartLineRegions({
const isMobile = useIsMobile();
const trendData = data ?? [];
- console.log({ data, regions });
-
const chartData = trendData.map((d) => ({
...d,
timestamp: new Date(d.timestamp).toLocaleString("default", {
diff --git a/apps/dashboard/src/components/common/icon-cloud-provider.tsx b/apps/dashboard/src/components/common/icon-cloud-provider.tsx
new file mode 100644
index 000000000..59ce35c2f
--- /dev/null
+++ b/apps/dashboard/src/components/common/icon-cloud-provider.tsx
@@ -0,0 +1,21 @@
+import { cn } from "@/lib/utils";
+import { Fly, Koyeb, Railway } from "@openstatus/icons";
+import { Globe } from "lucide-react";
+
+export function IconCloudProvider({
+ provider,
+ className,
+}: React.ComponentProps<"svg"> & {
+ provider: string;
+}) {
+ switch (provider) {
+ case "fly":
+ return <Fly className={cn("size-4", className)} />;
+ case "koyeb":
+ return <Koyeb className={cn("size-4", className)} />;
+ case "railway":
+ return <Railway className={cn("size-4", className)} />;
+ default:
+ return <Globe className={cn("size-4", className)} />;
+ }
+}
diff --git a/apps/dashboard/src/components/controls-search/command-region.tsx b/apps/dashboard/src/components/controls-search/command-region.tsx
index c034f675f..a0cafcb72 100644
--- a/apps/dashboard/src/components/controls-search/command-region.tsx
+++ b/apps/dashboard/src/components/controls-search/command-region.tsx
@@ -1,5 +1,6 @@
"use client";
+import { IconCloudProvider } from "@/components/common/icon-cloud-provider";
import { Link } from "@/components/common/link";
import {
BillingOverlay,
@@ -59,7 +60,7 @@ export function CommandRegion({
</PopoverTrigger>
<PopoverContent
align="start"
- className="relative w-[200px] overflow-hidden p-0"
+ className="relative w-[250px] overflow-hidden p-0"
>
<Command>
<CommandInput placeholder="Search region..." disabled={limited} />
@@ -122,9 +123,15 @@ export function CommandRegion({
);
}}
>
- <span className="mr-1">{region.flag}</span>
- {region.code}
- <span className="ml-1 truncate text-muted-foreground text-xs">
+ <span>{region.flag}</span>
+ <IconCloudProvider
+ provider={region.provider}
+ className="size-3"
+ />
+ <span className="font-mono">
+ {region.code.replace(/(koyeb_|railway_|fly_)/g, "")}
+ </span>
+ <span className="truncate text-muted-foreground text-xs">
{region.location}
</span>
<Check
diff --git a/apps/dashboard/src/components/data-table/response-logs/columns.tsx b/apps/dashboard/src/components/data-table/response-logs/columns.tsx
index b62320355..550c62508 100644
--- a/apps/dashboard/src/components/data-table/response-logs/columns.tsx
+++ b/apps/dashboard/src/components/data-table/response-logs/columns.tsx
@@ -17,7 +17,7 @@ import {
import { getStatusCodeVariant, textColors } from "@/data/status-codes";
import { cn } from "@/lib/utils";
import type { RouterOutputs } from "@openstatus/api";
-import { flyRegionsDict } from "@openstatus/utils";
+import { regionDict } from "@openstatus/utils";
import { HoverCardPortal } from "@radix-ui/react-hover-card";
import type { ColumnDef } from "@tanstack/react-table";
import { Clock, Workflow } from "lucide-react";
@@ -94,7 +94,7 @@ export const columns: ColumnDef<ResponseLog>[] = [
return <div className="text-muted-foreground">-</div>;
}
- const regionConfig = flyRegionsDict[value as keyof typeof flyRegionsDict];
+ const regionConfig = regionDict[value as keyof typeof regionDict];
return regionConfig.location;
},
enableSorting: false,
diff --git a/apps/dashboard/src/components/data-table/response-logs/data-table-basics.tsx b/apps/dashboard/src/components/data-table/response-logs/data-table-basics.tsx
index cd11cd9a9..33c87a0eb 100644
--- a/apps/dashboard/src/components/data-table/response-logs/data-table-basics.tsx
+++ b/apps/dashboard/src/components/data-table/response-logs/data-table-basics.tsx
@@ -15,7 +15,7 @@ import { getStatusCodeVariant, textColors } from "@/data/status-codes";
import { formatMilliseconds, formatPercentage } from "@/lib/formatter";
import { cn } from "@/lib/utils";
import type { RouterOutputs } from "@openstatus/api";
-import { flyRegionsDict } from "@openstatus/utils";
+import { regionDict } from "@openstatus/utils";
import { Braces, TableProperties } from "lucide-react";
type ResponseLog = RouterOutputs["tinybird"]["get"]["data"][number];
@@ -37,7 +37,7 @@ export function DataTableBasicsHTTP({
trigger?: "cron" | "api" | "test" | null;
};
}) {
- const regionConfig = flyRegionsDict[data.region];
+ const regionConfig = regionDict[data.region];
return (
<Table className="table-fixed">
<colgroup>
@@ -294,7 +294,7 @@ export function DataTableBasicsTCP({
trigger?: "cron" | "api" | "test" | null;
};
}) {
- const regionConfig = flyRegionsDict[data.region];
+ const regionConfig = regionDict[data.region];
return (
<Table className="table-fixed">
<colgroup>
diff --git a/apps/dashboard/src/components/data-table/response-logs/regions/columns.tsx b/apps/dashboard/src/components/data-table/response-logs/regions/columns.tsx
index 7bf11d107..418e91836 100644
--- a/apps/dashboard/src/components/data-table/response-logs/regions/columns.tsx
+++ b/apps/dashboard/src/components/data-table/response-logs/regions/columns.tsx
@@ -12,7 +12,7 @@ import {
} from "@/components/ui/tooltip";
import type { RegionMetric } from "@/data/region-metrics";
import { getActions } from "@/data/region-metrics.client";
-import { flyRegionsDict } from "@openstatus/utils";
+import { regionDict } from "@openstatus/utils";
import type { ColumnDef } from "@tanstack/react-table";
// import { toast } from "sonner";
import { useRouter } from "next/navigation";
@@ -28,14 +28,18 @@ export const columns: ColumnDef<RegionMetric>[] = [
cell: ({ row }) => {
const value = row.getValue("region");
if (typeof value === "string") {
- const region = flyRegionsDict[value as keyof typeof flyRegionsDict];
+ const region = regionDict[value as keyof typeof regionDict];
return (
<TooltipProvider>
<Tooltip>
- <TooltipTrigger className="h-[50px]">
- {region.flag} {region.code}
+ <TooltipTrigger className="flex h-[50px] items-center gap-1">
+ {region.flag}{" "}
+ {region.code.replace(/(koyeb_|railway_|fly_)/g, "")}
</TooltipTrigger>
- <TooltipContent side="left">{region.location}</TooltipContent>
+ <TooltipContent side="left">
+ {region.location} -{" "}
+ <span className="capitalize">{region.provider}</span>
+ </TooltipContent>
</Tooltip>
</TooltipProvider>
);
diff --git a/apps/dashboard/src/components/forms/monitor/form-scheduling-regions.tsx b/apps/dashboard/src/components/forms/monitor/form-scheduling-regions.tsx
index 174dc9617..c21ef0672 100644
--- a/apps/dashboard/src/components/forms/monitor/form-scheduling-regions.tsx
+++ b/apps/dashboard/src/components/forms/monitor/form-scheduling-regions.tsx
@@ -25,7 +25,7 @@ import { Slider } from "@/components/ui/slider";
import { cn } from "@/lib/utils";
import { zodResolver } from "@hookform/resolvers/zod";
import {
- type MonitorFlyRegion,
+ type Region,
monitorPeriodicity,
} from "@openstatus/db/src/schema/constants";
import { useState, useTransition } from "react";
@@ -33,8 +33,15 @@ import { useForm } from "react-hook-form";
import { toast } from "sonner";
import { z } from "zod";
+import { IconCloudProvider } from "@/components/common/icon-cloud-provider";
import { Note, NoteButton } from "@/components/common/note";
import { UpgradeDialog } from "@/components/dialogs/upgrade";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@/components/ui/tooltip";
import { useTRPC } from "@/lib/trpc/client";
import { groupByContinent } from "@openstatus/utils";
import { useQuery } from "@tanstack/react-query";
@@ -239,9 +246,7 @@ export function FormSchedulingRegions({
(region) =>
!r
.map(({ code }) => code)
- .includes(
- region as MonitorFlyRegion,
- ),
+ .includes(region as Region),
),
);
}
@@ -299,11 +304,28 @@ export function FormSchedulingRegions({
className="w-full truncate font-mono font-normal text-sm"
>
<span className="text-nowrap">
- {region.code} {region.flag}
+ {region.code.replace(
+ /(koyeb_|railway_|fly_)/g,
+ "",
+ )}{" "}
+ {region.flag}
</span>
<span className="truncate font-normal text-muted-foreground text-xs leading-[inherit]">
{region.location}
</span>
+ <TooltipProvider>
+ <Tooltip>
+ <TooltipTrigger type="button">
+ <IconCloudProvider
+ provider={region.provider}
+ className="size-3"
+ />
+ </TooltipTrigger>
+ <TooltipContent className="capitalize">
+ {region.provider}
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
</FormLabel>
</FormItem>
);
diff --git a/apps/dashboard/src/components/metric/global-uptime/section.tsx b/apps/dashboard/src/components/metric/global-uptime/section.tsx
index a8b6ac494..0ac2f9970 100644
--- a/apps/dashboard/src/components/metric/global-uptime/section.tsx
+++ b/apps/dashboard/src/components/metric/global-uptime/section.tsx
@@ -18,7 +18,7 @@ import {
formatNumber,
formatPercentage,
} from "@/lib/formatter";
-import type { flyRegions } from "@openstatus/db/src/schema/constants";
+import type { monitorRegions } from "@openstatus/db/src/schema/constants";
import { formatDistanceToNow } from "date-fns";
type Metric = {
@@ -40,7 +40,7 @@ export function GlobalUptimeSection({
monitorId: string;
jobType: "http" | "tcp";
period: "1d" | "7d" | "14d";
- regions: (typeof flyRegions)[number][];
+ regions: (typeof monitorRegions)[number][];
}) {
const trpc = useTRPC();
diff --git a/apps/dashboard/src/data/metrics.client.ts b/apps/dashboard/src/data/metrics.client.ts
index effbb3aa3..39f6205b0 100644
--- a/apps/dashboard/src/data/metrics.client.ts
+++ b/apps/dashboard/src/data/metrics.client.ts
@@ -3,13 +3,14 @@
import type { MetricCard } from "@/components/metric/metric-card";
import { formatDateTime, formatMilliseconds } from "@/lib/formatter";
import type { RouterOutputs } from "@openstatus/api";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import type { RegionMetric } from "./region-metrics";
import type { Region } from "./regions";
export const STATUS = ["success", "error", "degraded"] as const;
export const PERIODS = ["1d", "7d", "14d"] as const;
-export const REGIONS = flyRegions as unknown as (typeof flyRegions)[number][];
+export const REGIONS =
+ monitorRegions as unknown as (typeof monitorRegions)[number][];
export const PERCENTILES = ["p50", "p75", "p90", "p95", "p99"] as const;
export const INTERVALS = [5, 15, 30, 60, 120, 240, 480, 1440] as const;
export const TRIGGER = ["api", "cron"] as const;
diff --git a/apps/dashboard/src/data/regions.ts b/apps/dashboard/src/data/regions.ts
index 2d9df6d0f..ad22a60c5 100644
--- a/apps/dashboard/src/data/regions.ts
+++ b/apps/dashboard/src/data/regions.ts
@@ -4,102 +4,119 @@ export const regions = [
location: "Amsterdam, Netherlands",
flag: "๐Ÿ‡ณ๐Ÿ‡ฑ",
continent: "Europe",
+ provider: "Fly",
},
{
code: "arn",
location: "Stockholm, Sweden",
flag: "๐Ÿ‡ธ๐Ÿ‡ช",
continent: "Europe",
+ provider: "Fly",
},
{
code: "atl",
location: "Atlanta, Georgia, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "Fly",
},
{
code: "bog",
location: "Bogotรก, Colombia",
flag: "๐Ÿ‡จ๐Ÿ‡ด",
continent: "South America",
+ provider: "Fly",
},
{
code: "bom",
location: "Mumbai, India",
flag: "๐Ÿ‡ฎ๐Ÿ‡ณ",
continent: "Asia",
+ provider: "Fly",
},
{
code: "bos",
location: "Boston, Massachusetts, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "Fly",
},
{
code: "cdg",
location: "Paris, France",
flag: "๐Ÿ‡ซ๐Ÿ‡ท",
continent: "Europe",
+ provider: "Fly",
},
{
code: "den",
location: "Denver, Colorado, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "Fly",
},
{
code: "dfw",
location: "Dallas, Texas, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "Fly",
},
{
code: "ewr",
location: "Secaucus, New Jersey, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "Fly",
},
{
code: "eze",
location: "Ezeiza, Argentina",
flag: "๐Ÿ‡ฆ๐Ÿ‡ท",
continent: "South America",
+ provider: "Fly",
},
{
code: "fra",
location: "Frankfurt, Germany",
flag: "๐Ÿ‡ฉ๐Ÿ‡ช",
continent: "Europe",
+ provider: "Fly",
},
{
code: "gdl",
location: "Guadalajara, Mexico",
flag: "๐Ÿ‡ฒ๐Ÿ‡ฝ",
continent: "North America",
+ provider: "Fly",
},
{
code: "gig",
location: "Rio de Janeiro, Brazil",
flag: "๐Ÿ‡ง๐Ÿ‡ท",
continent: "South America",
+ provider: "Fly",
},
{
code: "gru",
location: "Sao Paulo, Brazil",
flag: "๐Ÿ‡ง๐Ÿ‡ท",
continent: "South America",
+ provider: "Fly",
},
{
code: "hkg",
location: "Hong Kong, Hong Kong",
flag: "๐Ÿ‡ญ๐Ÿ‡ฐ",
continent: "Asia",
+ provider: "Fly",
},
{
code: "iad",
location: "Ashburn, Virginia, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "Fly",
},
{
code: "jnb",
@@ -112,12 +129,14 @@ export const regions = [
location: "Los Angeles, California, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "Fly",
},
{
code: "lhr",
location: "London, United Kingdom",
flag: "๐Ÿ‡ฌ๐Ÿ‡ง",
continent: "Europe",
+ provider: "Fly",
},
{
code: "mad",
@@ -130,12 +149,14 @@ export const regions = [
location: "Miami, Florida, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "Fly",
},
{
code: "nrt",
location: "Tokyo, Japan",
flag: "๐Ÿ‡ฏ๐Ÿ‡ต",
continent: "Asia",
+ provider: "Fly",
},
{
code: "ord",
@@ -148,66 +169,119 @@ export const regions = [
location: "Bucharest, Romania",
flag: "๐Ÿ‡ท๐Ÿ‡ด",
continent: "Europe",
+ provider: "Fly",
},
{
code: "phx",
location: "Phoenix, Arizona, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "Fly",
},
{
code: "qro",
location: "Querรฉtaro, Mexico",
flag: "๐Ÿ‡ฒ๐Ÿ‡ฝ",
continent: "North America",
+ provider: "Fly",
},
{
code: "scl",
location: "Santiago, Chile",
flag: "๐Ÿ‡จ๐Ÿ‡ฑ",
continent: "South America",
+ provider: "Fly",
},
{
code: "sjc",
location: "San Jose, California, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "Fly",
},
{
code: "sea",
location: "Seattle, Washington, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "Fly",
},
{
code: "sin",
location: "Singapore, Singapore",
flag: "๐Ÿ‡ธ๐Ÿ‡ฌ",
continent: "Asia",
+ provider: "Fly",
},
{
code: "syd",
location: "Sydney, Australia",
flag: "๐Ÿ‡ฆ๐Ÿ‡บ",
continent: "Oceania",
+ provider: "Fly",
},
{
code: "waw",
location: "Warsaw, Poland",
flag: "๐Ÿ‡ต๐Ÿ‡ฑ",
continent: "Europe",
+ provider: "Fly",
},
{
code: "yul",
location: "Montreal, Canada",
flag: "๐Ÿ‡จ๐Ÿ‡ฆ",
continent: "North America",
+ provider: "Fly",
},
{
code: "yyz",
location: "Toronto, Canada",
flag: "๐Ÿ‡จ๐Ÿ‡ฆ",
continent: "North America",
+ provider: "Fly",
+ },
+ {
+ code: "koyeb_fra",
+ location: "Frankfurt, Germany",
+ flag: "๐Ÿ‡ฉ๐Ÿ‡ช",
+ continent: "Europe",
+ provider: "koyeb",
+ },
+ {
+ code: "koyeb_par",
+ location: "Paris, France",
+ flag: "๐Ÿ‡ซ๐Ÿ‡ท",
+ continent: "Europe",
+ provider: "koyeb",
+ },
+ {
+ code: "koyeb_sfo",
+ location: "San Francisco, USA",
+ flag: "๐Ÿ‡บ๐Ÿ‡ธ",
+ continent: "North America",
+ provider: "koyeb",
+ },
+ {
+ code: "koyeb_sin",
+ location: "Singapore, Singapore",
+ flag: "๐Ÿ‡ธ๐Ÿ‡ฌ",
+ continent: "Asia",
+ provider: "koyeb",
+ },
+ {
+ code: "koyeb_tyo",
+ location: "Tokyo, Japan",
+ flag: "๐Ÿ‡ฏ๐Ÿ‡ต",
+ continent: "Asia",
+ provider: "koyeb",
+ },
+ {
+ code: "koyeb_was",
+ location: "Washington, USA",
+ flag: "๐Ÿ‡บ๐Ÿ‡ธ",
+ continent: "North America",
+ provider: "koyeb",
},
] as const;
@@ -261,4 +335,11 @@ export const regionColors = {
waw: "hsl(0 0% 45.1%)",
yul: "hsl(25 5.3% 44.7%)",
yyz: "hsl(0 84.2% 60.2%)",
+
+ koyeb_fra: "hsl(25 5.3% 44.7%)",
+ koyeb_par: "hsl(25 5.3% 44.7%)",
+ koyeb_sin: "hsl(25 5.3% 44.7%)",
+ koyeb_sfo: "hsl(0 0% 45.1%)",
+ koyeb_tyo: "hsl(0 0% 45.1%)",
+ koyeb_was: "hsl(0 0% 45.1%)",
} satisfies Record<Region, string>;
diff --git a/apps/dashboard/src/data/response-logs.ts b/apps/dashboard/src/data/response-logs.ts
index f655a788c..608f6947b 100644
--- a/apps/dashboard/src/data/response-logs.ts
+++ b/apps/dashboard/src/data/response-logs.ts
@@ -1,5 +1,5 @@
import type { RouterOutputs } from "@openstatus/api";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import { startOfDay } from "date-fns";
type ResponseLog = RouterOutputs["tinybird"]["list"]["data"][number];
@@ -23,7 +23,7 @@ export const exampleLogs: ResponseLog[] = Array.from({ length: 10 }).map(
transfer: 50,
},
assertions: [],
- region: flyRegions[i],
+ region: monitorRegions[i],
error: false,
timestamp: today.getTime() + i * 1000 * 60,
headers: {
diff --git a/apps/server/src/env.ts b/apps/server/src/env.ts
index dbaa3cf81..081df5371 100644
--- a/apps/server/src/env.ts
+++ b/apps/server/src/env.ts
@@ -1,4 +1,4 @@
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import { createEnv } from "@t3-oss/env-core";
import { z } from "zod";
@@ -9,7 +9,7 @@ export const env = createEnv({
TINY_BIRD_API_KEY: z.string().min(1),
UPSTASH_REDIS_REST_URL: z.string().min(1),
UPSTASH_REDIS_REST_TOKEN: z.string().min(1),
- FLY_REGION: z.enum(flyRegions),
+ FLY_REGION: z.enum(monitorRegions),
CRON_SECRET: z.string(),
SCREENSHOT_SERVICE_URL: z.string(),
QSTASH_TOKEN: z.string(),
diff --git a/apps/server/src/routes/v1/monitors/schema.ts b/apps/server/src/routes/v1/monitors/schema.ts
index ba94a7fa3..d528cad55 100644
--- a/apps/server/src/routes/v1/monitors/schema.ts
+++ b/apps/server/src/routes/v1/monitors/schema.ts
@@ -3,8 +3,8 @@ import { z } from "@hono/zod-openapi";
import { numberCompare, stringCompare } from "@openstatus/assertions";
import { monitorJobTypes, monitorMethods } from "@openstatus/db/src/schema";
import {
- flyRegions,
monitorPeriodicitySchema,
+ monitorRegions,
} from "@openstatus/db/src/schema/constants";
import { ZodError } from "zod";
@@ -110,7 +110,7 @@ export const MonitorSchema = z
]);
}
},
- z.array(z.enum(flyRegions)),
+ z.array(z.enum(monitorRegions)),
)
.default([])
.openapi({
@@ -252,7 +252,7 @@ export const HTTPTriggerResult = z.object({
jobType: z.literal("http"),
status: z.number(),
latency: z.number(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number(),
timing: timingSchema,
body: z.string().optional().nullable(),
@@ -267,7 +267,7 @@ const tcptimingSchema = z.object({
export const TCPTriggerResult = z.object({
jobType: z.literal("tcp"),
latency: z.number(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number(),
timing: tcptimingSchema,
// check if it should be z.coerce.boolean()?
@@ -286,7 +286,7 @@ export const ResultRun = z.object({
monitorId: z.string().default(""),
url: z.string().optional(),
error: z.coerce.boolean().default(false),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number().int().optional(),
message: z.string().nullable().optional(),
timing: z
@@ -343,7 +343,7 @@ const baseRequest = z.object({
description: "Whether the monitor is public",
default: false,
}),
- regions: z.array(z.enum(flyRegions)).openapi({
+ regions: z.array(z.enum(monitorRegions)).openapi({
description: "Regions to run the request in",
}),
openTelemetry: z
diff --git a/apps/status-page/src/data/metrics.client.ts b/apps/status-page/src/data/metrics.client.ts
index 0e6efccd5..354b003e6 100644
--- a/apps/status-page/src/data/metrics.client.ts
+++ b/apps/status-page/src/data/metrics.client.ts
@@ -3,13 +3,14 @@
import type { MetricCard } from "@/components/content/metric-card";
import { formatDateTime, formatMilliseconds } from "@/lib/formatter";
import type { RouterOutputs } from "@openstatus/api";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import type { RegionMetric } from "./region-metrics";
import type { Region } from "./regions";
export const STATUS = ["success", "error", "degraded"] as const;
export const PERIODS = ["1d", "7d", "14d"] as const;
-export const REGIONS = flyRegions as unknown as (typeof flyRegions)[number][];
+export const REGIONS =
+ monitorRegions as unknown as (typeof monitorRegions)[number][];
export const PERCENTILES = ["p50", "p75", "p90", "p95", "p99"] as const;
export const INTERVALS = [5, 15, 30, 60, 120, 240, 480, 1440] as const;
export const TRIGGER = ["api", "cron"] as const;
diff --git a/apps/web/package.json b/apps/web/package.json
index c4262355d..d9b6bb856 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -24,6 +24,7 @@
"@openstatus/emails": "workspace:*",
"@openstatus/error": "workspace:*",
"@openstatus/header-analysis": "workspace:*",
+ "@openstatus/icons": "workspace:*",
"@openstatus/notification-discord": "workspace:*",
"@openstatus/notification-emails": "workspace:*",
"@openstatus/notification-ntfy": "workspace:*",
diff --git a/apps/web/src/app/(pages)/(content)/play/checker/[id]/page.tsx b/apps/web/src/app/(pages)/(content)/play/checker/[id]/page.tsx
index 939734ec7..d34cdb5bb 100644
--- a/apps/web/src/app/(pages)/(content)/play/checker/[id]/page.tsx
+++ b/apps/web/src/app/(pages)/(content)/play/checker/[id]/page.tsx
@@ -2,7 +2,7 @@ import type { Metadata } from "next";
import Link from "next/link";
import { redirect } from "next/navigation";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import { Separator } from "@openstatus/ui";
import {
@@ -17,6 +17,7 @@ import {
getCheckerDataById,
timestampFormatter,
} from "@/components/ping-response-analysis/utils";
+import { mockCheckAllRegions } from "../api/mock";
import { searchParamsCache } from "./search-params";
interface Props {
@@ -28,9 +29,12 @@ export default async function CheckPage(props: Props) {
const searchParams = await props.searchParams;
const params = await props.params;
const { regions } = searchParamsCache.parse(searchParams);
- const selectedRegions = regions || [...flyRegions];
+ const selectedRegions = regions || [...monitorRegions];
- const data = await getCheckerDataById(params.id);
+ const data =
+ process.env.NODE_ENV === "development"
+ ? await mockCheckAllRegions()
+ : await getCheckerDataById(params.id);
if (!data) redirect("/play/checker");
diff --git a/apps/web/src/app/(pages)/(content)/play/checker/[id]/search-params.ts b/apps/web/src/app/(pages)/(content)/play/checker/[id]/search-params.ts
index b96b3f00a..a1bc7af4c 100644
--- a/apps/web/src/app/(pages)/(content)/play/checker/[id]/search-params.ts
+++ b/apps/web/src/app/(pages)/(content)/play/checker/[id]/search-params.ts
@@ -1,4 +1,4 @@
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import {
createSearchParamsCache,
parseAsArrayOf,
@@ -6,7 +6,7 @@ import {
} from "nuqs/server";
export const searchParamsParsers = {
- regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)),
+ regions: parseAsArrayOf(parseAsStringLiteral(monitorRegions)),
};
export const searchParamsCache = createSearchParamsCache(searchParamsParsers);
diff --git a/apps/web/src/app/(pages)/(content)/play/checker/_components/checker-form.tsx b/apps/web/src/app/(pages)/(content)/play/checker/_components/checker-form.tsx
index 8c5fcafa5..b60fbe658 100644
--- a/apps/web/src/app/(pages)/(content)/play/checker/_components/checker-form.tsx
+++ b/apps/web/src/app/(pages)/(content)/play/checker/_components/checker-form.tsx
@@ -45,8 +45,17 @@ import {
} from "@/components/ping-response-analysis/utils";
import { toast } from "@/lib/toast";
import { notEmpty } from "@/lib/utils";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
-import { ArrowRight, ChevronRight, Gauge, Info, Loader } from "lucide-react";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
+import { Fly, Koyeb, Railway } from "@openstatus/icons";
+import { regionDict } from "@openstatus/utils";
+import {
+ ArrowRight,
+ ChevronRight,
+ Gauge,
+ Globe,
+ Info,
+ Loader,
+} from "lucide-react";
import dynamic from "next/dynamic";
import Link from "next/link";
import { useQueryStates } from "nuqs";
@@ -173,7 +182,10 @@ export function CheckerForm({ defaultValues, defaultData }: CheckerFormProps) {
if (_result) {
if (_result[0].state === "success") {
toast.loading(
- `Checking ${regionFormatter(_result[0].region, "long")} (${latencyFormatter(_result[0].latency)})`,
+ `Checking ${regionFormatter(
+ _result[0].region,
+ "long",
+ )} (${latencyFormatter(_result[0].latency)})`,
{
id: toastId,
},
@@ -322,7 +334,7 @@ function TableResult({
<p className="w-[95px]">
Region{" "}
<span className="font-normal text-xs tabular-nums">
- ({result.length}/{flyRegions.length})
+ ({result.length}/{monitorRegions.length})
</span>
</p>
{loading ? (
@@ -333,7 +345,7 @@ function TableResult({
{id &&
!loading &&
result.length > 0 &&
- result.length !== flyRegions.length ? (
+ result.length !== monitorRegions.length ? (
<TooltipProvider>
<Tooltip>
<TooltipTrigger>
@@ -363,17 +375,41 @@ function TableResult({
{result.length > 0 ? (
result
.filter((item) => item.state === "success")
- .map((item) => (
- <TableRow key={item.region}>
- <TableCell className="flex items-center gap-2 font-medium">
- {regionFormatter(item.region, "long")}
- <StatusDot value={item.status} />
- </TableCell>
- <TableCell className="text-right">
- {latencyFormatter(item.latency)}
- </TableCell>
- </TableRow>
- ))
+ .map((item) => {
+ const region = regionFormatter(item.region, "long");
+ const latency = latencyFormatter(item.latency);
+ const r = regionDict[item.region];
+ return (
+ <TableRow key={item.region}>
+ <TableCell className="flex items-center gap-2 font-medium">
+ <TooltipProvider>
+ <Tooltip delayDuration={0}>
+ <TooltipTrigger type="button">
+ {(() => {
+ switch (r.provider) {
+ case "fly":
+ return <Fly className="size-4" />;
+ case "railway":
+ return <Railway className="size-4" />;
+ case "koyeb":
+ return <Koyeb className="size-4" />;
+ default:
+ return <Globe className="size-4" />;
+ }
+ })()}
+ </TooltipTrigger>
+ <TooltipContent className="capitalize">
+ {r.provider}
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
+ {region}
+ <StatusDot value={item.status} />
+ </TableCell>
+ <TableCell className="text-right">{latency}</TableCell>
+ </TableRow>
+ );
+ })
) : (
<TableRow>
<TableCell
diff --git a/apps/web/src/app/(pages)/(content)/play/checker/api/mock.ts b/apps/web/src/app/(pages)/(content)/play/checker/api/mock.ts
index 617c1fba4..7ab430f6b 100644
--- a/apps/web/src/app/(pages)/(content)/play/checker/api/mock.ts
+++ b/apps/web/src/app/(pages)/(content)/play/checker/api/mock.ts
@@ -1,4 +1,7 @@
-import type { RegionChecker } from "@/components/ping-response-analysis/utils";
+import {
+ type RegionChecker,
+ cachedCheckerSchema,
+} from "@/components/ping-response-analysis/utils";
import { wait } from "@/lib/utils";
import type { Region } from "@openstatus/db/src/schema/constants";
@@ -13,7 +16,15 @@ export async function mockCheckRegion(region: Region) {
await wait(response.latency);
- return response as RegionChecker;
+ return response as unknown as RegionChecker;
+}
+
+export async function mockCheckAllRegions() {
+ const res = cachedCheckerSchema.safeParse(data);
+ if (!res.success) {
+ throw new Error(res.error.message);
+ }
+ return res.data;
}
export const data = {
@@ -1380,5 +1391,233 @@ export const data = {
},
region: "yyz",
},
+ {
+ type: "http",
+ state: "success",
+ status: 200,
+ latency: 720,
+ headers: {
+ Age: "0",
+ "Cache-Control":
+ "private, no-cache, no-store, max-age=0, must-revalidate",
+ "Content-Type": "text/html; charset=utf-8",
+ Date: "Fri, 23 Aug 2024 12:17:57 GMT",
+ Link: '</_next/static/media/162bf645eb375add-s.p.ttf>; rel=preload; as="font"; crossorigin=""; type="font/ttf", </_next/static/media/a34f9d1faa5f3315-s.p.woff2>; rel=preload; as="font"; crossorigin=""; type="font/woff2"',
+ Server: "Koyeb",
+ "Set-Cookie":
+ "__Host-authjs.csrf-token=8f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a3b%7C4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f; Path=/; HttpOnly; Secure; SameSite=Lax",
+ "Strict-Transport-Security": "max-age=63072000",
+ Vary: "RSC, Next-Router-State-Tree, Next-Router-Prefetch",
+ "X-Matched-Path": "/",
+ "X-Powered-By": "Next.js",
+ "X-Koyeb-Cache": "MISS",
+ "X-Koyeb-Execution-Region": "fra",
+ "X-Koyeb-Id": "koyeb-fra::fra::abc123-1724415477000-def456789",
+ },
+ timestamp: 1724415477000,
+ timing: {
+ dnsStart: 1724415477100,
+ dnsDone: 1724415477102,
+ connectStart: 1724415477102,
+ connectDone: 1724415477103,
+ tlsHandshakeStart: 1724415477103,
+ tlsHandshakeDone: 1724415477120,
+ firstByteStart: 1724415477120,
+ firstByteDone: 1724415477820,
+ transferStart: 1724415477820,
+ transferDone: 1724415477820,
+ },
+ region: "koyeb_fra",
+ },
+ {
+ type: "http",
+ state: "success",
+ status: 200,
+ latency: 680,
+ headers: {
+ Age: "0",
+ "Cache-Control":
+ "private, no-cache, no-store, max-age=0, must-revalidate",
+ "Content-Type": "text/html; charset=utf-8",
+ Date: "Fri, 23 Aug 2024 12:17:57 GMT",
+ Link: '</_next/static/media/162bf645eb375add-s.p.ttf>; rel=preload; as="font"; crossorigin=""; type="font/ttf", </_next/static/media/a34f9d1faa5f3315-s.p.woff2>; rel=preload; as="font"; crossorigin=""; type="font/woff2"',
+ Server: "Koyeb",
+ "Set-Cookie":
+ "__Host-authjs.csrf-token=9a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d%7C5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b; Path=/; HttpOnly; Secure; SameSite=Lax",
+ "Strict-Transport-Security": "max-age=63072000",
+ Vary: "RSC, Next-Router-State-Tree, Next-Router-Prefetch",
+ "X-Matched-Path": "/",
+ "X-Powered-By": "Next.js",
+ "X-Koyeb-Cache": "MISS",
+ "X-Koyeb-Execution-Region": "par",
+ "X-Koyeb-Id": "koyeb-par::par::xyz789-1724415477100-ghi012345",
+ },
+ timestamp: 1724415477100,
+ timing: {
+ dnsStart: 1724415477200,
+ dnsDone: 1724415477202,
+ connectStart: 1724415477202,
+ connectDone: 1724415477203,
+ tlsHandshakeStart: 1724415477203,
+ tlsHandshakeDone: 1724415477220,
+ firstByteStart: 1724415477220,
+ firstByteDone: 1724415477900,
+ transferStart: 1724415477900,
+ transferDone: 1724415477900,
+ },
+ region: "koyeb_par",
+ },
+ {
+ type: "http",
+ state: "success",
+ status: 200,
+ latency: 450,
+ headers: {
+ Age: "0",
+ "Cache-Control":
+ "private, no-cache, no-store, max-age=0, must-revalidate",
+ "Content-Type": "text/html; charset=utf-8",
+ Date: "Fri, 23 Aug 2024 12:17:57 GMT",
+ Link: '</_next/static/media/162bf645eb375add-s.p.ttf>; rel=preload; as="font"; crossorigin=""; type="font/ttf", </_next/static/media/a34f9d1faa5f3315-s.p.woff2>; rel=preload; as="font"; crossorigin=""; type="font/woff2"',
+ Server: "Koyeb",
+ "Set-Cookie":
+ "__Host-authjs.csrf-token=a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e%7C6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c; Path=/; HttpOnly; Secure; SameSite=Lax",
+ "Strict-Transport-Security": "max-age=63072000",
+ Vary: "RSC, Next-Router-State-Tree, Next-Router-Prefetch",
+ "X-Matched-Path": "/",
+ "X-Powered-By": "Next.js",
+ "X-Koyeb-Cache": "MISS",
+ "X-Koyeb-Execution-Region": "sfo",
+ "X-Koyeb-Id": "koyeb-sfo::sfo::mno456-1724415477200-pqr789012",
+ },
+ timestamp: 1724415477200,
+ timing: {
+ dnsStart: 1724415477300,
+ dnsDone: 1724415477302,
+ connectStart: 1724415477302,
+ connectDone: 1724415477303,
+ tlsHandshakeStart: 1724415477303,
+ tlsHandshakeDone: 1724415477320,
+ firstByteStart: 1724415477320,
+ firstByteDone: 1724415477650,
+ transferStart: 1724415477650,
+ transferDone: 1724415477650,
+ },
+ region: "koyeb_sfo",
+ },
+ {
+ type: "http",
+ state: "success",
+ status: 200,
+ latency: 920,
+ headers: {
+ Age: "0",
+ "Cache-Control":
+ "private, no-cache, no-store, max-age=0, must-revalidate",
+ "Content-Type": "text/html; charset=utf-8",
+ Date: "Fri, 23 Aug 2024 12:17:58 GMT",
+ Link: '</_next/static/media/162bf645eb375add-s.p.ttf>; rel=preload; as="font"; crossorigin=""; type="font/ttf", </_next/static/media/a34f9d1faa5f3315-s.p.woff2>; rel=preload; as="font"; crossorigin=""; type="font/woff2"',
+ Server: "Koyeb",
+ "Set-Cookie":
+ "__Host-authjs.csrf-token=b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f%7C7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c0d; Path=/; HttpOnly; Secure; SameSite=Lax",
+ "Strict-Transport-Security": "max-age=63072000",
+ Vary: "RSC, Next-Router-State-Tree, Next-Router-Prefetch",
+ "X-Matched-Path": "/",
+ "X-Powered-By": "Next.js",
+ "X-Koyeb-Cache": "MISS",
+ "X-Koyeb-Execution-Region": "sin",
+ "X-Koyeb-Id": "koyeb-sin::sin::stu345-1724415477300-vwx678901",
+ },
+ timestamp: 1724415477300,
+ timing: {
+ dnsStart: 1724415477400,
+ dnsDone: 1724415477402,
+ connectStart: 1724415477402,
+ connectDone: 1724415477403,
+ tlsHandshakeStart: 1724415477403,
+ tlsHandshakeDone: 1724415477420,
+ firstByteStart: 1724415477420,
+ firstByteDone: 1724415478340,
+ transferStart: 1724415478340,
+ transferDone: 1724415478340,
+ },
+ region: "koyeb_sin",
+ },
+ {
+ type: "http",
+ state: "success",
+ status: 200,
+ latency: 1100,
+ headers: {
+ Age: "0",
+ "Cache-Control":
+ "private, no-cache, no-store, max-age=0, must-revalidate",
+ "Content-Type": "text/html; charset=utf-8",
+ Date: "Fri, 23 Aug 2024 12:17:58 GMT",
+ Link: '</_next/static/media/162bf645eb375add-s.p.ttf>; rel=preload; as="font"; crossorigin=""; type="font/ttf", </_next/static/media/a34f9d1faa5f3315-s.p.woff2>; rel=preload; as="font"; crossorigin=""; type="font/woff2"',
+ Server: "Koyeb",
+ "Set-Cookie":
+ "__Host-authjs.csrf-token=c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a%7C8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c0d1e; Path=/; HttpOnly; Secure; SameSite=Lax",
+ "Strict-Transport-Security": "max-age=63072000",
+ Vary: "RSC, Next-Router-State-Tree, Next-Router-Prefetch",
+ "X-Matched-Path": "/",
+ "X-Powered-By": "Next.js",
+ "X-Koyeb-Cache": "MISS",
+ "X-Koyeb-Execution-Region": "tyo",
+ "X-Koyeb-Id": "koyeb-tyo::tyo::yza234-1724415477400-bcd567890",
+ },
+ timestamp: 1724415477400,
+ timing: {
+ dnsStart: 1724415477500,
+ dnsDone: 1724415477502,
+ connectStart: 1724415477502,
+ connectDone: 1724415477503,
+ tlsHandshakeStart: 1724415477503,
+ tlsHandshakeDone: 1724415477520,
+ firstByteStart: 1724415477520,
+ firstByteDone: 1724415478620,
+ transferStart: 1724415478620,
+ transferDone: 1724415478620,
+ },
+ region: "koyeb_tyo",
+ },
+ {
+ type: "http",
+ state: "success",
+ status: 200,
+ latency: 380,
+ headers: {
+ Age: "0",
+ "Cache-Control":
+ "private, no-cache, no-store, max-age=0, must-revalidate",
+ "Content-Type": "text/html; charset=utf-8",
+ Date: "Fri, 23 Aug 2024 12:17:58 GMT",
+ Link: '</_next/static/media/162bf645eb375add-s.p.ttf>; rel=preload; as="font"; crossorigin=""; type="font/ttf", </_next/static/media/a34f9d1faa5f3315-s.p.woff2>; rel=preload; as="font"; crossorigin=""; type="font/woff2"',
+ Server: "Koyeb",
+ "Set-Cookie":
+ "__Host-authjs.csrf-token=d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a7b%7C9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c0d1e2f; Path=/; HttpOnly; Secure; SameSite=Lax",
+ "Strict-Transport-Security": "max-age=63072000",
+ Vary: "RSC, Next-Router-State-Tree, Next-Router-Prefetch",
+ "X-Matched-Path": "/",
+ "X-Powered-By": "Next.js",
+ "X-Koyeb-Cache": "MISS",
+ "X-Koyeb-Execution-Region": "was",
+ "X-Koyeb-Id": "koyeb-was::was::efg123-1724415477500-hij456789",
+ },
+ timestamp: 1724415477500,
+ timing: {
+ dnsStart: 1724415477600,
+ dnsDone: 1724415477602,
+ connectStart: 1724415477602,
+ connectDone: 1724415477603,
+ tlsHandshakeStart: 1724415477603,
+ tlsHandshakeDone: 1724415477620,
+ firstByteStart: 1724415477620,
+ firstByteDone: 1724415478000,
+ transferStart: 1724415478000,
+ transferDone: 1724415478000,
+ },
+ region: "koyeb_was",
+ },
],
};
diff --git a/apps/web/src/app/(pages)/(content)/play/checker/api/route.ts b/apps/web/src/app/(pages)/(content)/play/checker/api/route.ts
index cf1e0a9e3..2e23341ee 100644
--- a/apps/web/src/app/(pages)/(content)/play/checker/api/route.ts
+++ b/apps/web/src/app/(pages)/(content)/play/checker/api/route.ts
@@ -2,11 +2,10 @@ import {
type Method,
checkRegion,
storeBaseCheckerData,
- storeCheckerData,
} from "@/components/ping-response-analysis/utils";
import { iteratorToStream, yieldMany } from "@/lib/stream";
import { wait } from "@/lib/utils";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import { mockCheckRegion } from "./mock";
export const runtime = "edge";
@@ -17,9 +16,13 @@ async function* makeIterator({
url,
method,
id,
-}: { url: string; method: Method; id: string }) {
+}: {
+ url: string;
+ method: Method;
+ id: string;
+}) {
// Create an array to store all the promises
- const promises = flyRegions.map(async (region, index) => {
+ const promises = monitorRegions.map(async (region, index) => {
try {
// Perform the fetch operation
const check =
@@ -32,7 +35,7 @@ async function* makeIterator({
}
if (check.state === "success") {
- storeCheckerData({ check, id });
+ // storeCheckerData({ check, id });
}
return encoder.encode(
diff --git a/apps/web/src/app/(pages)/(content)/play/checker/page.tsx b/apps/web/src/app/(pages)/(content)/play/checker/page.tsx
index 2a5f218b3..78c782348 100644
--- a/apps/web/src/app/(pages)/(content)/play/checker/page.tsx
+++ b/apps/web/src/app/(pages)/(content)/play/checker/page.tsx
@@ -11,6 +11,7 @@ import { redirect } from "next/navigation";
import CheckerPlay from "./_components/checker-play";
import { GlobalMonitoring } from "./_components/global-monitoring";
import { Testimonial } from "./_components/testimonial";
+import { mockCheckAllRegions } from "./api/mock";
import { searchParamsCache } from "./search-params";
const title = "Global Speed Checker";
@@ -41,7 +42,11 @@ export default async function PlayPage(props: {
const searchParams = await props.searchParams;
const { id } = searchParamsCache.parse(searchParams);
- const data = id ? await getCheckerDataById(id) : null;
+ const data = id
+ ? process.env.NODE_ENV === "development"
+ ? await mockCheckAllRegions()
+ : await getCheckerDataById(id)
+ : null;
if (id && !data) return redirect("/play/checker");
diff --git a/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/data-table-wrapper.tsx b/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/data-table-wrapper.tsx
index 560bbd60a..b95716039 100644
--- a/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/data-table-wrapper.tsx
+++ b/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/_components/data-table-wrapper.tsx
@@ -18,7 +18,7 @@ import { LoadingAnimation } from "@/components/loading-animation";
import { ResponseDetailTabs } from "@/components/ping-response-analysis/response-detail-tabs";
import type { Trigger } from "@/lib/monitor/utils";
import { api } from "@/trpc/rq-client";
-import type { monitorFlyRegionSchema } from "@openstatus/db/src/schema/constants";
+import type { monitorRegionSchema } from "@openstatus/db/src/schema/constants";
import type { z } from "zod";
// FIXME: use proper type
@@ -26,7 +26,7 @@ export type Monitor = {
type: "http" | "tcp";
monitorId: string;
latency: number;
- region: z.infer<typeof monitorFlyRegionSchema>;
+ region: z.infer<typeof monitorRegionSchema>;
statusCode?: number | null;
timestamp: number;
workspaceId: string;
diff --git a/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/search-params.ts b/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/search-params.ts
index 6b51ac2c8..c6d9c4871 100644
--- a/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/search-params.ts
+++ b/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/data/search-params.ts
@@ -1,5 +1,5 @@
import { periods, triggers } from "@/lib/monitor/utils";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import {
createSearchParamsCache,
parseAsArrayOf,
@@ -15,7 +15,7 @@ export const searchParamsParsers = {
cronTimestamp: parseAsInteger,
error: parseAsArrayOf(parseAsBoolean),
period: parseAsStringLiteral(periods).withDefault(DEFAULT_PERIOD),
- regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)),
+ regions: parseAsArrayOf(parseAsStringLiteral(monitorRegions)),
pageSize: parseAsInteger.withDefault(10),
pageIndex: parseAsInteger.withDefault(0),
trigger: parseAsArrayOf(parseAsStringLiteral(triggers)),
diff --git a/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/search-params.ts b/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/search-params.ts
index 1b3d1d07c..d4f31f804 100644
--- a/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/search-params.ts
+++ b/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/details/search-params.ts
@@ -1,4 +1,4 @@
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import {
createSearchParamsCache,
parseAsInteger,
@@ -9,7 +9,7 @@ import {
export const searchParamsParsers = {
monitorId: parseAsString.withDefault(""),
url: parseAsString.withDefault(""),
- region: parseAsStringLiteral(flyRegions).withDefault("ams"),
+ region: parseAsStringLiteral(monitorRegions).withDefault("ams"),
cronTimestamp: parseAsInteger.withDefault(0),
};
export const searchParamsCache = createSearchParamsCache(searchParamsParsers);
diff --git a/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx b/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx
index 28a7fa8e8..60449c93d 100644
--- a/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx
+++ b/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/page.tsx
@@ -1,6 +1,9 @@
import { notFound } from "next/navigation";
-import { type Region, flyRegions } from "@openstatus/db/src/schema/constants";
+import {
+ type Region,
+ monitorRegions,
+} from "@openstatus/db/src/schema/constants";
import { Separator } from "@openstatus/ui";
import { CombinedChartWrapper } from "@/components/monitor-charts/combined-chart-wrapper";
@@ -68,7 +71,7 @@ export default async function Page(props: {
period !== DEFAULT_PERIOD ||
quantile !== DEFAULT_QUANTILE ||
interval !== DEFAULT_INTERVAL ||
- flyRegions.length !== regions.length;
+ monitorRegions.length !== regions.length;
// GET VALUES FOR BLOG POST
// console.log(
diff --git a/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/search-params.ts b/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/search-params.ts
index 1ad6aefa5..fa52fe2bc 100644
--- a/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/search-params.ts
+++ b/apps/web/src/app/(pages)/app/[workspaceSlug]/(dashboard)/monitors/[id]/overview/search-params.ts
@@ -1,5 +1,5 @@
import { intervals, periods, quantiles } from "@/lib/monitor/utils";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import {
createSearchParamsCache,
parseAsArrayOf,
@@ -17,8 +17,8 @@ export const searchParamsParsers = {
quantile: parseAsStringLiteral(quantiles).withDefault(DEFAULT_QUANTILE),
interval: parseAsStringLiteral(intervals).withDefault(DEFAULT_INTERVAL),
period: parseAsStringLiteral(periods).withDefault(DEFAULT_PERIOD),
- regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)).withDefault([
- ...flyRegions,
+ regions: parseAsArrayOf(parseAsStringLiteral(monitorRegions)).withDefault([
+ ...monitorRegions,
]),
};
export const searchParamsCache = createSearchParamsCache(searchParamsParsers);
diff --git a/apps/web/src/app/(pages)/public/monitors/[id]/page.tsx b/apps/web/src/app/(pages)/public/monitors/[id]/page.tsx
index 3fa7487c3..be1b0246f 100644
--- a/apps/web/src/app/(pages)/public/monitors/[id]/page.tsx
+++ b/apps/web/src/app/(pages)/public/monitors/[id]/page.tsx
@@ -1,6 +1,9 @@
import { notFound } from "next/navigation";
-import { type Region, flyRegions } from "@openstatus/db/src/schema/constants";
+import {
+ type Region,
+ monitorRegions,
+} from "@openstatus/db/src/schema/constants";
import { Separator } from "@openstatus/ui";
import { Shell } from "@/components/dashboard/shell";
@@ -78,7 +81,7 @@ export default async function Page(props: {
period !== DEFAULT_PERIOD ||
quantile !== DEFAULT_QUANTILE ||
interval !== DEFAULT_INTERVAL ||
- flyRegions.length !== regions.length;
+ monitorRegions.length !== regions.length;
return (
<div className="relative flex w-full flex-col gap-6">
diff --git a/apps/web/src/app/(pages)/public/monitors/[id]/search-params.ts b/apps/web/src/app/(pages)/public/monitors/[id]/search-params.ts
index d68907c87..bc0917253 100644
--- a/apps/web/src/app/(pages)/public/monitors/[id]/search-params.ts
+++ b/apps/web/src/app/(pages)/public/monitors/[id]/search-params.ts
@@ -1,5 +1,5 @@
import { intervals, quantiles } from "@/lib/monitor/utils";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import {
createSearchParamsCache,
parseAsArrayOf,
@@ -19,8 +19,8 @@ export const searchParamsParsers = {
quantile: parseAsStringLiteral(quantiles).withDefault(DEFAULT_QUANTILE),
interval: parseAsStringLiteral(intervals).withDefault(DEFAULT_INTERVAL),
period: parseAsStringLiteral(periods).withDefault(DEFAULT_PERIOD),
- regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)).withDefault([
- ...flyRegions,
+ regions: parseAsArrayOf(parseAsStringLiteral(monitorRegions)).withDefault([
+ ...monitorRegions,
]),
};
export const searchParamsCache = createSearchParamsCache(searchParamsParsers);
diff --git a/apps/web/src/app/api/checker/cron/_cron.ts b/apps/web/src/app/api/checker/cron/_cron.ts
index 0312960dd..0d9e435f7 100644
--- a/apps/web/src/app/api/checker/cron/_cron.ts
+++ b/apps/web/src/app/api/checker/cron/_cron.ts
@@ -15,11 +15,13 @@ import {
} from "@openstatus/db/src/schema";
import { env } from "@/env";
+import type { Region } from "@openstatus/db/src/schema/constants";
import {
type httpPayloadSchema,
type tpcPayloadSchema,
transformHeaders,
} from "@openstatus/utils";
+import { regionDict } from "@openstatus/utils";
const periodicityAvailable = selectMonitorSchema.pick({ periodicity: true });
@@ -92,7 +94,7 @@ export const cron = async ({
}
for (const row of monitors.data) {
- const selectedRegions = row.regions.length > 0 ? row.regions : ["ams"];
+ // const selectedRegions = row.regions.length > 0 ? row.regions : ["ams"];
const result = await db
.select()
@@ -107,7 +109,7 @@ export const cron = async ({
continue;
}
- for (const region of selectedRegions) {
+ for (const region of row.regions) {
const status =
monitorStatus.data.find((m) => region === m.region)?.status || "active";
const response = createCronTask({
@@ -158,7 +160,7 @@ const createCronTask = async ({
client: CloudTasksClient;
parent: string;
status: MonitorStatus;
- region: string;
+ region: Region;
}) => {
let payload:
| z.infer<typeof httpPayloadSchema>
@@ -214,16 +216,23 @@ const createCronTask = async ({
if (!payload) {
throw new Error("Invalid jobType");
}
-
+ const regionInfo = regionDict[region];
+ let regionHeader = {};
+ if (regionInfo.provider === "fly") {
+ regionHeader = { "fly-prefer-region": region };
+ }
+ if (regionInfo.provider === "koyeb") {
+ regionHeader = { "X-KOYEB-REGION-OVERRIDE": region.replace("koyeb_", "") };
+ }
const newTask: google.cloud.tasks.v2beta3.ITask = {
httpRequest: {
headers: {
"Content-Type": "application/json", // Set content type to ensure compatibility your application's request parsing
- "fly-prefer-region": region, // Specify the region you want the request to be sent to
+ ...regionHeader,
Authorization: `Basic ${env.CRON_SECRET}`,
},
httpMethod: "POST",
- url: generateUrl({ row }),
+ url: generateUrl({ row, region }),
body: Buffer.from(JSON.stringify(payload)).toString("base64"),
},
scheduleTime: {
@@ -235,12 +244,18 @@ const createCronTask = async ({
return client.createTask(request);
};
-function generateUrl({ row }: { row: z.infer<typeof selectMonitorSchema> }) {
- switch (row.jobType) {
- case "http":
- return `https://openstatus-checker.fly.dev/checker/http?monitor_id=${row.id}`;
- case "tcp":
- return `https://openstatus-checker.fly.dev/checker/tcp?monitor_id=${row.id}`;
+function generateUrl({
+ row,
+ region,
+}: { row: z.infer<typeof selectMonitorSchema>; region: Region }) {
+ const regionInfo = regionDict[region];
+
+ switch (regionInfo.provider) {
+ case "fly":
+ return `https://openstatus-checker.fly.dev/checker/${row.jobType}?monitor_id=${row.id}`;
+ case "koyeb":
+ return `openstatus-checker.koyeb.app/checker/${row.jobType}?monitor_id=${row.id}`;
+
default:
throw new Error("Invalid jobType");
}
diff --git a/apps/web/src/app/api/checker/test/http/route.ts b/apps/web/src/app/api/checker/test/http/route.ts
index 028ba0435..85c596b2e 100644
--- a/apps/web/src/app/api/checker/test/http/route.ts
+++ b/apps/web/src/app/api/checker/test/http/route.ts
@@ -1,7 +1,7 @@
import { NextResponse } from "next/server";
import { z } from "zod";
-import { monitorFlyRegionSchema } from "@openstatus/db/src/schema/constants";
+import { monitorRegionSchema } from "@openstatus/db/src/schema/constants";
import { checkRegion } from "@/components/ping-response-analysis/utils";
import { httpPayloadSchema } from "@openstatus/utils";
@@ -21,7 +21,7 @@ export async function POST(request: Request) {
const json = await request.json();
const _valid = httpPayloadSchema
.pick({ url: true, method: true, headers: true, body: true })
- .merge(z.object({ region: monitorFlyRegionSchema.default("ams") }))
+ .merge(z.object({ region: monitorRegionSchema.default("ams") }))
.safeParse(json);
if (!_valid.success) {
diff --git a/apps/web/src/app/api/checker/test/tcp/route.ts b/apps/web/src/app/api/checker/test/tcp/route.ts
index d4f89c640..b10a06c0a 100644
--- a/apps/web/src/app/api/checker/test/tcp/route.ts
+++ b/apps/web/src/app/api/checker/test/tcp/route.ts
@@ -2,8 +2,8 @@ import { NextResponse } from "next/server";
import { z } from "zod";
import {
- type MonitorFlyRegion,
- monitorFlyRegionSchema,
+ type Region,
+ monitorRegionSchema,
} from "@openstatus/db/src/schema/constants";
import { TCPResponse, tcpPayload } from "./schema";
@@ -22,7 +22,7 @@ export async function POST(request: Request) {
const json = await request.json();
const _valid = tcpPayload
.pick({ url: true })
- .merge(z.object({ region: monitorFlyRegionSchema.default("ams") }))
+ .merge(z.object({ region: monitorRegionSchema.default("ams") }))
.safeParse(json);
if (!_valid.success) {
@@ -39,7 +39,7 @@ export async function POST(request: Request) {
return NextResponse.json({ success: false }, { status: 400 });
}
}
-async function checkTCP(url: string, region: MonitorFlyRegion) {
+async function checkTCP(url: string, region: Region) {
//
const res = await fetch(`https://checker.openstatus.dev/tcp/${region}`, {
headers: {
diff --git a/apps/web/src/app/api/checker/test/tcp/schema.ts b/apps/web/src/app/api/checker/test/tcp/schema.ts
index 317551e9d..c5b2a30d2 100644
--- a/apps/web/src/app/api/checker/test/tcp/schema.ts
+++ b/apps/web/src/app/api/checker/test/tcp/schema.ts
@@ -1,6 +1,6 @@
import { z } from "zod";
-import { monitorFlyRegionSchema } from "@openstatus/db/src/schema/constants";
+import { monitorRegionSchema } from "@openstatus/db/src/schema/constants";
export const tcpPayload = z.object({
workspaceId: z.string(),
@@ -22,7 +22,7 @@ export const TCPResponse = z.object({
tcpDone: z.number(),
}),
error: z.string().optional(),
- region: monitorFlyRegionSchema,
+ region: monitorRegionSchema,
latency: z.number().optional(),
});
diff --git a/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx b/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx
index c50e2e357..ac350432b 100644
--- a/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx
+++ b/apps/web/src/app/status-page/[domain]/monitors/[id]/page.tsx
@@ -1,6 +1,9 @@
import { notFound } from "next/navigation";
-import { type Region, flyRegions } from "@openstatus/db/src/schema/constants";
+import {
+ type Region,
+ monitorRegions,
+} from "@openstatus/db/src/schema/constants";
import { Separator } from "@openstatus/ui/src/components/separator";
import { Header } from "@/components/dashboard/header";
@@ -99,7 +102,7 @@ export default async function Page(props: {
period !== DEFAULT_PERIOD ||
quantile !== DEFAULT_QUANTILE ||
interval !== DEFAULT_INTERVAL ||
- flyRegions.length !== regions.length;
+ monitorRegions.length !== regions.length;
return (
<div className="relative flex w-full flex-col gap-6">
diff --git a/apps/web/src/app/status-page/[domain]/monitors/[id]/search-params.ts b/apps/web/src/app/status-page/[domain]/monitors/[id]/search-params.ts
index a704e0d3d..94a744671 100644
--- a/apps/web/src/app/status-page/[domain]/monitors/[id]/search-params.ts
+++ b/apps/web/src/app/status-page/[domain]/monitors/[id]/search-params.ts
@@ -1,5 +1,5 @@
import { intervals, quantiles } from "@/lib/monitor/utils";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import {
createSearchParamsCache,
parseAsArrayOf,
@@ -19,8 +19,8 @@ export const searchParamsParsers = {
quantile: parseAsStringLiteral(quantiles).withDefault(DEFAULT_QUANTILE),
interval: parseAsStringLiteral(intervals).withDefault(DEFAULT_INTERVAL),
period: parseAsStringLiteral(periods).withDefault(DEFAULT_PERIOD),
- regions: parseAsArrayOf(parseAsStringLiteral(flyRegions)).withDefault([
- ...flyRegions,
+ regions: parseAsArrayOf(parseAsStringLiteral(monitorRegions)).withDefault([
+ ...monitorRegions,
]),
};
export const searchParamsCache = createSearchParamsCache(searchParamsParsers);
diff --git a/apps/web/src/components/data-table/columns.tsx b/apps/web/src/components/data-table/columns.tsx
index 6488022b1..dc3098b37 100644
--- a/apps/web/src/components/data-table/columns.tsx
+++ b/apps/web/src/components/data-table/columns.tsx
@@ -4,10 +4,10 @@ import type { ColumnDef } from "@tanstack/react-table";
import { format } from "date-fns";
import type * as z from "zod";
-import { flyRegionsDict } from "@openstatus/utils";
+import { regionDict } from "@openstatus/utils";
import type { Trigger } from "@/lib/monitor/utils";
-import type { monitorFlyRegionSchema } from "@openstatus/db/src/schema/constants";
+import type { monitorRegionSchema } from "@openstatus/db/src/schema/constants";
import { TriggerIconWithTooltip } from "../monitor/trigger-icon-with-tooltip";
import { DataTableColumnHeader } from "./data-table-column-header";
import { DataTableStatusBadge } from "./data-table-status-badge";
@@ -16,7 +16,7 @@ export type Check = {
type: "http" | "tcp";
monitorId: string;
latency: number;
- region: z.infer<typeof monitorFlyRegionSchema>;
+ region: z.infer<typeof monitorRegionSchema>;
statusCode?: number | null;
timestamp: number;
workspaceId: string;
@@ -95,7 +95,7 @@ export const columns: ColumnDef<Check>[] = [
<div>
<span className="font-mono">{String(row.getValue("region"))} </span>
<span className="text-muted-foreground text-xs">
- {flyRegionsDict[row.original.region]?.location}
+ {regionDict[row.original.region]?.location}
</span>
</div>
);
diff --git a/apps/web/src/components/data-table/data-table-toolbar.tsx b/apps/web/src/components/data-table/data-table-toolbar.tsx
index 41d6abf02..68d95d58f 100644
--- a/apps/web/src/components/data-table/data-table-toolbar.tsx
+++ b/apps/web/src/components/data-table/data-table-toolbar.tsx
@@ -5,7 +5,7 @@ import { X } from "lucide-react";
import { useRouter, useSearchParams } from "next/navigation";
import { Button } from "@openstatus/ui/src/components/button";
-import { flyRegionsDict } from "@openstatus/utils";
+import { regionDict } from "@openstatus/utils";
import { Icons } from "@/components/icons";
import { codesDict } from "@/data/code-dictionary";
@@ -44,11 +44,11 @@ export function DataTableToolbar<TData>({
<DataTableFacetedFilter
column={table.getColumn("region")}
title="Region"
- options={Object.keys(flyRegionsDict).map((key) => {
- const typedKey = key as keyof typeof flyRegionsDict;
+ options={Object.keys(regionDict).map((key) => {
+ const typedKey = key as keyof typeof regionDict;
return {
- label: flyRegionsDict[typedKey].location,
- value: flyRegionsDict[typedKey].code,
+ label: regionDict[typedKey].location,
+ value: regionDict[typedKey].code,
};
})}
/>
diff --git a/apps/web/src/components/data-table/single-region/columns.tsx b/apps/web/src/components/data-table/single-region/columns.tsx
index fbbce0ee6..93b72eb40 100644
--- a/apps/web/src/components/data-table/single-region/columns.tsx
+++ b/apps/web/src/components/data-table/single-region/columns.tsx
@@ -4,7 +4,7 @@ import { SimpleChart } from "@/components/monitor-charts/simple-chart";
import { formatNumber } from "@/components/monitor-dashboard/metrics-card";
import type { ResponseTimeMetricsByRegion } from "@/lib/tb";
import type { Region } from "@openstatus/db/src/schema/constants";
-import { flyRegionsDict } from "@openstatus/utils";
+import { regionDict } from "@openstatus/utils";
import type { ColumnDef } from "@tanstack/react-table";
import { DataTableColumnHeader } from "./data-table-column-header";
@@ -20,7 +20,7 @@ export const columns: ColumnDef<RegionWithMetrics>[] = [
header: "Region",
cell: ({ row }) => {
const region = row.getValue("region") as Region;
- const { code, flag, location } = flyRegionsDict[region];
+ const { code, flag, location } = regionDict[region];
return (
<div>
<p className="text-muted-foreground text-xs">{location}</p>
diff --git a/apps/web/src/components/forms/monitor/form.tsx b/apps/web/src/components/forms/monitor/form.tsx
index 1cbe50131..b8c2ec11f 100644
--- a/apps/web/src/components/forms/monitor/form.tsx
+++ b/apps/web/src/components/forms/monitor/form.tsx
@@ -28,7 +28,7 @@ import type { RegionChecker } from "@/components/ping-response-analysis/utils";
import { toast, toastAction } from "@/lib/toast";
import { formatDuration } from "@/lib/utils";
import { api } from "@/trpc/client";
-import type { MonitorFlyRegion } from "@openstatus/db/src/schema/constants";
+import type { Region } from "@openstatus/db/src/schema/constants";
import type { Limits } from "@openstatus/db/src/schema/plan/schema";
import { SaveButton } from "../shared/save-button";
import { General } from "./general";
@@ -175,7 +175,7 @@ export function MonitorForm({
}
};
- const pingEndpoint = async (region?: MonitorFlyRegion) => {
+ const pingEndpoint = async (region?: Region) => {
try {
const {
url,
diff --git a/apps/web/src/components/forms/monitor/request-test-button.tsx b/apps/web/src/components/forms/monitor/request-test-button.tsx
index 7e969c4bb..dc7e4ea6d 100644
--- a/apps/web/src/components/forms/monitor/request-test-button.tsx
+++ b/apps/web/src/components/forms/monitor/request-test-button.tsx
@@ -7,8 +7,8 @@ import type { UseFormReturn } from "react-hook-form";
import { deserialize } from "@openstatus/assertions";
import type { InsertMonitor } from "@openstatus/db/src/schema";
import {
- type MonitorFlyRegion,
- flyRegions,
+ type Region,
+ monitorRegions,
} from "@openstatus/db/src/schema/constants";
import {
Button,
@@ -26,7 +26,7 @@ import {
TooltipProvider,
TooltipTrigger,
} from "@openstatus/ui";
-import { flyRegionsDict } from "@openstatus/utils";
+import { regionDict } from "@openstatus/utils";
import { LoadingAnimation } from "@/components/loading-animation";
import { RegionInfo } from "@/components/ping-response-analysis/region-info";
@@ -40,7 +40,7 @@ interface Props {
form: UseFormReturn<InsertMonitor>;
limits: Limits;
pingEndpoint(
- region?: MonitorFlyRegion,
+ region?: Region,
): Promise<{ data?: RegionChecker; error?: string }>;
}
@@ -48,7 +48,7 @@ export function RequestTestButton({ form, pingEndpoint, limits }: Props) {
const [check, setCheck] = React.useState<
{ data: RegionChecker; error?: string } | undefined
>();
- const [value, setValue] = React.useState<MonitorFlyRegion>(flyRegions[0]);
+ const [value, setValue] = React.useState<Region>(monitorRegions[0]);
const [isPending, startTransition] = React.useTransition();
const onClick = () => {
@@ -77,7 +77,7 @@ export function RequestTestButton({ form, pingEndpoint, limits }: Props) {
});
};
- const { flag } = flyRegionsDict[value as keyof typeof flyRegionsDict];
+ const { flag } = regionDict[value as keyof typeof regionDict];
const { statusAssertions, headerAssertions } = form.getValues();
@@ -88,7 +88,7 @@ export function RequestTestButton({ form, pingEndpoint, limits }: Props) {
<div className="group flex h-10 items-center rounded-md bg-transparent text-sm ring-offset-background focus-within:outline-hidden focus-within:ring-2 focus-within:ring-ring focus-within:ring-offset-2">
<Select
value={value}
- onValueChange={(value: MonitorFlyRegion) => setValue(value)}
+ onValueChange={(value: Region) => setValue(value)}
>
<SelectTrigger
className="flex-1 rounded-r-none border-accent focus:ring-0"
@@ -98,7 +98,7 @@ export function RequestTestButton({ form, pingEndpoint, limits }: Props) {
</SelectTrigger>
<SelectContent>
{regions.map((region) => {
- const { flag } = flyRegionsDict[region];
+ const { flag } = regionDict[region];
return (
<SelectItem key={region} value={region}>
{flag} <span className="ml-1 font-mono">{region}</span>
diff --git a/apps/web/src/components/forms/monitor/select-region.tsx b/apps/web/src/components/forms/monitor/select-region.tsx
index 508d1f30a..04df1fb25 100644
--- a/apps/web/src/components/forms/monitor/select-region.tsx
+++ b/apps/web/src/components/forms/monitor/select-region.tsx
@@ -17,14 +17,13 @@ import {
PopoverContent,
PopoverTrigger,
} from "@openstatus/ui/src/components/popover";
-import {
- type Continent,
- type RegionInfo,
- flyRegionsDict,
-} from "@openstatus/utils";
+import { type Continent, type RegionInfo, regionDict } from "@openstatus/utils";
import { cn } from "@/lib/utils";
-import { type Region, flyRegions } from "@openstatus/db/src/schema/constants";
+import {
+ type Region,
+ monitorRegions,
+} from "@openstatus/db/src/schema/constants";
interface SelectRegionProps extends Omit<ButtonProps, "onChange"> {
allowedRegions: Region[];
@@ -39,9 +38,9 @@ export function SelectRegion({
className,
...props
}: SelectRegionProps) {
- const regionsByContinent = flyRegions.reduce(
+ const regionsByContinent = monitorRegions.reduce(
(prev, curr) => {
- const region = flyRegionsDict[curr];
+ const region = regionDict[curr];
const item = prev.find((r) => r.continent === region.continent);
@@ -119,7 +118,7 @@ export function SelectRegion({
</div>
<div className="flex w-full justify-between">
<span>
- {code}{" "}
+ {code.replace(/(koyeb_|railway_|fly_)/g, "")}{" "}
<span className="truncate text-muted-foreground">
{location}
</span>
diff --git a/apps/web/src/components/marketing/feature/index.tsx b/apps/web/src/components/marketing/feature/index.tsx
index 3aa0b4f2d..8e7f3d2b1 100644
--- a/apps/web/src/components/marketing/feature/index.tsx
+++ b/apps/web/src/components/marketing/feature/index.tsx
@@ -9,7 +9,7 @@ import { StatusCheck } from "@/components/status-page/status-check";
import { StatusReport } from "@/components/status-page/status-report";
import { Tracker } from "@/components/tracker/tracker";
import type { Region } from "@openstatus/db/src/schema/constants";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import { Button, InputWithAddons } from "@openstatus/ui";
import { Skeleton } from "@openstatus/ui/src/components/skeleton";
import { allUnrelateds } from "content-collections";
@@ -286,8 +286,8 @@ export function FeatureRegions(
<Suspense fallback={<Skeleton />}>
<div className="m-auto">
<RegionsPreset
- regions={flyRegions as unknown as Region[]}
- selectedRegions={flyRegions as unknown as Region[]}
+ regions={monitorRegions as unknown as Region[]}
+ selectedRegions={monitorRegions as unknown as Region[]}
/>
</div>
</Suspense>
diff --git a/apps/web/src/components/monitor-charts/chart.tsx b/apps/web/src/components/monitor-charts/chart.tsx
index 18e3c87ff..7ce558b05 100644
--- a/apps/web/src/components/monitor-charts/chart.tsx
+++ b/apps/web/src/components/monitor-charts/chart.tsx
@@ -144,4 +144,10 @@ const chartConfig: Record<Region, { label: string; color: string }> = {
waw: { label: "WAW", color: "hsl(0 0% 45.1%)" },
yul: { label: "YUL", color: "hsl(25 5.3% 44.7%)" },
yyz: { label: "YYZ", color: "hsl(0 84.2% 60.2%)" },
+ koyeb_fra: { label: "FRA (koyeb)", color: "hsl(0 0% 45.1%)" },
+ koyeb_par: { label: "PAR (koyeb)", color: "hsl(0 0% 45.1%)" },
+ koyeb_sfo: { label: "SFO (koyeb)", color: "hsl(0 0% 45.1%)" },
+ koyeb_sin: { label: "SIN (koyeb)", color: "hsl(0 0% 45.1%)" },
+ koyeb_tyo: { label: "TYO (koyeb)", color: "hsl(0 0% 45.1%)" },
+ koyeb_was: { label: "WAS (koyeb)", color: "hsl(0 0% 45.1%)" },
};
diff --git a/apps/web/src/components/monitor-charts/region-table.tsx b/apps/web/src/components/monitor-charts/region-table.tsx
index 9aa89111c..fba655ae9 100644
--- a/apps/web/src/components/monitor-charts/region-table.tsx
+++ b/apps/web/src/components/monitor-charts/region-table.tsx
@@ -7,7 +7,7 @@ import {
TableHeader,
TableRow,
} from "@openstatus/ui/src/components/table";
-import { flyRegionsDict } from "@openstatus/utils";
+import { regionDict } from "@openstatus/utils";
import { formatNumber } from "@/components/monitor-dashboard/metrics-card";
import type { ResponseTimeMetricsByRegion } from "@/lib/tb";
@@ -49,7 +49,7 @@ export function RegionTable({
{regions
.filter((region) => regions.includes(region))
.map((region) => {
- const { code, flag, location } = flyRegionsDict[region];
+ const { code, flag, location } = regionDict[region];
const metrics = metricsByRegion.find((m) => m.region === region);
return (
<TableRow key={region}>
diff --git a/apps/web/src/components/monitor-charts/utils.tsx b/apps/web/src/components/monitor-charts/utils.tsx
index ff45a5c8d..920e41fd3 100644
--- a/apps/web/src/components/monitor-charts/utils.tsx
+++ b/apps/web/src/components/monitor-charts/utils.tsx
@@ -1,4 +1,4 @@
-import { flyRegionsDict } from "@openstatus/utils";
+import { regionDict } from "@openstatus/utils";
import type { Period, Quantile } from "@/lib/monitor/utils";
import type { ResponseGraph } from "@/lib/tb";
@@ -24,7 +24,7 @@ export function groupDataByTimestamp(
(acc, curr) => {
const { timestamp, region } = curr;
const latency = curr[`${quantile}Latency`];
- const { flag, code, location } = flyRegionsDict[region];
+ const { flag, code, location } = regionDict[region];
const fullNameRegion = `${code}`;
regions[fullNameRegion] = { flag, code, location }; // to get the region keys
if (timestamp === currentTimestamp) {
@@ -73,6 +73,6 @@ export function dataFormatter(number: number) {
}
export function regionFormatter(region: Region) {
- const { code, flag } = flyRegionsDict[region];
+ const { code, flag } = regionDict[region];
return `${flag} ${code}`;
}
diff --git a/apps/web/src/components/monitor-dashboard/region-preset.tsx b/apps/web/src/components/monitor-dashboard/region-preset.tsx
index 0ed4ece2c..a31a7c52f 100644
--- a/apps/web/src/components/monitor-dashboard/region-preset.tsx
+++ b/apps/web/src/components/monitor-dashboard/region-preset.tsx
@@ -1,6 +1,6 @@
"use client";
-import { Check, ChevronsUpDown, Globe2 } from "lucide-react";
+import { Check, ChevronsUpDown, Globe, Globe2 } from "lucide-react";
import { Button, type ButtonProps } from "@openstatus/ui/src/components/button";
import {
@@ -17,14 +17,14 @@ import {
PopoverContent,
PopoverTrigger,
} from "@openstatus/ui/src/components/popover";
-import {
- type Continent,
- type RegionInfo,
- flyRegionsDict,
-} from "@openstatus/utils";
+import { type Continent, type RegionInfo, regionDict } from "@openstatus/utils";
import { cn } from "@/lib/utils";
-import { type Region, flyRegions } from "@openstatus/db/src/schema/constants";
+import {
+ type Region,
+ monitorRegions,
+} from "@openstatus/db/src/schema/constants";
+import { Fly, Koyeb, Railway } from "@openstatus/icons";
import { parseAsArrayOf, parseAsStringLiteral, useQueryState } from "nuqs";
interface RegionsPresetProps extends ButtonProps {
@@ -41,7 +41,7 @@ export function RegionsPreset({
// TODO: check with the RSC pages
const [selected, setSelected] = useQueryState(
"regions",
- parseAsArrayOf(parseAsStringLiteral(flyRegions))
+ parseAsArrayOf(parseAsStringLiteral(monitorRegions))
.withDefault(selectedRegions.filter((r) => regions?.includes(r)))
.withOptions({
shallow: false, // required for SSR to call the RSC
@@ -53,7 +53,7 @@ export function RegionsPreset({
const regionsByContinent = regions
.reduce(
(prev, curr) => {
- const region = flyRegionsDict[curr];
+ const region = regionDict[curr];
const item = prev.find((r) => r.continent === region.continent);
@@ -88,7 +88,7 @@ export function RegionsPreset({
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
</Button>
</PopoverTrigger>
- <PopoverContent className="p-0" align="start">
+ <PopoverContent className="w-80 p-0" align="start">
<Command
// FIXME: keywords not taken - it would be great to search for "Europe"
// filter={(value, search, keywords) => {
@@ -137,9 +137,23 @@ export function RegionsPreset({
>
<Check className={cn("h-4 w-4")} />
</div>
- <div className="flex w-full justify-between">
+ <div className="flex w-full items-center gap-1">
+ <span>
+ {(() => {
+ switch (region.provider) {
+ case "fly":
+ return <Fly className="size-4" />;
+ case "railway":
+ return <Railway className="size-4" />;
+ case "koyeb":
+ return <Koyeb className="size-4" />;
+ default:
+ return <Globe className="size-4" />;
+ }
+ })()}
+ </span>
<span>
- {code}{" "}
+ {code.replace(/(koyeb_|railway_|fly_)/g, "")}{" "}
<span className="truncate text-muted-foreground">
{location}
</span>
diff --git a/apps/web/src/components/ping-response-analysis/columns.tsx b/apps/web/src/components/ping-response-analysis/columns.tsx
index 65fbed4c3..9b1608384 100644
--- a/apps/web/src/components/ping-response-analysis/columns.tsx
+++ b/apps/web/src/components/ping-response-analysis/columns.tsx
@@ -3,7 +3,15 @@
import type { ColumnDef } from "@tanstack/react-table";
import { type RegionChecker, latencyFormatter, regionFormatter } from "./utils";
-import { flyRegionsDict } from "@openstatus/utils";
+import { Fly, Koyeb, Railway } from "@openstatus/icons";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@openstatus/ui";
+import { regionDict } from "@openstatus/utils";
+import { Globe } from "lucide-react";
import { DataTableColumnHeader } from "../data-table/data-table-column-header";
import { StatusCodeBadge } from "../monitor/status-code-badge";
@@ -13,7 +21,11 @@ export const columns: ColumnDef<RegionChecker>[] = [
accessorFn: (row) => row.region,
header: "Key",
cell: ({ row }) => {
- return <div className="font-mono">{row.original.region}</div>;
+ return (
+ <div className="font-mono">
+ {row.original.region.replace(/(koyeb_|railway_|fly_)/g, "")}
+ </div>
+ );
},
enableHiding: false,
},
@@ -22,8 +34,30 @@ export const columns: ColumnDef<RegionChecker>[] = [
accessorFn: (row) => row.region,
header: "Region",
cell: ({ row }) => {
+ const region = regionDict[row.original.region];
return (
- <div className="text-muted-foreground">
+ <div className="flex items-center gap-1 text-muted-foreground">
+ <TooltipProvider>
+ <Tooltip delayDuration={0}>
+ <TooltipTrigger type="button">
+ {(() => {
+ switch (region.provider) {
+ case "fly":
+ return <Fly className="size-4" />;
+ case "railway":
+ return <Railway className="size-4" />;
+ case "koyeb":
+ return <Koyeb className="size-4" />;
+ default:
+ return <Globe className="size-4" />;
+ }
+ })()}
+ </TooltipTrigger>
+ <TooltipContent className="capitalize">
+ {region.provider}
+ </TooltipContent>
+ </Tooltip>
+ </TooltipProvider>
{regionFormatter(row.original.region, "long")}
</div>
);
@@ -31,7 +65,7 @@ export const columns: ColumnDef<RegionChecker>[] = [
filterFn: (row, _id, filterValue) => {
const region = regionFormatter(row.original.region, "long").toLowerCase();
const continent =
- flyRegionsDict[row.original.region].continent.toLocaleLowerCase();
+ regionDict[row.original.region].continent.toLocaleLowerCase();
return `${region} ${continent}`.includes(filterValue.toLowerCase());
},
},
diff --git a/apps/web/src/components/ping-response-analysis/multi-region-chart.tsx b/apps/web/src/components/ping-response-analysis/multi-region-chart.tsx
index d436157d7..0b95d1a19 100644
--- a/apps/web/src/components/ping-response-analysis/multi-region-chart.tsx
+++ b/apps/web/src/components/ping-response-analysis/multi-region-chart.tsx
@@ -77,7 +77,7 @@ export function MultiRegionChart({ regions }: { regions: RegionChecker[] }) {
transform="rotate(-35)"
className="font-mono"
>
- {payload.value}
+ {payload.value.replace(/(koyeb_|railway_|fly_)/g, "")}
</text>
</g>
);
diff --git a/apps/web/src/components/ping-response-analysis/utils.ts b/apps/web/src/components/ping-response-analysis/utils.ts
index 4b303e7b4..b04d0f6d0 100644
--- a/apps/web/src/components/ping-response-analysis/utils.ts
+++ b/apps/web/src/components/ping-response-analysis/utils.ts
@@ -3,10 +3,10 @@ import { z } from "zod";
import {
flyRegions,
- monitorFlyRegionSchema,
+ monitorRegionSchema,
} from "@openstatus/db/src/schema/constants";
-import type { MonitorFlyRegion } from "@openstatus/db/src/schema/constants";
-import { continentDict, flyRegionsDict } from "@openstatus/utils";
+import type { Region } from "@openstatus/db/src/schema/constants";
+import { continentDict, regionDict } from "@openstatus/utils";
export function latencyFormatter(value: number) {
return `${new Intl.NumberFormat("us").format(value).toString()}ms`;
@@ -16,16 +16,16 @@ export function timestampFormatter(timestamp: number) {
return new Date(timestamp).toUTCString(); // GMT format
}
-export function continentFormatter(region: MonitorFlyRegion) {
- const continent = flyRegionsDict[region].continent;
+export function continentFormatter(region: Region) {
+ const continent = regionDict[region].continent;
return continentDict[continent].code;
}
export function regionFormatter(
- region: MonitorFlyRegion,
+ region: Region,
type: "short" | "long" = "short",
) {
- const { code, flag, location } = flyRegionsDict[region];
+ const { code, flag, location } = regionDict[region];
if (type === "short") return `${code} ${flag}`;
return `${location} ${flag}`;
}
@@ -114,7 +114,7 @@ export const cachedCheckerSchema = z.object({
url: z.string(),
timestamp: z.number(),
method: z.enum(["GET", "POST", "PUT", "DELETE"]).default("GET"),
- checks: checkerSchema.extend({ region: monitorFlyRegionSchema }).array(),
+ checks: checkerSchema.extend({ region: monitorRegionSchema }).array(),
});
const errorRequest = z.object({
@@ -123,13 +123,13 @@ const errorRequest = z.object({
});
export const regionCheckerSchema = checkerSchema.extend({
- region: monitorFlyRegionSchema,
+ region: monitorRegionSchema,
state: z.literal("success").default("success"),
});
export const regionCheckerSchemaResponse = regionCheckerSchema.or(
errorRequest.extend({
- region: monitorFlyRegionSchema,
+ region: monitorRegionSchema,
}),
);
export type Timing = z.infer<typeof timingSchema>;
@@ -152,7 +152,7 @@ export type CachedRegionChecker = z.infer<typeof cachedCheckerSchema>;
export type ErrorRequest = z.infer<typeof errorRequest>;
export async function checkRegion(
url: string,
- region: MonitorFlyRegion,
+ region: Region,
opts?: {
method?: Method;
headers?: { value: string; key: string }[];
@@ -160,11 +160,31 @@ export async function checkRegion(
},
): Promise<RegionCheckerResponse> {
//
- const res = await fetch(`https://checker.openstatus.dev/ping/${region}`, {
+ //
+ const regionInfo = regionDict[region];
+
+ let endpoint = "";
+ let regionHeader = {};
+ switch (regionInfo.provider) {
+ case "fly":
+ endpoint = `https://checker.openstatus.dev/ping/${region}`;
+ regionHeader = { "fly-prefer-region": region };
+ break;
+ case "koyeb":
+ endpoint = `https://openstatus-checker.koyeb.app/ping/${region}`;
+ regionHeader = {
+ "X-KOYEB-REGION-OVERRIDE": region.replace("koyeb_", ""),
+ };
+ break;
+ default:
+ break;
+ }
+
+ const res = await fetch(endpoint, {
headers: {
Authorization: `Basic ${process.env.CRON_SECRET}`,
"Content-Type": "application/json",
- "fly-prefer-region": region,
+ ...regionHeader,
},
method: "POST",
body: JSON.stringify({
@@ -244,8 +264,6 @@ export async function storeBaseCheckerData({
await redis.hset(`check:base:${id}`, parsed.data);
const expire = 60 * 60 * 24 * 7; // 7days
await redis.expire(`check:base:${id}`, expire);
-
- return id;
}
export async function storeCheckerData({
diff --git a/apps/workflows/src/checker/alerting.ts b/apps/workflows/src/checker/alerting.ts
index f780bddb0..68eb07f7f 100644
--- a/apps/workflows/src/checker/alerting.ts
+++ b/apps/workflows/src/checker/alerting.ts
@@ -6,10 +6,7 @@ import {
selectWorkspaceSchema,
} from "@openstatus/db/src/schema";
-import type {
- MonitorFlyRegion,
- Region,
-} from "@openstatus/db/src/schema/constants";
+import type { Region } from "@openstatus/db/src/schema/constants";
import { checkerAudit } from "../utils/audit-log";
import { providerToFunction } from "./utils";
@@ -192,7 +189,7 @@ export const upsertMonitorStatus = async ({
}: {
monitorId: string;
status: MonitorStatus;
- region: MonitorFlyRegion;
+ region: Region;
}) => {
const newData = await db
.insert(schema.monitorStatusTable)
diff --git a/packages/api/src/router/tinybird/index.ts b/packages/api/src/router/tinybird/index.ts
index c312d5c73..fdb7e070a 100644
--- a/packages/api/src/router/tinybird/index.ts
+++ b/packages/api/src/router/tinybird/index.ts
@@ -1,6 +1,6 @@
import { z } from "zod";
-import { flyRegions } from "@openstatus/db/src/schema/constants";
+import { monitorRegions } from "@openstatus/db/src/schema/constants";
import { OSTinybird } from "@openstatus/tinybird";
import { type SQL, and, db, eq, inArray } from "@openstatus/db";
@@ -168,7 +168,7 @@ export const tinybirdRouter = createTRPCRouter({
.input(
z.object({
monitorId: z.string(),
- region: z.enum(flyRegions).optional(),
+ region: z.enum(monitorRegions).optional(),
cronTimestamp: z.number().int().optional(),
}),
)
@@ -181,7 +181,7 @@ export const tinybirdRouter = createTRPCRouter({
.input(
z.object({
monitorId: z.string(),
- region: z.enum(flyRegions).optional(),
+ region: z.enum(monitorRegions).optional(),
cronTimestamp: z.number().int().optional(),
from: z.coerce.date().optional(),
to: z.coerce.date().optional(),
@@ -224,7 +224,7 @@ export const tinybirdRouter = createTRPCRouter({
fromDate: z.string().optional(),
toDate: z.string().optional(),
interval: z.number().int().optional(), // in minutes, default 30
- regions: z.enum(flyRegions).array().optional(),
+ regions: z.enum(monitorRegions).array().optional(),
type: z.enum(types).default("http"),
period: z.enum(["7d", "30d"]).default("30d"),
}),
@@ -286,7 +286,7 @@ export const tinybirdRouter = createTRPCRouter({
monitorId: z.string(),
period: z.enum(periods),
type: z.enum(types).default("http"),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
cronTimestamp: z.number().int().optional(),
}),
)
@@ -321,7 +321,7 @@ export const tinybirdRouter = createTRPCRouter({
monitorId: z.string(),
period: z.enum(periods),
type: z.enum(types).default("http"),
- region: z.enum(flyRegions).optional(),
+ region: z.enum(monitorRegions).optional(),
cronTimestamp: z.number().int().optional(),
}),
)
@@ -355,7 +355,7 @@ export const tinybirdRouter = createTRPCRouter({
monitorId: z.string(),
period: z.enum(periods),
type: z.enum(types).default("http"),
- region: z.enum(flyRegions).optional(),
+ region: z.enum(monitorRegions).optional(),
cronTimestamp: z.number().int().optional(),
}),
)
@@ -391,7 +391,7 @@ export const tinybirdRouter = createTRPCRouter({
type: z.enum(types).default("http"),
// Additional filters
interval: z.number().int().optional(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
cronTimestamp: z.number().int().optional(),
}),
)
@@ -429,7 +429,7 @@ export const tinybirdRouter = createTRPCRouter({
monitorIds: z.string().array(),
period: z.enum(["45d"]),
type: z.enum(types).default("http"),
- region: z.enum(flyRegions).optional(),
+ region: z.enum(monitorRegions).optional(),
cronTimestamp: z.number().int().optional(),
}),
)
@@ -519,7 +519,7 @@ export const tinybirdRouter = createTRPCRouter({
z.object({
monitorId: z.string(),
period: z.enum(periods),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
type: z.enum(types).default("http"),
}),
)
@@ -541,7 +541,7 @@ export const tinybirdRouter = createTRPCRouter({
monitorId: z.string(),
period: z.enum(periods),
interval: z.number().int().optional(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
type: z.literal("http"),
}),
)
diff --git a/packages/db/src/schema/constants.ts b/packages/db/src/schema/constants.ts
index d0214efa8..24f8615c6 100644
--- a/packages/db/src/schema/constants.ts
+++ b/packages/db/src/schema/constants.ts
@@ -38,6 +38,15 @@ export const flyRegions = [
"yyz",
] as const;
+export const koyebRegions = [
+ "koyeb_fra",
+ "koyeb_was",
+ "koyeb_sin",
+ "koyeb_tyo",
+ "koyeb_par",
+ "koyeb_sfo",
+] as const;
+
export const freeFlyRegions = [
"iad",
"ams",
@@ -57,10 +66,10 @@ export const monitorPeriodicity = [
"other",
] as const;
-export const monitorRegions = [...flyRegions] as const;
+export const monitorRegions = [...flyRegions, ...koyebRegions] as const;
export const monitorPeriodicitySchema = z.enum(monitorPeriodicity);
export const monitorRegionSchema = z.enum(monitorRegions);
export const monitorFlyRegionSchema = z.enum(flyRegions);
export type MonitorFlyRegion = z.infer<typeof monitorFlyRegionSchema>;
-export type Region = z.infer<typeof monitorFlyRegionSchema>;
+export type Region = z.infer<typeof monitorRegionSchema>;
diff --git a/packages/db/src/schema/plan/config.ts b/packages/db/src/schema/plan/config.ts
index 2343e0e4d..bf6061af5 100644
--- a/packages/db/src/schema/plan/config.ts
+++ b/packages/db/src/schema/plan/config.ts
@@ -1,3 +1,4 @@
+import { type Region, monitorRegions } from "../constants";
import type { WorkspacePlan } from "../workspaces/validation";
import type { Limits } from "./schema";
@@ -50,7 +51,7 @@ export const allPlans: Record<
"notification-channels": 1,
members: 1,
"audit-log": false,
- regions: ["ams", "gru", "iad", "jnb", "hkg", "syd"],
+ regions: ["ams", "gru", "iad", "jnb", "hkg", "syd"] satisfies Region[],
"private-locations": false,
},
},
@@ -88,43 +89,7 @@ export const allPlans: Record<
"notification-channels": 10,
members: "Unlimited",
"audit-log": false,
- regions: [
- "ams",
- "arn",
- "atl",
- "bog",
- "bom",
- "bos",
- "cdg",
- "den",
- "dfw",
- "ewr",
- "eze",
- "fra",
- "gdl",
- "gig",
- "gru",
- "hkg",
- "iad",
- "jnb",
- "lax",
- "lhr",
- "mad",
- "mia",
- "nrt",
- "ord",
- "otp",
- "phx",
- "qro",
- "scl",
- "sea",
- "sin",
- "sjc",
- "syd",
- "waw",
- "yul",
- "yyz",
- ],
+ regions: [...monitorRegions],
"private-locations": false,
},
},
@@ -162,43 +127,7 @@ export const allPlans: Record<
"notification-channels": 20,
members: "Unlimited",
"audit-log": true,
- regions: [
- "ams",
- "arn",
- "atl",
- "bog",
- "bom",
- "bos",
- "cdg",
- "den",
- "dfw",
- "ewr",
- "eze",
- "fra",
- "gdl",
- "gig",
- "gru",
- "hkg",
- "iad",
- "jnb",
- "lax",
- "lhr",
- "mad",
- "mia",
- "nrt",
- "ord",
- "otp",
- "phx",
- "qro",
- "scl",
- "sea",
- "sin",
- "sjc",
- "syd",
- "waw",
- "yul",
- "yyz",
- ],
+ regions: [...monitorRegions],
"private-locations": false,
},
},
diff --git a/packages/db/src/schema/plan/schema.ts b/packages/db/src/schema/plan/schema.ts
index f1ff06f55..5bba73523 100644
--- a/packages/db/src/schema/plan/schema.ts
+++ b/packages/db/src/schema/plan/schema.ts
@@ -1,5 +1,5 @@
import { z } from "zod";
-import { monitorFlyRegionSchema, monitorPeriodicitySchema } from "../constants";
+import { monitorPeriodicitySchema, monitorRegionSchema } from "../constants";
// REMINDER: this is not a database table but just a schema for the limits of the plan
// default values are set to the free plan limits
@@ -17,7 +17,7 @@ export const limitsSchema = z.object({
"data-retention": z
.enum(["14 days", "3 months", "12 months", "24 months"])
.default("14 days"),
- regions: monitorFlyRegionSchema
+ regions: monitorRegionSchema
.array()
.default(["ams", "gru", "iad", "jnb", "hkg", "syd"]),
"private-locations": z.boolean().default(false),
diff --git a/packages/icons/src/fly.tsx b/packages/icons/src/fly.tsx
new file mode 100644
index 000000000..9a5bcc224
--- /dev/null
+++ b/packages/icons/src/fly.tsx
@@ -0,0 +1,41 @@
+export function Fly(props: React.ComponentProps<"svg">) {
+ return (
+ <svg
+ viewBox="0 0 167 151"
+ xmlns="http://www.w3.org/2000/svg"
+ fillRule="evenodd"
+ clipRule="evenodd"
+ strokeLinejoin="round"
+ strokeMiterlimit="2"
+ {...props}
+ >
+ <title>Fly</title>
+ <path
+ d="M116.78 20.613h19.23c17.104 0 30.99 13.886 30.99 30.99v67.618c0 17.104-13.886 30.99-30.99 30.99h-1.516c-8.803-1.377-12.621-4.017-15.57-6.248L94.475 123.86a3.453 3.453 0 00-4.329 0l-7.943 6.532-22.37-18.394a3.443 3.443 0 00-4.326 0l-31.078 27.339c-6.255 5.087-10.392 4.148-13.075 3.853C4.424 137.503 0 128.874 0 119.221V51.603c0-17.104 13.886-30.99 30.993-30.99H50.18l-.035.077-.647 1.886-.201.647-.871 3.862-.12.678-.382 3.868-.051 1.062-.008.372.036 1.774.088 1.039.215 1.628.275 1.464.326 1.349.423 1.46 1.098 3.092.362.927 1.912 4.04.675 1.241 2.211 3.795.846 1.369 3.086 4.544.446.602 4.015 5.226 1.297 1.608 4.585 5.36.942 1.031 3.779 4.066 1.497 1.55 2.474 2.457-.497.415-.309.279a30.309 30.309 0 00-2.384 2.49c-.359.423-.701.86-1.025 1.31-.495.687-.938 1.41-1.324 2.164-.198.391-.375.792-.531 1.202a11.098 11.098 0 00-.718 3.267l-.014.966c.035 1.362.312 2.707.819 3.972a11.06 11.06 0 002.209 3.464 11.274 11.274 0 002.329 1.896c.731.447 1.51.816 2.319 1.096 1.76.597 3.627.809 5.476.623h.01a12.347 12.347 0 004.516-1.341 11.647 11.647 0 001.724-1.116 11.067 11.067 0 003.479-4.626c.569-1.422.848-2.941.823-4.471l-.044-.799a11.305 11.305 0 00-.749-3.078c-.17-.429-.364-.848-.58-1.257-.4-.752-.856-1.473-1.362-2.158-.232-.313-.472-.62-.72-.921a29.81 29.81 0 00-2.661-2.787l-.669-.569 1.133-1.119 4.869-5.085 1.684-1.849 2.618-2.945 1.703-1.992 2.428-2.957 1.644-2.067 2.414-3.228 1.219-1.67 1.729-2.585 1.44-2.203 2.713-4.725 1.552-3.1.045-.095 1.188-2.876c.015-.037.029-.075.04-.114l1.28-3.991.134-.582.555-3.177.108-.86.033-.527.038-1.989-.01-.371-.102-1.781-.126-1.383-.63-3.989a1.521 1.521 0 00-.037-.159l-.809-2.949-.279-.82-.364-.907zm9.141 84.321c-4.007.056-7.287 3.336-7.343 7.342.059 4.006 3.337 7.284 7.343 7.341 4.005-.058 7.284-3.335 7.345-7.341-.058-4.006-3.338-7.286-7.345-7.342z"
+ fill="url(#_Radial1)"
+ />
+ <path
+ d="M72.499 147.571l-1.296 1.09a6.802 6.802 0 01-4.253 1.55H30.993a30.867 30.867 0 01-19.639-7.021c2.683.295 6.82 1.234 13.075-3.853l31.078-27.339a3.443 3.443 0 014.326 0l22.37 18.394 7.943-6.532a3.453 3.453 0 014.329 0l24.449 20.103c2.949 2.231 6.767 4.871 15.57 6.248H118.23a6.919 6.919 0 01-3.993-1.33l-.285-.22-1.207-1.003a2.377 2.377 0 00-.32-.323 21845.256 21845.256 0 00-18.689-15.497 2.035 2.035 0 00-2.606.006s.044.052-18.386 15.491c-.09.075-.172.154-.245.236zm53.422-42.637c-4.007.056-7.287 3.336-7.343 7.342.059 4.006 3.337 7.284 7.343 7.341 4.005-.058 7.284-3.335 7.345-7.341-.058-4.006-3.338-7.286-7.345-7.342zM78.453 82.687l-2.474-2.457-1.497-1.55-3.779-4.066-.942-1.031-4.585-5.36-1.297-1.609-4.015-5.225-.446-.602-3.086-4.544-.846-1.369-2.211-3.795-.675-1.241-1.912-4.04-.362-.927-1.098-3.092-.423-1.46-.326-1.349-.275-1.465-.215-1.627-.088-1.039-.036-1.774.008-.372.051-1.062.382-3.869.12-.677.871-3.862.201-.647.647-1.886.207-.488 1.03-2.262.714-1.346.994-1.64.991-1.46.706-.928.813-.98.895-.985.767-.771 1.867-1.643 1.365-1.117c.033-.028.067-.053.102-.077l1.615-1.092 1.283-.818L65.931 3.8c.037-.023.079-.041.118-.059l3.456-1.434.319-.12 3.072-.899 1.297-.291 1.754-.352L77.11.468l1.784-.222L80.11.138 82.525.01l.946-.01 1.791.037.466.026 2.596.216 3.433.484.397.083 3.393.844.996.297 1.107.383 1.348.51 1.066.452 1.566.738.987.507 1.774 1.041.661.407 2.418 1.765.694.602 1.686 1.536.083.083 1.43 1.534.492.555 1.678 2.23.342.533 1.332 2.249.401.771.751 1.678.785 1.959.279.82.809 2.949c.015.052.027.105.037.159l.63 3.988.126 1.384.102 1.781.01.371-.038 1.989-.033.527-.108.86-.555 3.177-.134.582-1.28 3.991a1.186 1.186 0 01-.04.114l-1.188 2.876-.045.095-1.552 3.1-2.713 4.725-1.44 2.203-1.729 2.585-1.219 1.67-2.414 3.228-1.644 2.067-2.428 2.957-1.703 1.992-2.618 2.945-1.684 1.849-4.869 5.085-1.133 1.119.669.569c.946.871 1.835 1.8 2.661 2.787.248.301.488.608.72.921.506.685.962 1.406 1.362 2.158.216.407.409.828.58 1.257.389.985.651 2.026.749 3.078l.044.799c.025 1.53-.255 3.05-.823 4.471a11.057 11.057 0 01-3.479 4.625c-.541.424-1.118.796-1.724 1.117a12.347 12.347 0 01-4.516 1.341h-.01a12.996 12.996 0 01-5.476-.623 11.933 11.933 0 01-2.319-1.096 11.268 11.268 0 01-2.329-1.896 11.06 11.06 0 01-2.209-3.464 11.468 11.468 0 01-.819-3.972l.014-.966c.073-1.119.315-2.221.718-3.267.157-.411.334-.812.531-1.202.386-.755.83-1.477 1.324-2.164.323-.45.667-.887 1.025-1.31a30.309 30.309 0 012.384-2.49l.309-.279.497-.415z"
+ fill="#24175b"
+ />
+ <path
+ d="M71.203 148.661l19.927-16.817a2.035 2.035 0 012.606-.006l20.216 16.823a6.906 6.906 0 004.351 1.55H66.877a6.805 6.805 0 004.326-1.55zm12.404-60.034l.195.057c.063.03.116.075.173.114l.163.144c.402.37.793.759 1.169 1.157.265.283.523.574.771.875.315.38.61.779.879 1.194.116.183.224.368.325.561.088.167.167.34.236.515.122.305.214.627.242.954l-.006.614a3.507 3.507 0 01-1.662 2.732 4.747 4.747 0 01-2.021.665l-.759.022-.641-.056a4.964 4.964 0 01-.881-.214 4.17 4.17 0 01-.834-.391l-.5-.366a3.431 3.431 0 01-1.139-1.952 5.016 5.016 0 01-.059-.387l-.018-.586c.01-.158.034-.315.069-.472.087-.341.213-.673.372-.988.205-.396.439-.776.7-1.137.433-.586.903-1.143 1.405-1.67.324-.342.655-.673 1.001-.993l.246-.221c.171-.114.173-.114.368-.171h.206zM82.348 6.956l.079-.006v68.484l-.171-.315a191.264 191.264 0 01-6.291-12.75 136.318 136.318 0 01-4.269-10.688 84.358 84.358 0 01-2.574-8.802c-.541-2.365-.956-4.765-1.126-7.19a35.028 35.028 0 01-.059-3.108c.016-.903.053-1.804.109-2.705.09-1.418.234-2.832.442-4.235.165-1.104.368-2.205.62-3.293.2-.865.431-1.723.696-2.567.382-1.22.84-2.412 1.373-3.576.195-.419.405-.836.624-1.245 1.322-2.449 3.116-4.704 5.466-6.214a11.422 11.422 0 015.081-1.79zm8.88.173l4.607 1.314a28.193 28.193 0 016.076 3.096 24.387 24.387 0 016.533 6.517 24.618 24.618 0 012.531 4.878 28.586 28.586 0 011.761 7.898c.061.708.096 1.418.11 2.127.016.659.012 1.321-.041 1.98a22.306 22.306 0 01-.828 4.352 34.281 34.281 0 01-1.194 3.426 49.43 49.43 0 01-1.895 4.094c-1.536 2.966-3.304 5.803-5.195 8.547a133.118 133.118 0 01-7.491 9.776 185.466 185.466 0 01-8.987 9.96c2.114-3.963 4.087-8 5.915-12.102a149.96 149.96 0 002.876-6.93 108.799 108.799 0 002.679-7.792 76.327 76.327 0 001.54-5.976c.368-1.727.657-3.472.836-5.228.15-1.464.205-2.937.169-4.406a62.154 62.154 0 00-.1-2.695c-.216-3.612-.765-7.212-1.818-10.676a31.255 31.255 0 00-1.453-3.849c-1.348-2.937-3.23-5.683-5.776-7.686l-.855-.625z"
+ fill="#fff"
+ />
+ <defs>
+ <radialGradient
+ id="_Radial1"
+ cx="0"
+ cy="0"
+ r="1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(88.67 84.848) scale(120.977)"
+ >
+ <stop offset="0" stopColor="#ba7bf0" />
+ <stop offset=".45" stopColor="#996bec" />
+ <stop offset="1" stopColor="#5046e4" />
+ </radialGradient>
+ </defs>
+ </svg>
+ );
+}
diff --git a/packages/icons/src/index.tsx b/packages/icons/src/index.tsx
index a68c1e68e..16e45f192 100644
--- a/packages/icons/src/index.tsx
+++ b/packages/icons/src/index.tsx
@@ -4,3 +4,6 @@ export * from "./google";
export * from "./pagerduty";
export * from "./slack";
export * from "./opsgenie";
+export * from "./fly";
+export * from "./railway";
+export * from "./koyeb";
diff --git a/packages/icons/src/koyeb.tsx b/packages/icons/src/koyeb.tsx
new file mode 100644
index 000000000..56b942c6d
--- /dev/null
+++ b/packages/icons/src/koyeb.tsx
@@ -0,0 +1,29 @@
+export function Koyeb(props: React.ComponentProps<"svg">) {
+ return (
+ <svg
+ width="485"
+ height="480"
+ viewBox="0 0 485 480"
+ fill="none"
+ xmlns="http://www.w3.org/2000/svg"
+ {...props}
+ >
+ <title>Koyeb</title>
+ <path
+ d="M242.171 116.666L484.653 256.284V139.774L242.016 0L0 139.929V256.594L242.171 116.666Z"
+ fill="currentColor"
+ className="fill-[#100F13] dark:fill-white"
+ />
+ <path
+ d="M445.867 396.691L484.653 373.88V302.359L242.016 162.43L0 302.359V374.191L38.785 396.691L242.016 279.095L445.867 396.691Z"
+ fill="currentColor"
+ className="fill-[#100F13] dark:fill-white"
+ />
+ <path
+ d="M242.17 444.471L303.753 479.999L404.91 421.815L242.015 327.805L79.7402 421.815L180.884 479.999L242.17 444.471Z"
+ fill="currentColor"
+ className="fill-[#100F13] dark:fill-white"
+ />
+ </svg>
+ );
+}
diff --git a/packages/icons/src/railway.tsx b/packages/icons/src/railway.tsx
new file mode 100644
index 000000000..28bc7490c
--- /dev/null
+++ b/packages/icons/src/railway.tsx
@@ -0,0 +1,24 @@
+export function Railway(props: React.ComponentProps<"svg">) {
+ return (
+ <svg
+ width="1024"
+ height="1024"
+ viewBox="0 0 1024 1024"
+ fill="none"
+ xmlns="http://www.w3.org/2000/svg"
+ {...props}
+ >
+ <title>Railway</title>
+ <path
+ d="M4.756 438.175A520.713 520.713 0 0 0 0 489.735h777.799c-2.716-5.306-6.365-10.09-10.045-14.772-132.97-171.791-204.498-156.896-306.819-161.26-34.114-1.403-57.249-1.967-193.037-1.967-72.677 0-151.688.185-228.628.39-9.96 26.884-19.566 52.942-24.243 74.14h398.571v51.909H4.756ZM783.93 541.696H.399c.82 13.851 2.112 27.517 3.978 40.999h723.39c32.248 0 50.299-18.297 56.162-40.999ZM45.017 724.306S164.941 1018.77 511.46 1024c207.112 0 385.071-123.006 465.907-299.694H45.017Z"
+ fill="currentColor"
+ className="fill-[#100F13] dark:fill-white"
+ />
+ <path
+ d="M511.454 0C319.953 0 153.311 105.16 65.31 260.612c68.771-.144 202.704-.226 202.704-.226h.031v-.051c158.309 0 164.193.707 195.118 1.998l19.149.706c66.7 2.224 148.683 9.384 213.19 58.19 35.015 26.471 85.571 84.896 115.708 126.52 27.861 38.499 35.876 82.756 16.933 125.158-17.436 38.97-54.952 62.215-100.383 62.215H16.69s4.233 17.944 10.58 37.751h970.632A510.385 510.385 0 0 0 1024 512.218C1024.01 229.355 794.532 0 511.454 0Z"
+ fill="currentColor"
+ className="fill-[#100F13] dark:fill-white"
+ />
+ </svg>
+ );
+}
diff --git a/packages/notifications/email/src/index.ts b/packages/notifications/email/src/index.ts
index 81c4a412b..48140ef59 100644
--- a/packages/notifications/email/src/index.ts
+++ b/packages/notifications/email/src/index.ts
@@ -6,7 +6,7 @@ import {
import type { Region } from "@openstatus/db/src/schema/constants";
import { EmailClient } from "@openstatus/emails/src/client";
-import { flyRegionsDict } from "@openstatus/utils";
+import { regionDict } from "@openstatus/utils";
import { env } from "../env";
const emailClient = new EmailClient({ apiKey: env.RESEND_API_KEY });
@@ -40,7 +40,7 @@ export const sendAlert = async ({
url: monitor.url,
status: statusCode?.toString(),
latency: latency ? `${latency}ms` : "N/A",
- region: region ? flyRegionsDict[region].location : "N/A",
+ region: region ? regionDict[region].location : "N/A",
timestamp: new Date(cronTimestamp).toISOString(),
message,
});
diff --git a/packages/tinybird/src/client.ts b/packages/tinybird/src/client.ts
index 827c5d785..99c784374 100644
--- a/packages/tinybird/src/client.ts
+++ b/packages/tinybird/src/client.ts
@@ -1,6 +1,6 @@
import { Tinybird as Client, NoopTinybird } from "@chronark/zod-bird";
import { z } from "zod";
-import { flyRegions } from "../../db/src/schema/constants";
+import { monitorRegions } from "../../db/src/schema/constants";
import {
headersSchema,
timingPhasesSchema,
@@ -51,7 +51,7 @@ export class OSTinybird {
statusCode: z.number().int().nullable(),
monitorId: z.string(),
error: z.coerce.boolean(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -76,7 +76,7 @@ export class OSTinybird {
statusCode: z.number().int().nullable(),
monitorId: z.string(),
requestStatus: z.enum(["error", "success", "degraded"]).nullable(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -98,7 +98,7 @@ export class OSTinybird {
statusCode: z.number().int().nullable(),
monitorId: z.string(),
error: z.coerce.boolean(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -123,7 +123,7 @@ export class OSTinybird {
statusCode: z.number().int().nullable(),
monitorId: z.string(),
requestStatus: z.enum(["error", "success", "degraded"]).nullable(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -145,7 +145,7 @@ export class OSTinybird {
statusCode: z.number().int().nullable(),
monitorId: z.string(),
error: z.coerce.boolean(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -170,7 +170,7 @@ export class OSTinybird {
statusCode: z.number().int().nullable(),
monitorId: z.string(),
requestStatus: z.enum(["error", "success", "degraded"]).nullable(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -184,7 +184,7 @@ export class OSTinybird {
return this.tb.buildPipe({
pipe: "endpoint__http_metrics_1d__v0",
parameters: z.object({
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
interval: z.number().int().optional(),
monitorId: z.string(),
}),
@@ -207,7 +207,7 @@ export class OSTinybird {
pipe: "endpoint__http_metrics_1d__v1",
parameters: z.object({
interval: z.number().int().optional(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
monitorId: z.string(),
}),
data: z.object({
@@ -230,7 +230,7 @@ export class OSTinybird {
return this.tb.buildPipe({
pipe: "endpoint__http_metrics_7d__v0",
parameters: z.object({
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
interval: z.number().int().optional(),
monitorId: z.string(),
}),
@@ -253,7 +253,7 @@ export class OSTinybird {
pipe: "endpoint__http_metrics_7d__v1",
parameters: z.object({
interval: z.number().int().optional(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
monitorId: z.string(),
}),
data: z.object({
@@ -276,7 +276,7 @@ export class OSTinybird {
return this.tb.buildPipe({
pipe: "endpoint__http_metrics_14d__v0",
parameters: z.object({
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
interval: z.number().int().optional(),
monitorId: z.string(),
}),
@@ -299,7 +299,7 @@ export class OSTinybird {
pipe: "endpoint__http_metrics_14d__v1",
parameters: z.object({
interval: z.number().int().optional(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
monitorId: z.string(),
}),
data: z.object({
@@ -326,7 +326,7 @@ export class OSTinybird {
monitorId: z.string(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number().int(),
p50Latency: z.number().nullable().default(0),
p75Latency: z.number().nullable().default(0),
@@ -346,7 +346,7 @@ export class OSTinybird {
monitorId: z.string(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number().int(),
p50Latency: z.number().nullable().default(0),
p75Latency: z.number().nullable().default(0),
@@ -366,7 +366,7 @@ export class OSTinybird {
monitorId: z.string(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number().int(),
p50Latency: z.number().nullable().default(0),
p75Latency: z.number().nullable().default(0),
@@ -383,10 +383,10 @@ export class OSTinybird {
pipe: "endpoint__http_metrics_by_region_1d__v0",
parameters: z.object({
monitorId: z.string(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
count: z.number().int(),
ok: z.number().int(),
p50Latency: z.number().nullable().default(0),
@@ -404,10 +404,10 @@ export class OSTinybird {
pipe: "endpoint__http_metrics_by_region_7d__v0",
parameters: z.object({
monitorId: z.string(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
count: z.number().int(),
ok: z.number().int(),
p50Latency: z.number().nullable().default(0),
@@ -425,10 +425,10 @@ export class OSTinybird {
pipe: "endpoint__http_metrics_by_region_14d__v0",
parameters: z.object({
monitorId: z.string(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
count: z.number().int(),
ok: z.number().int(),
p50Latency: z.number().nullable().default(0),
@@ -518,7 +518,7 @@ export class OSTinybird {
monitorId: z.string(),
url: z.string().url(),
error: z.coerce.boolean(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
message: z.string().nullable(),
headers: headersSchema,
@@ -540,7 +540,7 @@ export class OSTinybird {
pipe: "endpoint__http_get_30d__v0",
parameters: z.object({
monitorId: z.string(),
- region: z.enum(flyRegions).optional(),
+ region: z.enum(monitorRegions).optional(),
cronTimestamp: z.number().int().optional(),
}),
data: z.object({
@@ -550,7 +550,7 @@ export class OSTinybird {
monitorId: z.string(),
url: z.string().url(),
error: z.coerce.boolean(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
message: z.string().nullable(),
headers: headersSchema,
@@ -583,7 +583,7 @@ export class OSTinybird {
.number()
.default(0)
.transform((val) => val !== 0),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number().int().optional(),
message: z.string().nullable().optional(),
timing: timingSchema,
@@ -605,7 +605,7 @@ export class OSTinybird {
latency: z.number().int(),
monitorId: z.coerce.string(),
error: z.coerce.boolean(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -629,7 +629,7 @@ export class OSTinybird {
latency: z.number().int(),
monitorId: z.coerce.string(),
requestStatus: z.enum(["error", "success", "degraded"]).nullable(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -649,7 +649,7 @@ export class OSTinybird {
latency: z.number().int(),
monitorId: z.coerce.string(),
error: z.coerce.boolean(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -673,7 +673,7 @@ export class OSTinybird {
latency: z.number().int(),
monitorId: z.coerce.string(),
requestStatus: z.enum(["error", "success", "degraded"]).nullable(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -693,7 +693,7 @@ export class OSTinybird {
latency: z.number().int(),
monitorId: z.coerce.string(),
error: z.coerce.boolean(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -717,7 +717,7 @@ export class OSTinybird {
latency: z.number().int(),
monitorId: z.coerce.string(),
requestStatus: z.enum(["error", "success", "degraded"]).nullable(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -730,7 +730,7 @@ export class OSTinybird {
return this.tb.buildPipe({
pipe: "endpoint__tcp_metrics_1d__v0",
parameters: z.object({
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
interval: z.number().int().optional(),
monitorId: z.string(),
}),
@@ -753,7 +753,7 @@ export class OSTinybird {
pipe: "endpoint__tcp_metrics_1d__v1",
parameters: z.object({
interval: z.number().int().optional(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
monitorId: z.string(),
}),
data: z.object({
@@ -777,7 +777,7 @@ export class OSTinybird {
pipe: "endpoint__tcp_metrics_7d__v0",
parameters: z.object({
interval: z.number().int().optional(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
monitorId: z.string(),
}),
data: z.object({
@@ -799,7 +799,7 @@ export class OSTinybird {
pipe: "endpoint__tcp_metrics_7d__v1",
parameters: z.object({
interval: z.number().int().optional(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
monitorId: z.string(),
}),
data: z.object({
@@ -822,7 +822,7 @@ export class OSTinybird {
return this.tb.buildPipe({
pipe: "endpoint__tcp_metrics_14d__v0",
parameters: z.object({
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
interval: z.number().int().optional(),
monitorId: z.string(),
}),
@@ -845,7 +845,7 @@ export class OSTinybird {
pipe: "endpoint__tcp_metrics_14d__v1",
parameters: z.object({
interval: z.number().int().optional(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
monitorId: z.string(),
}),
data: z.object({
@@ -868,12 +868,12 @@ export class OSTinybird {
return this.tb.buildPipe({
pipe: "endpoint__tcp_metrics_by_interval_1d__v0",
parameters: z.object({
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
interval: z.number().int().optional(),
monitorId: z.string(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number().int(),
p50Latency: z.number().nullable().default(0),
p75Latency: z.number().nullable().default(0),
@@ -889,12 +889,12 @@ export class OSTinybird {
return this.tb.buildPipe({
pipe: "endpoint__tcp_metrics_by_interval_7d__v0",
parameters: z.object({
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
interval: z.number().int().optional(),
monitorId: z.string(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number().int(),
p50Latency: z.number().nullable().default(0),
p75Latency: z.number().nullable().default(0),
@@ -910,12 +910,12 @@ export class OSTinybird {
return this.tb.buildPipe({
pipe: "endpoint__tcp_metrics_by_interval_14d__v0",
parameters: z.object({
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
interval: z.number().int().optional(),
monitorId: z.string(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number().int(),
p50Latency: z.number().nullable().default(0),
p75Latency: z.number().nullable().default(0),
@@ -932,10 +932,10 @@ export class OSTinybird {
pipe: "endpoint__tcp_metrics_by_region_1d__v0",
parameters: z.object({
monitorId: z.string(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
count: z.number().int(),
ok: z.number().int(),
p50Latency: z.number().nullable().default(0),
@@ -953,10 +953,10 @@ export class OSTinybird {
pipe: "endpoint__tcp_metrics_by_region_7d__v0",
parameters: z.object({
monitorId: z.string(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
count: z.number().int(),
ok: z.number().int(),
p50Latency: z.number().nullable().default(0),
@@ -974,10 +974,10 @@ export class OSTinybird {
pipe: "endpoint__tcp_metrics_by_region_14d__v0",
parameters: z.object({
monitorId: z.string(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
count: z.number().int(),
ok: z.number().int(),
p50Latency: z.number().nullable().default(0),
@@ -1099,7 +1099,7 @@ export class OSTinybird {
latency: z.number().int(),
monitorId: z.coerce.string(),
error: z.coerce.boolean(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -1116,7 +1116,7 @@ export class OSTinybird {
pipe: "endpoint__tcp_get_30d__v0",
parameters: z.object({
monitorId: z.string(),
- region: z.enum(flyRegions).optional(),
+ region: z.enum(monitorRegions).optional(),
cronTimestamp: z.number().int().optional(),
}),
data: z.object({
@@ -1124,7 +1124,7 @@ export class OSTinybird {
latency: z.number().int(),
monitorId: z.string(),
error: z.coerce.boolean(),
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
cronTimestamp: z.number().int(),
trigger: z.enum(triggers).nullable().default("cron"),
timestamp: z.number(),
@@ -1149,7 +1149,7 @@ export class OSTinybird {
regions: z.string().array().optional(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number().int(),
p50Latency: z.number().nullable().default(0),
p75Latency: z.number().nullable().default(0),
@@ -1170,7 +1170,7 @@ export class OSTinybird {
regions: z.string().array().optional(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number().int(),
p50Latency: z.number().nullable().default(0),
p75Latency: z.number().nullable().default(0),
@@ -1191,7 +1191,7 @@ export class OSTinybird {
regions: z.string().array().optional(),
}),
data: z.object({
- region: z.enum(flyRegions),
+ region: z.enum(monitorRegions),
timestamp: z.number().int(),
p50Latency: z.number().nullable().default(0),
p75Latency: z.number().nullable().default(0),
@@ -1210,7 +1210,7 @@ export class OSTinybird {
monitorId: z.string(),
fromDate: z.string().optional(),
toDate: z.string().optional(),
- regions: z.enum(flyRegions).array().optional(),
+ regions: z.enum(monitorRegions).array().optional(),
interval: z.number().int().optional(),
}),
data: z.object({
@@ -1229,7 +1229,7 @@ export class OSTinybird {
monitorId: z.string(),
fromDate: z.string().optional(),
toDate: z.string().optional(),
- regions: z.enum(flyRegions).array().optional(),
+ regions: z.enum(monitorRegions).array().optional(),
interval: z.number().int().optional(),
}),
data: z.object({
@@ -1248,7 +1248,7 @@ export class OSTinybird {
monitorId: z.string(),
fromDate: z.string().optional(),
toDate: z.string().optional(),
- regions: z.enum(flyRegions).array().optional(),
+ regions: z.enum(monitorRegions).array().optional(),
interval: z.number().int().optional(),
}),
data: z.object({
@@ -1267,7 +1267,7 @@ export class OSTinybird {
monitorId: z.string(),
fromDate: z.string().optional(),
toDate: z.string().optional(),
- regions: z.enum(flyRegions).array().optional(),
+ regions: z.enum(monitorRegions).array().optional(),
interval: z.number().int().optional(),
}),
data: z.object({
@@ -1353,7 +1353,7 @@ export class OSTinybird {
parameters: z.object({
monitorId: z.string(),
interval: z.number().int().optional(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
}),
data: z.object({
timestamp: z.number().int(),
@@ -1444,7 +1444,7 @@ export class OSTinybird {
pipe: "endpoint__tcp_metrics_latency_1d__v1",
parameters: z.object({
monitorId: z.string(),
- regions: z.array(z.enum(flyRegions)).optional(),
+ regions: z.array(z.enum(monitorRegions)).optional(),
}),
data: z.object({
timestamp: z.number().int(),
diff --git a/packages/utils/index.ts b/packages/utils/index.ts
index de7a06d0e..2487040c0 100644
--- a/packages/utils/index.ts
+++ b/packages/utils/index.ts
@@ -3,7 +3,7 @@
* https://vercel.com/docs/concepts/edge-network/regions#region-list
*/
-import type { MonitorFlyRegion } from "@openstatus/db/src/schema/constants";
+import type { Region } from "@openstatus/db/src/schema/constants";
import { base } from "@openstatus/assertions";
import { monitorMethods, monitorStatus } from "@openstatus/db/src/schema";
@@ -138,10 +138,11 @@ export type Continent =
| "Oceania";
export type RegionInfo = {
- code: MonitorFlyRegion;
+ code: Region;
location: string;
flag: string;
continent: Continent;
+ provider: "fly" | "koyeb" | "railway";
};
// TODO: we could think of doing the inverse and use "EU" as key
@@ -154,18 +155,20 @@ export const continentDict: Record<Continent, { code: string }> = {
Oceania: { code: "OC" },
};
-export const flyRegionsDict: Record<MonitorFlyRegion, RegionInfo> = {
+export const regionDict: Record<Region, RegionInfo> = {
ams: {
code: "ams",
location: "Amsterdam, Netherlands",
flag: "๐Ÿ‡ณ๐Ÿ‡ฑ",
continent: "Europe",
+ provider: "fly",
},
arn: {
code: "arn",
location: "Stockholm, Sweden",
flag: "๐Ÿ‡ธ๐Ÿ‡ช",
continent: "Europe",
+ provider: "fly",
},
atl: {
@@ -173,224 +176,280 @@ export const flyRegionsDict: Record<MonitorFlyRegion, RegionInfo> = {
location: "Atlanta, Georgia, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "fly",
},
bog: {
code: "bog",
location: "Bogotรก, Colombia",
flag: "๐Ÿ‡จ๐Ÿ‡ด",
continent: "South America",
+ provider: "fly",
},
bom: {
code: "bom",
location: "Mumbai, India",
flag: "๐Ÿ‡ฎ๐Ÿ‡ณ",
continent: "Asia",
+ provider: "fly",
},
bos: {
code: "bos",
location: "Boston, Massachusetts, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "fly",
},
cdg: {
code: "cdg",
location: "Paris, France",
flag: "๐Ÿ‡ซ๐Ÿ‡ท",
continent: "Europe",
+ provider: "fly",
},
den: {
code: "den",
location: "Denver, Colorado, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "fly",
},
dfw: {
code: "dfw",
location: "Dallas, Texas, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "fly",
},
ewr: {
code: "ewr",
location: "Secaucus, New Jersey, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "fly",
},
eze: {
code: "eze",
location: "Ezeiza, Argentina",
flag: "๐Ÿ‡ฆ๐Ÿ‡ท",
continent: "South America",
+ provider: "fly",
},
fra: {
code: "fra",
location: "Frankfurt, Germany",
flag: "๐Ÿ‡ฉ๐Ÿ‡ช",
continent: "Europe",
+ provider: "fly",
},
gdl: {
code: "gdl",
location: "Guadalajara, Mexico",
flag: "๐Ÿ‡ฒ๐Ÿ‡ฝ",
continent: "North America",
+ provider: "fly",
},
gig: {
code: "gig",
location: "Rio de Janeiro, Brazil",
flag: "๐Ÿ‡ง๐Ÿ‡ท",
continent: "South America",
+ provider: "fly",
},
gru: {
code: "gru",
location: "Sao Paulo, Brazil",
flag: "๐Ÿ‡ง๐Ÿ‡ท",
continent: "South America",
+ provider: "fly",
},
hkg: {
code: "hkg",
location: "Hong Kong, Hong Kong",
flag: "๐Ÿ‡ญ๐Ÿ‡ฐ",
continent: "Asia",
+ provider: "fly",
},
iad: {
code: "iad",
location: "Ashburn, Virginia, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "fly",
},
jnb: {
code: "jnb",
location: "Johannesburg, South Africa",
flag: "๐Ÿ‡ฟ๐Ÿ‡ฆ",
continent: "Africa",
+ provider: "fly",
},
lax: {
code: "lax",
location: "Los Angeles, California, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "fly",
},
lhr: {
code: "lhr",
location: "London, United Kingdom",
flag: "๐Ÿ‡ฌ๐Ÿ‡ง",
continent: "Europe",
+ provider: "fly",
},
mad: {
code: "mad",
location: "Madrid, Spain",
flag: "๐Ÿ‡ช๐Ÿ‡ธ",
continent: "Europe",
+ provider: "fly",
},
mia: {
code: "mia",
location: "Miami, Florida, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "fly",
},
nrt: {
code: "nrt",
location: "Tokyo, Japan",
flag: "๐Ÿ‡ฏ๐Ÿ‡ต",
continent: "Asia",
+ provider: "fly",
},
ord: {
code: "ord",
location: "Chicago, Illinois, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "fly",
},
otp: {
code: "otp",
location: "Bucharest, Romania",
flag: "๐Ÿ‡ท๐Ÿ‡ด",
continent: "Europe",
+ provider: "fly",
},
phx: {
code: "phx",
location: "Phoenix, Arizona, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "fly",
},
qro: {
code: "qro",
location: "Querรฉtaro, Mexico",
flag: "๐Ÿ‡ฒ๐Ÿ‡ฝ",
continent: "North America",
+ provider: "fly",
},
scl: {
code: "scl",
location: "Santiago, Chile",
flag: "๐Ÿ‡จ๐Ÿ‡ฑ",
continent: "South America",
+ provider: "fly",
},
sjc: {
code: "sjc",
location: "San Jose, California, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "fly",
},
sea: {
code: "sea",
location: "Seattle, Washington, USA",
flag: "๐Ÿ‡บ๐Ÿ‡ธ",
continent: "North America",
+ provider: "fly",
},
sin: {
code: "sin",
location: "Singapore, Singapore",
flag: "๐Ÿ‡ธ๐Ÿ‡ฌ",
continent: "Asia",
+ provider: "fly",
},
syd: {
code: "syd",
location: "Sydney, Australia",
flag: "๐Ÿ‡ฆ๐Ÿ‡บ",
continent: "Oceania",
+ provider: "fly",
},
waw: {
code: "waw",
location: "Warsaw, Poland",
flag: "๐Ÿ‡ต๐Ÿ‡ฑ",
continent: "Europe",
+ provider: "fly",
},
yul: {
code: "yul",
location: "Montreal, Canada",
flag: "๐Ÿ‡จ๐Ÿ‡ฆ",
continent: "North America",
+ provider: "fly",
},
yyz: {
code: "yyz",
location: "Toronto, Canada",
flag: "๐Ÿ‡จ๐Ÿ‡ฆ",
continent: "North America",
+ provider: "fly",
+ },
+ koyeb_fra: {
+ code: "koyeb_fra",
+ location: "Frankfurt, Germany",
+ flag: "๐Ÿ‡ฉ๐Ÿ‡ช",
+ continent: "Europe",
+ provider: "koyeb",
+ },
+ koyeb_par: {
+ code: "koyeb_par",
+ location: "Paris, France",
+ flag: "๐Ÿ‡ซ๐Ÿ‡ท",
+ continent: "Europe",
+ provider: "koyeb",
+ },
+ koyeb_sfo: {
+ code: "koyeb_sfo",
+ location: "San Francisco, USA",
+ flag: "๐Ÿ‡บ๐Ÿ‡ธ",
+ continent: "North America",
+ provider: "koyeb",
+ },
+ koyeb_sin: {
+ code: "koyeb_sin",
+ location: "Singapore, Singapore",
+ flag: "๐Ÿ‡ธ๐Ÿ‡ฌ",
+ continent: "Asia",
+ provider: "koyeb",
+ },
+ koyeb_tyo: {
+ code: "koyeb_tyo",
+ location: "Tokyo, Japan",
+ flag: "๐Ÿ‡ฏ๐Ÿ‡ต",
+ continent: "Asia",
+ provider: "koyeb",
+ },
+ koyeb_was: {
+ code: "koyeb_was",
+ location: "Washington, USA",
+ flag: "๐Ÿ‡บ๐Ÿ‡ธ",
+ continent: "North America",
+ provider: "koyeb",
},
} as const;
// const r = t.flatMap((u) => u[1].continent);
-export const groupByContinent = Object.entries(flyRegionsDict).reduce<
- Record<
- | "Europe"
- | "North America"
- | "South America"
- | "Asia"
- | "Africa"
- | "Oceania",
- {
- code: MonitorFlyRegion;
- location: string;
- flag: string;
- continent:
- | "Europe"
- | "North America"
- | "South America"
- | "Asia"
- | "Africa"
- | "Oceania";
- }[]
- >
+export const groupByContinent = Object.entries(regionDict).reduce<
+ Record<Continent, RegionInfo[]>
>(
(acc, [_key, value]) => {
Object.assign(acc, {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6342e88f0..80b1fbe5b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -187,7 +187,7 @@ importers:
'@sentry/nextjs':
specifier: 8.46.0
'@stripe/stripe-js':
specifier: 2.1.6
version: 2.1.6
@@ -202,7 +202,7 @@ importers:
'@trpc/next':
specifier: 11.4.4
'@trpc/react-query':
specifier: 11.4.4
@@ -650,7 +650,7 @@ importers:
'@sentry/nextjs':
specifier: 8.46.0
'@stripe/stripe-js':
specifier: 2.1.6
version: 2.1.6
@@ -665,7 +665,7 @@ importers:
'@trpc/next':
specifier: 11.4.4
'@trpc/react-query':
specifier: 11.4.4
@@ -826,6 +826,9 @@ importers:
'@openstatus/header-analysis':
specifier: workspace:*
version: link:../../packages/header-analysis
+ '@openstatus/icons':
+ specifier: workspace:*
+ version: link:../../packages/icons
'@openstatus/notification-discord':
specifier: workspace:*
version: link:../../packages/notifications/discord
@@ -16336,7 +16339,7 @@ snapshots:
'@sentry/types': 8.9.2
'@sentry/utils': 8.9.2
dependencies:
'@opentelemetry/api': 1.9.0
'@opentelemetry/semantic-conventions': 1.28.0
@@ -16347,7 +16350,7 @@ snapshots:
'@sentry/opentelemetry': 8.46.0(@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected])
'@sentry/react': 8.46.0([email protected])
'@sentry/vercel-edge': 8.46.0
- '@sentry/webpack-plugin': 2.22.7([email protected])([email protected])
+ '@sentry/webpack-plugin': 2.22.7([email protected])([email protected]([email protected]))
chalk: 3.0.0
resolve: 1.22.8
@@ -16362,7 +16365,7 @@ snapshots:
- supports-color
- webpack
dependencies:
'@opentelemetry/api': 1.9.0
'@opentelemetry/semantic-conventions': 1.28.0
@@ -16373,7 +16376,7 @@ snapshots:
'@sentry/opentelemetry': 8.46.0(@opentelemetry/[email protected])(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected](@opentelemetry/[email protected]))(@opentelemetry/[email protected])
'@sentry/react': 8.46.0([email protected])
'@sentry/vercel-edge': 8.46.0
- '@sentry/webpack-plugin': 2.22.7([email protected])([email protected]([email protected]))
+ '@sentry/webpack-plugin': 2.22.7([email protected])([email protected])
chalk: 3.0.0
resolve: 1.22.8
@@ -17126,7 +17129,7 @@ snapshots:
'@tanstack/react-query': 5.80.7([email protected])
dependencies:
'@trpc/server': 11.4.4([email protected])