+22 -22

apps/server/src/routes/rpc/services/monitor/__tests__/monitor.test.ts

··· 1179 1179 url: "https://test-valid-regions.example.com", 1180 1180 periodicity: "PERIODICITY_5M", 1181 1181 method: "HTTP_METHOD_GET", 1182 1182 - regions: ["REGION_AMS", "REGION_IAD", "REGION_SIN"], 1182 1182 + regions: ["REGION_FLY_AMS", "REGION_FLY_IAD", "REGION_FLY_SIN"], 1183 1183 }, 1184 1184 }, 1185 1185 { "x-openstatus-key": "1" }, ··· 1189 1189 const data = await res.json(); 1190 1190 expect(data.monitor).toBeDefined(); 1191 1191 expect(data.monitor.regions).toEqual([ 1192 1192 - "REGION_AMS", 1193 1193 - "REGION_IAD", 1194 1194 - "REGION_SIN", 1192 1192 + "REGION_FLY_AMS", 1193 1193 + "REGION_FLY_IAD", 1194 1194 + "REGION_FLY_SIN", 1195 1195 ]); 1196 1196 1197 1197 // Clean up ··· 1468 1468 periodicity: "PERIODICITY_10M", 1469 1469 method: "HTTP_METHOD_GET", 1470 1470 regions: [ 1471 1471 - "REGION_AMS", 1472 1472 - "REGION_IAD", 1473 1473 - "REGION_SIN", 1474 1474 - "REGION_LHR", 1475 1475 - "REGION_SYD", 1476 1476 - "REGION_NRT", 1477 1477 - "REGION_FRA", 1478 1478 - "REGION_GRU", 1471 1471 + "REGION_FLY_AMS", 1472 1472 + "REGION_FLY_IAD", 1473 1473 + "REGION_FLY_SIN", 1474 1474 + "REGION_FLY_LHR", 1475 1475 + "REGION_FLY_SYD", 1476 1476 + "REGION_FLY_NRT", 1477 1477 + "REGION_FLY_FRA", 1478 1478 + "REGION_FLY_GRU", 1479 1479 ], 1480 1480 }, 1481 1481 }, ··· 1741 1741 1742 1742 // Find each region and verify status 1743 1743 const amsRegion = regions.find( 1744 1744 - (r: { region: string }) => r.region === "REGION_AMS", 1744 1744 + (r: { region: string }) => r.region === "REGION_FLY_AMS", 1745 1745 ); 1746 1746 const iadRegion = regions.find( 1747 1747 - (r: { region: string }) => r.region === "REGION_IAD", 1747 1747 + (r: { region: string }) => r.region === "REGION_FLY_IAD", 1748 1748 ); 1749 1749 const fraRegion = regions.find( 1750 1750 - (r: { region: string }) => r.region === "REGION_FRA", 1750 1750 + (r: { region: string }) => r.region === "REGION_FLY_FRA", 1751 1751 ); 1752 1752 1753 1753 expect(amsRegion).toBeDefined(); ··· 1774 1774 1775 1775 // lhr has a status entry but is not in the monitor's configured regions 1776 1776 const lhrRegion = regions.find( 1777 1777 - (r: { region: string }) => r.region === "REGION_LHR", 1777 1777 + (r: { region: string }) => r.region === "REGION_FLY_LHR", 1778 1778 ); 1779 1779 expect(lhrRegion).toBeUndefined(); 1780 1780 }); ··· 1964 1964 "GetMonitorSummary", 1965 1965 { 1966 1966 id: String(testMonitorWithStatusId), 1967 1967 - regions: ["REGION_AMS", "REGION_IAD"], 1967 1967 + regions: ["REGION_FLY_AMS", "REGION_FLY_IAD"], 1968 1968 }, 1969 1969 { "x-openstatus-key": "1" }, 1970 1970 ); ··· 1975 1975 expect(data.regions).toBeDefined(); 1976 1976 expect(Array.isArray(data.regions)).toBe(true); 1977 1977 // Should return the requested regions 1978 1978 - expect(data.regions).toContain("REGION_AMS"); 1979 1979 - expect(data.regions).toContain("REGION_IAD"); 1978 1978 + expect(data.regions).toContain("REGION_FLY_AMS"); 1979 1979 + expect(data.regions).toContain("REGION_FLY_IAD"); 1980 1980 expect(data.regions).toHaveLength(2); 1981 1981 }); 1982 1982 ··· 1992 1992 const data = await res.json(); 1993 1993 expect(data.regions).toBeDefined(); 1994 1994 // Monitor has regions: "ams,iad,fra" 1995 1995 - expect(data.regions).toContain("REGION_AMS"); 1996 1996 - expect(data.regions).toContain("REGION_IAD"); 1997 1997 - expect(data.regions).toContain("REGION_FRA"); 1995 1995 + expect(data.regions).toContain("REGION_FLY_AMS"); 1996 1996 + expect(data.regions).toContain("REGION_FLY_IAD"); 1997 1997 + expect(data.regions).toContain("REGION_FLY_FRA"); 1998 1998 }); 1999 1999 2000 2000 test("returns 404 for non-existent monitor", async () => {

