Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
🚀 remove screenshot free user (#1086)
Thibault Le Ouayaaf3e6776915
diff --git a/apps/server/src/checker/index.ts b/apps/server/src/checker/index.tsindex 9593ed04a..8006a24a9 100644--- a/apps/server/src/checker/index.ts+++ b/apps/server/src/checker/index.ts@@ -3,7 +3,7 @@ import { Hono } from "hono";import { z } from "zod";import { and, db, eq, isNull, schema } from "@openstatus/db";-import { incidentTable } from "@openstatus/db/src/schema";+import { incidentTable, workspace } from "@openstatus/db/src/schema";import {monitorStatusSchema,selectMonitorSchema,@@ -189,18 +189,26 @@ checkerRoute.post("/updateStatus", async (c) => {.select({url: schema.monitor.url,jobType: schema.monitor.jobType,+ workspaceId: schema.monitor.workspaceId,}).from(schema.monitor).where(eq(schema.monitor.id, Number(monitorId))).get();- if (monitor && monitor.jobType === "http") {- await triggerScreenshot({- data: {- url: monitor.url,- incidentId: newIncident[0].id,- kind: "incident",- },- });+ if (monitor && monitor.jobType === "http" && monitor.workspaceId) {+ const currentWorkspace = await db+ .select()+ .from(workspace)+ .where(eq(workspace.id, monitor.workspaceId))+ .get();+ if (currentWorkspace?.plan !== "free") {+ await triggerScreenshot({+ data: {+ url: monitor.url,+ incidentId: newIncident[0].id,+ kind: "incident",+ },+ });+ }}}}@@ -282,18 +290,27 @@ checkerRoute.post("/updateStatus", async (c) => {.select({url: schema.monitor.url,jobType: schema.monitor.jobType,+ workspaceId: schema.monitor.workspaceId,}).from(schema.monitor).where(eq(schema.monitor.id, Number(monitorId))).get();- if (monitor && monitor.jobType === "http") {- await triggerScreenshot({- data: {- url: monitor.url,- incidentId: incident.id,- kind: "recovery",- },- });+ if (monitor && monitor.jobType === "http" && monitor.workspaceId) {+ const currentWorkspace = await db+ .select()+ .from(workspace)+ .where(eq(workspace.id, monitor.workspaceId))+ .get();++ if (currentWorkspace?.plan !== "free") {+ await triggerScreenshot({+ data: {+ url: monitor.url,+ incidentId: incident.id,+ kind: "recovery",+ },+ });+ }}}}diff --git a/apps/web/src/config/pricing-table.tsx b/apps/web/src/config/pricing-table.tsxindex 9d73f292e..ca03a21da 100644--- a/apps/web/src/config/pricing-table.tsx+++ b/apps/web/src/config/pricing-table.tsx@@ -1,4 +1,8 @@-import type { LimitsV1, LimitsV2 } from "@openstatus/db/src/schema/plan/schema";+import type {+ LimitsV1,+ LimitsV2,+ LimitsV3,+} from "@openstatus/db/src/schema/plan/schema";import Link from "next/link";import type React from "react";@@ -26,7 +30,7 @@ export const pricingTableConfig: Record<{label: string;features: {- value: keyof LimitsV1 | keyof LimitsV2;+ value: keyof LimitsV1 | keyof LimitsV2 | keyof LimitsV3;label: string;description?: React.ReactNode; // tooltip informationsbadge?: string;@@ -52,6 +56,7 @@ export const pricingTableConfig: Record<{ value: "max-regions", label: "Number of Regions" },{ value: "data-retention", label: "Data retention" },+ { value: "screenshots", label: "Screenshots upon failure" },],},"synthetic-checks": {diff --git a/packages/db/src/schema/plan/config.ts b/packages/db/src/schema/plan/config.tsindex 3e42b1a2e..87143d127 100644--- a/packages/db/src/schema/plan/config.ts+++ b/packages/db/src/schema/plan/config.ts@@ -25,6 +25,7 @@ export const allPlans: Record<"status-pages": 1,maintenance: true,"monitor-values-visibility": true,+ screenshots: false,"status-subscribers": false,"custom-domain": false,"password-protection": false,@@ -53,6 +54,7 @@ export const allPlans: Record<"status-pages": 1,maintenance: true,"monitor-values-visibility": true,+ screenshots: true,"status-subscribers": true,"custom-domain": true,"password-protection": true,@@ -117,6 +119,7 @@ export const allPlans: Record<"status-pages": 5,maintenance: true,"monitor-values-visibility": true,+ screenshots: true,"status-subscribers": true,"custom-domain": true,"password-protection": true,@@ -181,6 +184,7 @@ export const allPlans: Record<"status-pages": 20,maintenance: true,"monitor-values-visibility": true,+ screenshots: true,"status-subscribers": true,"custom-domain": true,"password-protection": true,diff --git a/packages/db/src/schema/plan/schema.ts b/packages/db/src/schema/plan/schema.tsindex 7ebd05a1f..46f2baecf 100644--- a/packages/db/src/schema/plan/schema.ts+++ b/packages/db/src/schema/plan/schema.ts@@ -36,9 +36,19 @@ export const limitsV2 = limitsV1.extend({"monitor-values-visibility": z.boolean(),});+export const limitsV3 = limitsV2.extend({+ version: z.literal("v3"),+ screenshots: z.boolean(),+});+export type LimitsV2 = z.infer<typeof limitsV2>;+export type LimitsV3 = z.infer<typeof limitsV3>;-const unknownLimit = z.discriminatedUnion("version", [limitsV1, limitsV2]);+const unknownLimit = z.discriminatedUnion("version", [+ limitsV1,+ limitsV2,+ limitsV3,+]);export function migrateFromV1ToV2({ data }: { data: LimitsV1 }) {return {@@ -49,9 +59,30 @@ export function migrateFromV1ToV2({ data }: { data: LimitsV1 }) {};}+export function migrateFromV2ToV3({ data }: { data: LimitsV2 }) {+ return {+ ...data,+ version: "v3",+ screenshots: true,+ };+}++export function migrateFromV1ToV3({ data }: { data: LimitsV1 }) {+ return {+ ...data,+ version: "v3",+ screenshots: true,+ "private-locations": true,+ "monitor-values-visibility": true,+ };+}+export const limitSchema = unknownLimit.transform((val) => {if (!val.version) {- return migrateFromV1ToV2({ data: val });+ return migrateFromV1ToV3({ data: val });+ }+ if (val.version === "v2") {+ return migrateFromV2ToV3({ data: val });}return val;});