Skip to content

Open-source status page, incident response and uptime monitoring

chore: prefix fly region with fly (#1794)

Thibault Le Ouaye23ea3f7088f
diff --git a/apps/server/src/routes/rpc/services/monitor/__tests__/monitor.test.ts b/apps/server/src/routes/rpc/services/monitor/__tests__/monitor.test.ts
index 76d2746f1..0cb456e9e 100644
--- a/apps/server/src/routes/rpc/services/monitor/__tests__/monitor.test.ts
+++ b/apps/server/src/routes/rpc/services/monitor/__tests__/monitor.test.ts
@@ -1179,7 +1179,7 @@ describe("MonitorService - Validation", () => {
url: "https://test-valid-regions.example.com",
periodicity: "PERIODICITY_5M",
method: "HTTP_METHOD_GET",
- regions: ["REGION_AMS", "REGION_IAD", "REGION_SIN"],
+ regions: ["REGION_FLY_AMS", "REGION_FLY_IAD", "REGION_FLY_SIN"],
},
},
{ "x-openstatus-key": "1" },
@@ -1189,9 +1189,9 @@ describe("MonitorService - Validation", () => {
const data = await res.json();
expect(data.monitor).toBeDefined();
expect(data.monitor.regions).toEqual([
- "REGION_AMS",
- "REGION_IAD",
- "REGION_SIN",
+ "REGION_FLY_AMS",
+ "REGION_FLY_IAD",
+ "REGION_FLY_SIN",
]);
// Clean up
@@ -1468,14 +1468,14 @@ describe("MonitorService - Limits", () => {
periodicity: "PERIODICITY_10M",
method: "HTTP_METHOD_GET",
regions: [
- "REGION_AMS",
- "REGION_IAD",
- "REGION_SIN",
- "REGION_LHR",
- "REGION_SYD",
- "REGION_NRT",
- "REGION_FRA",
- "REGION_GRU",
+ "REGION_FLY_AMS",
+ "REGION_FLY_IAD",
+ "REGION_FLY_SIN",
+ "REGION_FLY_LHR",
+ "REGION_FLY_SYD",
+ "REGION_FLY_NRT",
+ "REGION_FLY_FRA",
+ "REGION_FLY_GRU",
],
},
},
@@ -1741,13 +1741,13 @@ describe("MonitorService.GetMonitorStatus", () => {
// Find each region and verify status
const amsRegion = regions.find(
- (r: { region: string }) => r.region === "REGION_AMS",
+ (r: { region: string }) => r.region === "REGION_FLY_AMS",
);
const iadRegion = regions.find(
- (r: { region: string }) => r.region === "REGION_IAD",
+ (r: { region: string }) => r.region === "REGION_FLY_IAD",
);
const fraRegion = regions.find(
- (r: { region: string }) => r.region === "REGION_FRA",
+ (r: { region: string }) => r.region === "REGION_FLY_FRA",
);
expect(amsRegion).toBeDefined();
@@ -1774,7 +1774,7 @@ describe("MonitorService.GetMonitorStatus", () => {
// lhr has a status entry but is not in the monitor's configured regions
const lhrRegion = regions.find(
- (r: { region: string }) => r.region === "REGION_LHR",
+ (r: { region: string }) => r.region === "REGION_FLY_LHR",
);
expect(lhrRegion).toBeUndefined();
});
@@ -1964,7 +1964,7 @@ describe("MonitorService.GetMonitorSummary", () => {
"GetMonitorSummary",
{
id: String(testMonitorWithStatusId),
- regions: ["REGION_AMS", "REGION_IAD"],
+ regions: ["REGION_FLY_AMS", "REGION_FLY_IAD"],
},
{ "x-openstatus-key": "1" },
);
@@ -1975,8 +1975,8 @@ describe("MonitorService.GetMonitorSummary", () => {
expect(data.regions).toBeDefined();
expect(Array.isArray(data.regions)).toBe(true);
// Should return the requested regions
- expect(data.regions).toContain("REGION_AMS");
- expect(data.regions).toContain("REGION_IAD");
+ expect(data.regions).toContain("REGION_FLY_AMS");
+ expect(data.regions).toContain("REGION_FLY_IAD");
expect(data.regions).toHaveLength(2);
});
@@ -1992,9 +1992,9 @@ describe("MonitorService.GetMonitorSummary", () => {
const data = await res.json();
expect(data.regions).toBeDefined();
// Monitor has regions: "ams,iad,fra"
- expect(data.regions).toContain("REGION_AMS");
- expect(data.regions).toContain("REGION_IAD");
- expect(data.regions).toContain("REGION_FRA");
+ expect(data.regions).toContain("REGION_FLY_AMS");
+ expect(data.regions).toContain("REGION_FLY_IAD");
+ expect(data.regions).toContain("REGION_FLY_FRA");
});
test("returns 404 for non-existent monitor", async () => {
diff --git a/apps/server/src/routes/rpc/services/monitor/converters/regions.ts b/apps/server/src/routes/rpc/services/monitor/converters/regions.ts
index 6ce0386e0..7bb6fc66e 100644
--- a/apps/server/src/routes/rpc/services/monitor/converters/regions.ts
+++ b/apps/server/src/routes/rpc/services/monitor/converters/regions.ts
@@ -6,24 +6,24 @@ import { AVAILABLE_REGIONS } from "@openstatus/regions";
*/
const DB_TO_REGION: Record<string, Region> = {
// Fly.io regions
- ams: Region.AMS,
- arn: Region.ARN,
- bom: Region.BOM,
- cdg: Region.CDG,
- dfw: Region.DFW,
- ewr: Region.EWR,
- fra: Region.FRA,
- gru: Region.GRU,
- iad: Region.IAD,
- jnb: Region.JNB,
- lax: Region.LAX,
- lhr: Region.LHR,
- nrt: Region.NRT,
- ord: Region.ORD,
- sjc: Region.SJC,
- sin: Region.SIN,
- syd: Region.SYD,
- yyz: Region.YYZ,
+ ams: Region.FLY_AMS,
+ arn: Region.FLY_ARN,
+ bom: Region.FLY_BOM,
+ cdg: Region.FLY_CDG,
+ dfw: Region.FLY_DFW,
+ ewr: Region.FLY_EWR,
+ fra: Region.FLY_FRA,
+ gru: Region.FLY_GRU,
+ iad: Region.FLY_IAD,
+ jnb: Region.FLY_JNB,
+ lax: Region.FLY_LAX,
+ lhr: Region.FLY_LHR,
+ nrt: Region.FLY_NRT,
+ ord: Region.FLY_ORD,
+ sjc: Region.FLY_SJC,
+ sin: Region.FLY_SIN,
+ syd: Region.FLY_SYD,
+ yyz: Region.FLY_YYZ,
// Koyeb regions
koyeb_fra: Region.KOYEB_FRA,
koyeb_par: Region.KOYEB_PAR,
@@ -43,24 +43,24 @@ const DB_TO_REGION: Record<string, Region> = {
*/
const REGION_TO_DB: Record<Region, string> = {
// Fly.io regions
- [Region.AMS]: "ams",
- [Region.ARN]: "arn",
- [Region.BOM]: "bom",
- [Region.CDG]: "cdg",
- [Region.DFW]: "dfw",
- [Region.EWR]: "ewr",
- [Region.FRA]: "fra",
- [Region.GRU]: "gru",
- [Region.IAD]: "iad",
- [Region.JNB]: "jnb",
- [Region.LAX]: "lax",
- [Region.LHR]: "lhr",
- [Region.NRT]: "nrt",
- [Region.ORD]: "ord",
- [Region.SJC]: "sjc",
- [Region.SIN]: "sin",
- [Region.SYD]: "syd",
- [Region.YYZ]: "yyz",
+ [Region.FLY_AMS]: "ams",
+ [Region.FLY_ARN]: "arn",
+ [Region.FLY_BOM]: "bom",
+ [Region.FLY_CDG]: "cdg",
+ [Region.FLY_DFW]: "dfw",
+ [Region.FLY_EWR]: "ewr",
+ [Region.FLY_FRA]: "fra",
+ [Region.FLY_GRU]: "gru",
+ [Region.FLY_IAD]: "iad",
+ [Region.FLY_JNB]: "jnb",
+ [Region.FLY_LAX]: "lax",
+ [Region.FLY_LHR]: "lhr",
+ [Region.FLY_NRT]: "nrt",
+ [Region.FLY_ORD]: "ord",
+ [Region.FLY_SJC]: "sjc",
+ [Region.FLY_SIN]: "sin",
+ [Region.FLY_SYD]: "syd",
+ [Region.FLY_YYZ]: "yyz",
// Koyeb regions
[Region.KOYEB_FRA]: "koyeb_fra",
[Region.KOYEB_PAR]: "koyeb_par",
diff --git a/packages/proto/api/openstatus/monitor/v1/monitor.proto b/packages/proto/api/openstatus/monitor/v1/monitor.proto
index eacd2185d..31051a48e 100644
--- a/packages/proto/api/openstatus/monitor/v1/monitor.proto
+++ b/packages/proto/api/openstatus/monitor/v1/monitor.proto
@@ -31,24 +31,24 @@ enum Periodicity {
enum Region {
REGION_UNSPECIFIED = 0;
// Fly.io regions
- REGION_AMS = 1; // Amsterdam, Netherlands
- REGION_ARN = 2; // Stockholm, Sweden
- REGION_BOM = 3; // Mumbai, India
- REGION_CDG = 4; // Paris, France
- REGION_DFW = 5; // Dallas, USA
- REGION_EWR = 6; // Newark, USA
- REGION_FRA = 7; // Frankfurt, Germany
- REGION_GRU = 8; // São Paulo, Brazil
- REGION_IAD = 9; // Ashburn, USA
- REGION_JNB = 10; // Johannesburg, South Africa
- REGION_LAX = 11; // Los Angeles, USA
- REGION_LHR = 12; // London, UK
- REGION_NRT = 13; // Tokyo, Japan
- REGION_ORD = 14; // Chicago, USA
- REGION_SJC = 15; // San Jose, USA
- REGION_SIN = 16; // Singapore
- REGION_SYD = 17; // Sydney, Australia
- REGION_YYZ = 18; // Toronto, Canada
+ REGION_FLY_AMS = 1; // Amsterdam, Netherlands
+ REGION_FLY_ARN = 2; // Stockholm, Sweden
+ REGION_FLY_BOM = 3; // Mumbai, India
+ REGION_FLY_CDG = 4; // Paris, France
+ REGION_FLY_DFW = 5; // Dallas, USA
+ REGION_FLY_EWR = 6; // Newark, USA
+ REGION_FLY_FRA = 7; // Frankfurt, Germany
+ REGION_FLY_GRU = 8; // São Paulo, Brazil
+ REGION_FLY_IAD = 9; // Ashburn, USA
+ REGION_FLY_JNB = 10; // Johannesburg, South Africa
+ REGION_FLY_LAX = 11; // Los Angeles, USA
+ REGION_FLY_LHR = 12; // London, UK
+ REGION_FLY_NRT = 13; // Tokyo, Japan
+ REGION_FLY_ORD = 14; // Chicago, USA
+ REGION_FLY_SJC = 15; // San Jose, USA
+ REGION_FLY_SIN = 16; // Singapore
+ REGION_FLY_SYD = 17; // Sydney, Australia
+ REGION_FLY_YYZ = 18; // Toronto, Canada
// Koyeb regions
REGION_KOYEB_FRA = 19; // Koyeb Frankfurt
REGION_KOYEB_PAR = 20; // Koyeb Paris
diff --git a/packages/proto/gen/ts/openstatus/monitor/v1/monitor_pb.ts b/packages/proto/gen/ts/openstatus/monitor/v1/monitor_pb.ts
index a21f50816..cf7f822d9 100644
--- a/packages/proto/gen/ts/openstatus/monitor/v1/monitor_pb.ts
+++ b/packages/proto/gen/ts/openstatus/monitor/v1/monitor_pb.ts
@@ -9,7 +9,7 @@ import { enumDesc, fileDesc } from "@bufbuild/protobuf/codegenv2";
* Describes the file openstatus/monitor/v1/monitor.proto.
*/
export const file_openstatus_monitor_v1_monitor: GenFile = /*@__PURE__*/
- fileDesc("CiNvcGVuc3RhdHVzL21vbml0b3IvdjEvbW9uaXRvci5wcm90bxIVb3BlbnN0YXR1cy5tb25pdG9yLnYxKoEBCg1Nb25pdG9yU3RhdHVzEh4KGk1PTklUT1JfU1RBVFVTX1VOU1BFQ0lGSUVEEAASGQoVTU9OSVRPUl9TVEFUVVNfQUNUSVZFEAESGwoXTU9OSVRPUl9TVEFUVVNfREVHUkFERUQQAhIYChRNT05JVE9SX1NUQVRVU19FUlJPUhADKqUBCgtQZXJpb2RpY2l0eRIbChdQRVJJT0RJQ0lUWV9VTlNQRUNJRklFRBAAEhMKD1BFUklPRElDSVRZXzMwUxABEhIKDlBFUklPRElDSVRZXzFNEAISEgoOUEVSSU9ESUNJVFlfNU0QAxITCg9QRVJJT0RJQ0lUWV8xME0QBBITCg9QRVJJT0RJQ0lUWV8zME0QBRISCg5QRVJJT0RJQ0lUWV8xSBAGKsMECgZSZWdpb24SFgoSUkVHSU9OX1VOU1BFQ0lGSUVEEAASDgoKUkVHSU9OX0FNUxABEg4KClJFR0lPTl9BUk4QAhIOCgpSRUdJT05fQk9NEAMSDgoKUkVHSU9OX0NERxAEEg4KClJFR0lPTl9ERlcQBRIOCgpSRUdJT05fRVdSEAYSDgoKUkVHSU9OX0ZSQRAHEg4KClJFR0lPTl9HUlUQCBIOCgpSRUdJT05fSUFEEAkSDgoKUkVHSU9OX0pOQhAKEg4KClJFR0lPTl9MQVgQCxIOCgpSRUdJT05fTEhSEAwSDgoKUkVHSU9OX05SVBANEg4KClJFR0lPTl9PUkQQDhIOCgpSRUdJT05fU0pDEA8SDgoKUkVHSU9OX1NJThAQEg4KClJFR0lPTl9TWUQQERIOCgpSRUdJT05fWVlaEBISFAoQUkVHSU9OX0tPWUVCX0ZSQRATEhQKEFJFR0lPTl9LT1lFQl9QQVIQFBIUChBSRUdJT05fS09ZRUJfU0ZPEBUSFAoQUkVHSU9OX0tPWUVCX1NJThAWEhQKEFJFR0lPTl9LT1lFQl9UWU8QFxIUChBSRUdJT05fS09ZRUJfV0FTEBgSGwoXUkVHSU9OX1JBSUxXQVlfVVNfV0VTVDIQGRIbChdSRUdJT05fUkFJTFdBWV9VU19FQVNUNBAaEh8KG1JFR0lPTl9SQUlMV0FZX0VVUk9QRV9XRVNUNBAbEiIKHlJFR0lPTl9SQUlMV0FZX0FTSUFfU09VVEhFQVNUMRAcQlNaUWdpdGh1Yi5jb20vb3BlbnN0YXR1c2hxL29wZW5zdGF0dXMvcGFja2FnZXMvcHJvdG8vb3BlbnN0YXR1cy9tb25pdG9yL3YxO21vbml0b3J2MWIGcHJvdG8z");
+ fileDesc("CiNvcGVuc3RhdHVzL21vbml0b3IvdjEvbW9uaXRvci5wcm90bxIVb3BlbnN0YXR1cy5tb25pdG9yLnYxKoEBCg1Nb25pdG9yU3RhdHVzEh4KGk1PTklUT1JfU1RBVFVTX1VOU1BFQ0lGSUVEEAASGQoVTU9OSVRPUl9TVEFUVVNfQUNUSVZFEAESGwoXTU9OSVRPUl9TVEFUVVNfREVHUkFERUQQAhIYChRNT05JVE9SX1NUQVRVU19FUlJPUhADKqUBCgtQZXJpb2RpY2l0eRIbChdQRVJJT0RJQ0lUWV9VTlNQRUNJRklFRBAAEhMKD1BFUklPRElDSVRZXzMwUxABEhIKDlBFUklPRElDSVRZXzFNEAISEgoOUEVSSU9ESUNJVFlfNU0QAxITCg9QRVJJT0RJQ0lUWV8xME0QBBITCg9QRVJJT0RJQ0lUWV8zME0QBRISCg5QRVJJT0RJQ0lUWV8xSBAGKosFCgZSZWdpb24SFgoSUkVHSU9OX1VOU1BFQ0lGSUVEEAASEgoOUkVHSU9OX0ZMWV9BTVMQARISCg5SRUdJT05fRkxZX0FSThACEhIKDlJFR0lPTl9GTFlfQk9NEAMSEgoOUkVHSU9OX0ZMWV9DREcQBBISCg5SRUdJT05fRkxZX0RGVxAFEhIKDlJFR0lPTl9GTFlfRVdSEAYSEgoOUkVHSU9OX0ZMWV9GUkEQBxISCg5SRUdJT05fRkxZX0dSVRAIEhIKDlJFR0lPTl9GTFlfSUFEEAkSEgoOUkVHSU9OX0ZMWV9KTkIQChISCg5SRUdJT05fRkxZX0xBWBALEhIKDlJFR0lPTl9GTFlfTEhSEAwSEgoOUkVHSU9OX0ZMWV9OUlQQDRISCg5SRUdJT05fRkxZX09SRBAOEhIKDlJFR0lPTl9GTFlfU0pDEA8SEgoOUkVHSU9OX0ZMWV9TSU4QEBISCg5SRUdJT05fRkxZX1NZRBAREhIKDlJFR0lPTl9GTFlfWVlaEBISFAoQUkVHSU9OX0tPWUVCX0ZSQRATEhQKEFJFR0lPTl9LT1lFQl9QQVIQFBIUChBSRUdJT05fS09ZRUJfU0ZPEBUSFAoQUkVHSU9OX0tPWUVCX1NJThAWEhQKEFJFR0lPTl9LT1lFQl9UWU8QFxIUChBSRUdJT05fS09ZRUJfV0FTEBgSGwoXUkVHSU9OX1JBSUxXQVlfVVNfV0VTVDIQGRIbChdSRUdJT05fUkFJTFdBWV9VU19FQVNUNBAaEh8KG1JFR0lPTl9SQUlMV0FZX0VVUk9QRV9XRVNUNBAbEiIKHlJFR0lPTl9SQUlMV0FZX0FTSUFfU09VVEhFQVNUMRAcQlNaUWdpdGh1Yi5jb20vb3BlbnN0YXR1c2hxL29wZW5zdGF0dXMvcGFja2FnZXMvcHJvdG8vb3BlbnN0YXR1cy9tb25pdG9yL3YxO21vbml0b3J2MWIGcHJvdG8z");
/**
* MonitorStatus represents the operational status of a monitor.
@@ -116,128 +116,128 @@ export enum Region {
*
* Amsterdam, Netherlands
*
- * @generated from enum value: REGION_AMS = 1;
+ * @generated from enum value: REGION_FLY_AMS = 1;
*/
- AMS = 1,
+ FLY_AMS = 1,
/**
* Stockholm, Sweden
*
- * @generated from enum value: REGION_ARN = 2;
+ * @generated from enum value: REGION_FLY_ARN = 2;
*/
- ARN = 2,
+ FLY_ARN = 2,
/**
* Mumbai, India
*
- * @generated from enum value: REGION_BOM = 3;
+ * @generated from enum value: REGION_FLY_BOM = 3;
*/
- BOM = 3,
+ FLY_BOM = 3,
/**
* Paris, France
*
- * @generated from enum value: REGION_CDG = 4;
+ * @generated from enum value: REGION_FLY_CDG = 4;
*/
- CDG = 4,
+ FLY_CDG = 4,
/**
* Dallas, USA
*
- * @generated from enum value: REGION_DFW = 5;
+ * @generated from enum value: REGION_FLY_DFW = 5;
*/
- DFW = 5,
+ FLY_DFW = 5,
/**
* Newark, USA
*
- * @generated from enum value: REGION_EWR = 6;
+ * @generated from enum value: REGION_FLY_EWR = 6;
*/
- EWR = 6,
+ FLY_EWR = 6,
/**
* Frankfurt, Germany
*
- * @generated from enum value: REGION_FRA = 7;
+ * @generated from enum value: REGION_FLY_FRA = 7;
*/
- FRA = 7,
+ FLY_FRA = 7,
/**
* São Paulo, Brazil
*
- * @generated from enum value: REGION_GRU = 8;
+ * @generated from enum value: REGION_FLY_GRU = 8;
*/
- GRU = 8,
+ FLY_GRU = 8,
/**
* Ashburn, USA
*
- * @generated from enum value: REGION_IAD = 9;
+ * @generated from enum value: REGION_FLY_IAD = 9;
*/
- IAD = 9,
+ FLY_IAD = 9,
/**
* Johannesburg, South Africa
*
- * @generated from enum value: REGION_JNB = 10;
+ * @generated from enum value: REGION_FLY_JNB = 10;
*/
- JNB = 10,
+ FLY_JNB = 10,
/**
* Los Angeles, USA
*
- * @generated from enum value: REGION_LAX = 11;
+ * @generated from enum value: REGION_FLY_LAX = 11;
*/
- LAX = 11,
+ FLY_LAX = 11,
/**
* London, UK
*
- * @generated from enum value: REGION_LHR = 12;
+ * @generated from enum value: REGION_FLY_LHR = 12;
*/
- LHR = 12,
+ FLY_LHR = 12,
/**
* Tokyo, Japan
*
- * @generated from enum value: REGION_NRT = 13;
+ * @generated from enum value: REGION_FLY_NRT = 13;
*/
- NRT = 13,
+ FLY_NRT = 13,
/**
* Chicago, USA
*
- * @generated from enum value: REGION_ORD = 14;
+ * @generated from enum value: REGION_FLY_ORD = 14;
*/
- ORD = 14,
+ FLY_ORD = 14,
/**
* San Jose, USA
*
- * @generated from enum value: REGION_SJC = 15;
+ * @generated from enum value: REGION_FLY_SJC = 15;
*/
- SJC = 15,
+ FLY_SJC = 15,
/**
* Singapore
*
- * @generated from enum value: REGION_SIN = 16;
+ * @generated from enum value: REGION_FLY_SIN = 16;
*/
- SIN = 16,
+ FLY_SIN = 16,
/**
* Sydney, Australia
*
- * @generated from enum value: REGION_SYD = 17;
+ * @generated from enum value: REGION_FLY_SYD = 17;
*/
- SYD = 17,
+ FLY_SYD = 17,
/**
* Toronto, Canada
*
- * @generated from enum value: REGION_YYZ = 18;
+ * @generated from enum value: REGION_FLY_YYZ = 18;
*/
- YYZ = 18,
+ FLY_YYZ = 18,
/**
* Koyeb regions