+36 -36

apps/server/src/routes/rpc/services/monitor/converters/regions.ts

··· 6 6 */ 7 7 const DB_TO_REGION: Record<string, Region> = { 8 8 // Fly.io regions 9 9 - ams: Region.AMS, 10 10 - arn: Region.ARN, 11 11 - bom: Region.BOM, 12 12 - cdg: Region.CDG, 13 13 - dfw: Region.DFW, 14 14 - ewr: Region.EWR, 15 15 - fra: Region.FRA, 16 16 - gru: Region.GRU, 17 17 - iad: Region.IAD, 18 18 - jnb: Region.JNB, 19 19 - lax: Region.LAX, 20 20 - lhr: Region.LHR, 21 21 - nrt: Region.NRT, 22 22 - ord: Region.ORD, 23 23 - sjc: Region.SJC, 24 24 - sin: Region.SIN, 25 25 - syd: Region.SYD, 26 26 - yyz: Region.YYZ, 9 9 + ams: Region.FLY_AMS, 10 10 + arn: Region.FLY_ARN, 11 11 + bom: Region.FLY_BOM, 12 12 + cdg: Region.FLY_CDG, 13 13 + dfw: Region.FLY_DFW, 14 14 + ewr: Region.FLY_EWR, 15 15 + fra: Region.FLY_FRA, 16 16 + gru: Region.FLY_GRU, 17 17 + iad: Region.FLY_IAD, 18 18 + jnb: Region.FLY_JNB, 19 19 + lax: Region.FLY_LAX, 20 20 + lhr: Region.FLY_LHR, 21 21 + nrt: Region.FLY_NRT, 22 22 + ord: Region.FLY_ORD, 23 23 + sjc: Region.FLY_SJC, 24 24 + sin: Region.FLY_SIN, 25 25 + syd: Region.FLY_SYD, 26 26 + yyz: Region.FLY_YYZ, 27 27 // Koyeb regions 28 28 koyeb_fra: Region.KOYEB_FRA, 29 29 koyeb_par: Region.KOYEB_PAR, ··· 43 43 */ 44 44 const REGION_TO_DB: Record<Region, string> = { 45 45 // Fly.io regions 46 46 - [Region.AMS]: "ams", 47 47 - [Region.ARN]: "arn", 48 48 - [Region.BOM]: "bom", 49 49 - [Region.CDG]: "cdg", 50 50 - [Region.DFW]: "dfw", 51 51 - [Region.EWR]: "ewr", 52 52 - [Region.FRA]: "fra", 53 53 - [Region.GRU]: "gru", 54 54 - [Region.IAD]: "iad", 55 55 - [Region.JNB]: "jnb", 56 56 - [Region.LAX]: "lax", 57 57 - [Region.LHR]: "lhr", 58 58 - [Region.NRT]: "nrt", 59 59 - [Region.ORD]: "ord", 60 60 - [Region.SJC]: "sjc", 61 61 - [Region.SIN]: "sin", 62 62 - [Region.SYD]: "syd", 63 63 - [Region.YYZ]: "yyz", 46 46 + [Region.FLY_AMS]: "ams", 47 47 + [Region.FLY_ARN]: "arn", 48 48 + [Region.FLY_BOM]: "bom", 49 49 + [Region.FLY_CDG]: "cdg", 50 50 + [Region.FLY_DFW]: "dfw", 51 51 + [Region.FLY_EWR]: "ewr", 52 52 + [Region.FLY_FRA]: "fra", 53 53 + [Region.FLY_GRU]: "gru", 54 54 + [Region.FLY_IAD]: "iad", 55 55 + [Region.FLY_JNB]: "jnb", 56 56 + [Region.FLY_LAX]: "lax", 57 57 + [Region.FLY_LHR]: "lhr", 58 58 + [Region.FLY_NRT]: "nrt", 59 59 + [Region.FLY_ORD]: "ord", 60 60 + [Region.FLY_SJC]: "sjc", 61 61 + [Region.FLY_SIN]: "sin", 62 62 + [Region.FLY_SYD]: "syd", 63 63 + [Region.FLY_YYZ]: "yyz", 64 64 // Koyeb regions 65 65 [Region.KOYEB_FRA]: "koyeb_fra", 66 66 [Region.KOYEB_PAR]: "koyeb_par",

+18 -18

packages/proto/api/openstatus/monitor/v1/monitor.proto

··· 31 31 enum Region { 32 32 REGION_UNSPECIFIED = 0; 33 33 // Fly.io regions 34 34 - REGION_AMS = 1; // Amsterdam, Netherlands 35 35 - REGION_ARN = 2; // Stockholm, Sweden 36 36 - REGION_BOM = 3; // Mumbai, India 37 37 - REGION_CDG = 4; // Paris, France 38 38 - REGION_DFW = 5; // Dallas, USA 39 39 - REGION_EWR = 6; // Newark, USA 40 40 - REGION_FRA = 7; // Frankfurt, Germany 41 41 - REGION_GRU = 8; // São Paulo, Brazil 42 42 - REGION_IAD = 9; // Ashburn, USA 43 43 - REGION_JNB = 10; // Johannesburg, South Africa 44 44 - REGION_LAX = 11; // Los Angeles, USA 45 45 - REGION_LHR = 12; // London, UK 46 46 - REGION_NRT = 13; // Tokyo, Japan 47 47 - REGION_ORD = 14; // Chicago, USA 48 48 - REGION_SJC = 15; // San Jose, USA 49 49 - REGION_SIN = 16; // Singapore 50 50 - REGION_SYD = 17; // Sydney, Australia 51 51 - REGION_YYZ = 18; // Toronto, Canada 34 34 + REGION_FLY_AMS = 1; // Amsterdam, Netherlands 35 35 + REGION_FLY_ARN = 2; // Stockholm, Sweden 36 36 + REGION_FLY_BOM = 3; // Mumbai, India 37 37 + REGION_FLY_CDG = 4; // Paris, France 38 38 + REGION_FLY_DFW = 5; // Dallas, USA 39 39 + REGION_FLY_EWR = 6; // Newark, USA 40 40 + REGION_FLY_FRA = 7; // Frankfurt, Germany 41 41 + REGION_FLY_GRU = 8; // São Paulo, Brazil 42 42 + REGION_FLY_IAD = 9; // Ashburn, USA 43 43 + REGION_FLY_JNB = 10; // Johannesburg, South Africa 44 44 + REGION_FLY_LAX = 11; // Los Angeles, USA 45 45 + REGION_FLY_LHR = 12; // London, UK 46 46 + REGION_FLY_NRT = 13; // Tokyo, Japan 47 47 + REGION_FLY_ORD = 14; // Chicago, USA 48 48 + REGION_FLY_SJC = 15; // San Jose, USA 49 49 + REGION_FLY_SIN = 16; // Singapore 50 50 + REGION_FLY_SYD = 17; // Sydney, Australia 51 51 + REGION_FLY_YYZ = 18; // Toronto, Canada 52 52 // Koyeb regions 53 53 REGION_KOYEB_FRA = 19; // Koyeb Frankfurt 54 54 REGION_KOYEB_PAR = 20; // Koyeb Paris

+37 -37

packages/proto/gen/ts/openstatus/monitor/v1/monitor_pb.ts

··· 9 9 * Describes the file openstatus/monitor/v1/monitor.proto. 10 10 */ 11 11 export const file_openstatus_monitor_v1_monitor: GenFile = /*@__PURE__*/ 12 12 - fileDesc("CiNvcGVuc3RhdHVzL21vbml0b3IvdjEvbW9uaXRvci5wcm90bxIVb3BlbnN0YXR1cy5tb25pdG9yLnYxKoEBCg1Nb25pdG9yU3RhdHVzEh4KGk1PTklUT1JfU1RBVFVTX1VOU1BFQ0lGSUVEEAASGQoVTU9OSVRPUl9TVEFUVVNfQUNUSVZFEAESGwoXTU9OSVRPUl9TVEFUVVNfREVHUkFERUQQAhIYChRNT05JVE9SX1NUQVRVU19FUlJPUhADKqUBCgtQZXJpb2RpY2l0eRIbChdQRVJJT0RJQ0lUWV9VTlNQRUNJRklFRBAAEhMKD1BFUklPRElDSVRZXzMwUxABEhIKDlBFUklPRElDSVRZXzFNEAISEgoOUEVSSU9ESUNJVFlfNU0QAxITCg9QRVJJT0RJQ0lUWV8xME0QBBITCg9QRVJJT0RJQ0lUWV8zME0QBRISCg5QRVJJT0RJQ0lUWV8xSBAGKsMECgZSZWdpb24SFgoSUkVHSU9OX1VOU1BFQ0lGSUVEEAASDgoKUkVHSU9OX0FNUxABEg4KClJFR0lPTl9BUk4QAhIOCgpSRUdJT05fQk9NEAMSDgoKUkVHSU9OX0NERxAEEg4KClJFR0lPTl9ERlcQBRIOCgpSRUdJT05fRVdSEAYSDgoKUkVHSU9OX0ZSQRAHEg4KClJFR0lPTl9HUlUQCBIOCgpSRUdJT05fSUFEEAkSDgoKUkVHSU9OX0pOQhAKEg4KClJFR0lPTl9MQVgQCxIOCgpSRUdJT05fTEhSEAwSDgoKUkVHSU9OX05SVBANEg4KClJFR0lPTl9PUkQQDhIOCgpSRUdJT05fU0pDEA8SDgoKUkVHSU9OX1NJThAQEg4KClJFR0lPTl9TWUQQERIOCgpSRUdJT05fWVlaEBISFAoQUkVHSU9OX0tPWUVCX0ZSQRATEhQKEFJFR0lPTl9LT1lFQl9QQVIQFBIUChBSRUdJT05fS09ZRUJfU0ZPEBUSFAoQUkVHSU9OX0tPWUVCX1NJThAWEhQKEFJFR0lPTl9LT1lFQl9UWU8QFxIUChBSRUdJT05fS09ZRUJfV0FTEBgSGwoXUkVHSU9OX1JBSUxXQVlfVVNfV0VTVDIQGRIbChdSRUdJT05fUkFJTFdBWV9VU19FQVNUNBAaEh8KG1JFR0lPTl9SQUlMV0FZX0VVUk9QRV9XRVNUNBAbEiIKHlJFR0lPTl9SQUlMV0FZX0FTSUFfU09VVEhFQVNUMRAcQlNaUWdpdGh1Yi5jb20vb3BlbnN0YXR1c2hxL29wZW5zdGF0dXMvcGFja2FnZXMvcHJvdG8vb3BlbnN0YXR1cy9tb25pdG9yL3YxO21vbml0b3J2MWIGcHJvdG8z"); 12 12 + fileDesc("CiNvcGVuc3RhdHVzL21vbml0b3IvdjEvbW9uaXRvci5wcm90bxIVb3BlbnN0YXR1cy5tb25pdG9yLnYxKoEBCg1Nb25pdG9yU3RhdHVzEh4KGk1PTklUT1JfU1RBVFVTX1VOU1BFQ0lGSUVEEAASGQoVTU9OSVRPUl9TVEFUVVNfQUNUSVZFEAESGwoXTU9OSVRPUl9TVEFUVVNfREVHUkFERUQQAhIYChRNT05JVE9SX1NUQVRVU19FUlJPUhADKqUBCgtQZXJpb2RpY2l0eRIbChdQRVJJT0RJQ0lUWV9VTlNQRUNJRklFRBAAEhMKD1BFUklPRElDSVRZXzMwUxABEhIKDlBFUklPRElDSVRZXzFNEAISEgoOUEVSSU9ESUNJVFlfNU0QAxITCg9QRVJJT0RJQ0lUWV8xME0QBBITCg9QRVJJT0RJQ0lUWV8zME0QBRISCg5QRVJJT0RJQ0lUWV8xSBAGKosFCgZSZWdpb24SFgoSUkVHSU9OX1VOU1BFQ0lGSUVEEAASEgoOUkVHSU9OX0ZMWV9BTVMQARISCg5SRUdJT05fRkxZX0FSThACEhIKDlJFR0lPTl9GTFlfQk9NEAMSEgoOUkVHSU9OX0ZMWV9DREcQBBISCg5SRUdJT05fRkxZX0RGVxAFEhIKDlJFR0lPTl9GTFlfRVdSEAYSEgoOUkVHSU9OX0ZMWV9GUkEQBxISCg5SRUdJT05fRkxZX0dSVRAIEhIKDlJFR0lPTl9GTFlfSUFEEAkSEgoOUkVHSU9OX0ZMWV9KTkIQChISCg5SRUdJT05fRkxZX0xBWBALEhIKDlJFR0lPTl9GTFlfTEhSEAwSEgoOUkVHSU9OX0ZMWV9OUlQQDRISCg5SRUdJT05fRkxZX09SRBAOEhIKDlJFR0lPTl9GTFlfU0pDEA8SEgoOUkVHSU9OX0ZMWV9TSU4QEBISCg5SRUdJT05fRkxZX1NZRBAREhIKDlJFR0lPTl9GTFlfWVlaEBISFAoQUkVHSU9OX0tPWUVCX0ZSQRATEhQKEFJFR0lPTl9LT1lFQl9QQVIQFBIUChBSRUdJT05fS09ZRUJfU0ZPEBUSFAoQUkVHSU9OX0tPWUVCX1NJThAWEhQKEFJFR0lPTl9LT1lFQl9UWU8QFxIUChBSRUdJT05fS09ZRUJfV0FTEBgSGwoXUkVHSU9OX1JBSUxXQVlfVVNfV0VTVDIQGRIbChdSRUdJT05fUkFJTFdBWV9VU19FQVNUNBAaEh8KG1JFR0lPTl9SQUlMV0FZX0VVUk9QRV9XRVNUNBAbEiIKHlJFR0lPTl9SQUlMV0FZX0FTSUFfU09VVEhFQVNUMRAcQlNaUWdpdGh1Yi5jb20vb3BlbnN0YXR1c2hxL29wZW5zdGF0dXMvcGFja2FnZXMvcHJvdG8vb3BlbnN0YXR1cy9tb25pdG9yL3YxO21vbml0b3J2MWIGcHJvdG8z"); 13 13 14 14 /** 15 15 * MonitorStatus represents the operational status of a monitor. ··· 116 116 * 117 117 * Amsterdam, Netherlands 118 118 * 119 119 - * @generated from enum value: REGION_AMS = 1; 119 119 + * @generated from enum value: REGION_FLY_AMS = 1; 120 120 */ 121 121 - AMS = 1, 121 121 + FLY_AMS = 1, 122 122 123 123 /** 124 124 * Stockholm, Sweden 125 125 * 126 126 - * @generated from enum value: REGION_ARN = 2; 126 126 + * @generated from enum value: REGION_FLY_ARN = 2; 127 127 */ 128 128 - ARN = 2, 128 128 + FLY_ARN = 2, 129 129 130 130 /** 131 131 * Mumbai, India 132 132 * 133 133 - * @generated from enum value: REGION_BOM = 3; 133 133 + * @generated from enum value: REGION_FLY_BOM = 3; 134 134 */ 135 135 - BOM = 3, 135 135 + FLY_BOM = 3, 136 136 137 137 /** 138 138 * Paris, France 139 139 * 140 140 - * @generated from enum value: REGION_CDG = 4; 140 140 + * @generated from enum value: REGION_FLY_CDG = 4; 141 141 */ 142 142 - CDG = 4, 142 142 + FLY_CDG = 4, 143 143 144 144 /** 145 145 * Dallas, USA 146 146 * 147 147 - * @generated from enum value: REGION_DFW = 5; 147 147 + * @generated from enum value: REGION_FLY_DFW = 5; 148 148 */ 149 149 - DFW = 5, 149 149 + FLY_DFW = 5, 150 150 151 151 /** 152 152 * Newark, USA 153 153 * 154 154 - * @generated from enum value: REGION_EWR = 6; 154 154 + * @generated from enum value: REGION_FLY_EWR = 6; 155 155 */ 156 156 - EWR = 6, 156 156 + FLY_EWR = 6, 157 157 158 158 /** 159 159 * Frankfurt, Germany 160 160 * 161 161 - * @generated from enum value: REGION_FRA = 7; 161 161 + * @generated from enum value: REGION_FLY_FRA = 7; 162 162 */ 163 163 - FRA = 7, 163 163 + FLY_FRA = 7, 164 164 165 165 /** 166 166 * São Paulo, Brazil 167 167 * 168 168 - * @generated from enum value: REGION_GRU = 8; 168 168 + * @generated from enum value: REGION_FLY_GRU = 8; 169 169 */ 170 170 - GRU = 8, 170 170 + FLY_GRU = 8, 171 171 172 172 /** 173 173 * Ashburn, USA 174 174 * 175 175 - * @generated from enum value: REGION_IAD = 9; 175 175 + * @generated from enum value: REGION_FLY_IAD = 9; 176 176 */ 177 177 - IAD = 9, 177 177 + FLY_IAD = 9, 178 178 179 179 /** 180 180 * Johannesburg, South Africa 181 181 * 182 182 - * @generated from enum value: REGION_JNB = 10; 182 182 + * @generated from enum value: REGION_FLY_JNB = 10; 183 183 */ 184 184 - JNB = 10, 184 184 + FLY_JNB = 10, 185 185 186 186 /** 187 187 * Los Angeles, USA 188 188 * 189 189 - * @generated from enum value: REGION_LAX = 11; 189 189 + * @generated from enum value: REGION_FLY_LAX = 11; 190 190 */ 191 191 - LAX = 11, 191 191 + FLY_LAX = 11, 192 192 193 193 /** 194 194 * London, UK 195 195 * 196 196 - * @generated from enum value: REGION_LHR = 12; 196 196 + * @generated from enum value: REGION_FLY_LHR = 12; 197 197 */ 198 198 - LHR = 12, 198 198 + FLY_LHR = 12, 199 199 200 200 /** 201 201 * Tokyo, Japan 202 202 * 203 203 - * @generated from enum value: REGION_NRT = 13; 203 203 + * @generated from enum value: REGION_FLY_NRT = 13; 204 204 */ 205 205 - NRT = 13, 205 205 + FLY_NRT = 13, 206 206 207 207 /** 208 208 * Chicago, USA 209 209 * 210 210 - * @generated from enum value: REGION_ORD = 14; 210 210 + * @generated from enum value: REGION_FLY_ORD = 14; 211 211 */ 212 212 - ORD = 14, 212 212 + FLY_ORD = 14, 213 213 214 214 /** 215 215 * San Jose, USA 216 216 * 217 217 - * @generated from enum value: REGION_SJC = 15; 217 217 + * @generated from enum value: REGION_FLY_SJC = 15; 218 218 */ 219 219 - SJC = 15, 219 219 + FLY_SJC = 15, 220 220 221 221 /** 222 222 * Singapore 223 223 * 224 224 - * @generated from enum value: REGION_SIN = 16; 224 224 + * @generated from enum value: REGION_FLY_SIN = 16; 225 225 */ 226 226 - SIN = 16, 226 226 + FLY_SIN = 16, 227 227 228 228 /** 229 229 * Sydney, Australia 230 230 * 231 231 - * @generated from enum value: REGION_SYD = 17; 231 231 + * @generated from enum value: REGION_FLY_SYD = 17; 232 232 */ 233 233 - SYD = 17, 233 233 + FLY_SYD = 17, 234 234 235 235 /** 236 236 * Toronto, Canada 237 237 * 238 238 - * @generated from enum value: REGION_YYZ = 18; 238 238 + * @generated from enum value: REGION_FLY_YYZ = 18; 239 239 */ 240 240 - YYZ = 18, 240 240 + FLY_YYZ = 18, 241 241 242 242 /** 243 243 * Koyeb regions