@oneuptime/common 10.0.39 → 10.0.41

package/build/dist/Server/Services/DashboardService.js

@@ -7,13 +7,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import CookieUtil from "../Utils/Cookie";
+import JSONWebToken from "../Utils/JsonWebToken";
+import logger from "../Utils/Logger";
 import DatabaseService from "./DatabaseService";
 import BadDataException from "../../Types/Exception/BadDataException";
+import NotAuthenticatedException from "../../Types/Exception/NotAuthenticatedException";
+import ForbiddenException from "../../Types/Exception/ForbiddenException";
+import MasterPasswordRequiredException from "../../Types/Exception/MasterPasswordRequiredException";
 import Model from "../../Models/DatabaseModels/Dashboard";
 import { IsBillingEnabled } from "../EnvironmentConfig";
 import { PlanType } from "../../Types/Billing/SubscriptionPlan";
 import DashboardViewConfigUtil from "../../Utils/Dashboard/DashboardViewConfig";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
+import IP from "../../Types/IP/IP";
+import { DASHBOARD_MASTER_PASSWORD_COOKIE_IDENTIFIER, DASHBOARD_MASTER_PASSWORD_REQUIRED_MESSAGE, } from "../../Types/Dashboard/MasterPassword";
 export class Service extends DatabaseService {
     constructor() {
         super(Model);
@@ -36,11 +44,117 @@ export class Service extends DatabaseService {
                 }
             }
         }
-        // make sure dashboard config is empty.
-        createBy.data.dashboardViewConfig =
-            DashboardViewConfigUtil.createDefaultDashboardViewConfig();
+        // use default empty config only if no template config was provided.
+        if (!createBy.data.dashboardViewConfig ||
+            !createBy.data.dashboardViewConfig.components ||
+            createBy.data.dashboardViewConfig.components.length === 0) {
+            createBy.data.dashboardViewConfig =
+                DashboardViewConfigUtil.createDefaultDashboardViewConfig();
+        }
         return Promise.resolve({ createBy, carryForward: null });
     }
+    async hasReadAccess(data) {
+        var _a, _b, _c;
+        const dashboardId = data.dashboardId;
+        const req = data.req;
+        try {
+            const dashboard = await this.findOneById({
+                id: dashboardId,
+                props: {
+                    isRoot: true,
+                },
+                select: {
+                    _id: true,
+                    isPublicDashboard: true,
+                    ipWhitelist: true,
+                    enableMasterPassword: true,
+                    masterPassword: true,
+                },
+            });
+            // If dashboard is not public, deny access
+            if (dashboard && !dashboard.isPublicDashboard) {
+                return {
+                    hasReadAccess: false,
+                    error: new NotAuthenticatedException("This dashboard is not available."),
+                };
+            }
+            if ((dashboard === null || dashboard === void 0 ? void 0 : dashboard.ipWhitelist) && dashboard.ipWhitelist.length > 0) {
+                const ipWhitelist = (_a = dashboard.ipWhitelist) === null || _a === void 0 ? void 0 : _a.split("\n");
+                const ipAccessedFrom = ((_b = req.headers["x-forwarded-for"]) === null || _b === void 0 ? void 0 : _b.toString()) ||
+                    ((_c = req.headers["x-real-ip"]) === null || _c === void 0 ? void 0 : _c.toString()) ||
+                    req.socket.remoteAddress ||
+                    req.ip ||
+                    req.ips[0];
+                if (!ipAccessedFrom) {
+                    logger.error("IP address not found in request.");
+                    return {
+                        hasReadAccess: false,
+                        error: new ForbiddenException("Unable to verify IP address for dashboard access."),
+                    };
+                }
+                const isIPWhitelisted = IP.isInWhitelist({
+                    ips: (ipAccessedFrom === null || ipAccessedFrom === void 0 ? void 0 : ipAccessedFrom.split(",").map((i) => {
+                        return i.trim();
+                    })) || [],
+                    whitelist: ipWhitelist,
+                });
+                if (!isIPWhitelisted) {
+                    logger.error(`IP address ${ipAccessedFrom} is not whitelisted for dashboard ${dashboardId.toString()}.`);
+                    return {
+                        hasReadAccess: false,
+                        error: new ForbiddenException(`Your IP address ${ipAccessedFrom} is blocked from accessing this dashboard.`),
+                    };
+                }
+            }
+            const shouldEnforceMasterPassword = Boolean(dashboard &&
+                dashboard.isPublicDashboard &&
+                dashboard.enableMasterPassword &&
+                dashboard.masterPassword);
+            if (shouldEnforceMasterPassword) {
+                const hasValidMasterPassword = this.hasValidMasterPasswordCookie({
+                    req,
+                    dashboardId,
+                });
+                if (hasValidMasterPassword) {
+                    return {
+                        hasReadAccess: true,
+                    };
+                }
+                return {
+                    hasReadAccess: false,
+                    error: new MasterPasswordRequiredException(DASHBOARD_MASTER_PASSWORD_REQUIRED_MESSAGE),
+                };
+            }
+            // Public dashboard without master password - grant access
+            if (dashboard && dashboard.isPublicDashboard) {
+                return {
+                    hasReadAccess: true,
+                };
+            }
+        }
+        catch (err) {
+            logger.error(err);
+        }
+        return {
+            hasReadAccess: false,
+            error: new NotAuthenticatedException("You do not have access to this dashboard."),
+        };
+    }
+    hasValidMasterPasswordCookie(data) {
+        const token = CookieUtil.getCookieFromExpressRequest(data.req, CookieUtil.getDashboardMasterPasswordKey(data.dashboardId));
+        if (!token) {
+            return false;
+        }
+        try {
+            const payload = JSONWebToken.decodeJsonPayload(token);
+            return (payload["dashboardId"] === data.dashboardId.toString() &&
+                payload["type"] === DASHBOARD_MASTER_PASSWORD_COOKIE_IDENTIFIER);
+        }
+        catch (err) {
+            logger.error(err);
+        }
+        return false;
+    }
 }
 __decorate([
     CaptureSpan(),

package/build/dist/Server/Services/DashboardService.js.map

@@ -1 +1 @@
-{"version":3,"file":"DashboardService.js","sourceRoot":"","sources":["../../../../Server/Services/DashboardService.ts"],"names":[],"mappings":";;;;;;;;;AAEA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,gBAAgB,MAAM,wCAAwC,CAAC;AACtE,OAAO,KAAK,MAAM,uCAAuC,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAChE,OAAO,uBAAuB,MAAM,2CAA2C,CAAC;AAChF,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,MAAM,OAAO,OAAQ,SAAQ,eAAsB;IACjD;QACE,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;IAGwB,AAAN,KAAK,CAAC,cAAc,CACrC,QAAyB;QAEzB,IAAI,gBAAgB,EAAE,CAAC;YACrB,6DAA6D;YAE7D,IAAI,QAAQ,CAAC,KAAK,CAAC,WAAW,KAAK,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACjD,2BAA2B;gBAC3B,MAAM,KAAK,GAAW,CACpB,MAAM,IAAI,CAAC,OAAO,CAAC;oBACjB,KAAK,EAAE;wBACL,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS;qBACnC;oBACD,KAAK,EAAE;wBACL,MAAM,EAAE,IAAI;qBACb;iBACF,CAAC,CACH,CAAC,QAAQ,EAAE,CAAC;gBAEb,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;oBACd,MAAM,IAAI,gBAAgB,CACxB,gEAAgE,CACjE,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,uCAAuC;QACvC,QAAQ,CAAC,IAAI,CAAC,mBAAmB;YAC/B,uBAAuB,CAAC,gCAAgC,EAAE,CAAC;QAE7D,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;CACF;AAjC0B;IADxB,WAAW,EAAE;;;;6CAiCb;AAGH,eAAe,IAAI,OAAO,EAAE,CAAC"}
+{"version":3,"file":"DashboardService.js","sourceRoot":"","sources":["../../../../Server/Services/DashboardService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/IncidentService.js

@@ -759,7 +759,7 @@ ${incident.remediationNotes || "No remediation notes provided."}
                     "Status was changed because Incident " +
                         (createdItem.incidentNumberWithPrefix ||
                             "#" + ((_b = createdItem.incidentNumber) === null || _b === void 0 ? void 0 : _b.toString())) +
-                        " was created.", createdItem.createdStateLog, onCreate.createBy.props);
+                        " was created.", createdItem.createdStateLog, onCreate.createBy.props, createdItem.declaredAt || undefined);
             }
         }
         catch (error) {
@@ -910,7 +910,7 @@ ${incident.remediationNotes || "No remediation notes provided."}
         return URL.fromString(dashboardUrl.toString()).addRoute(`/${projectId.toString()}/incidents/${incidentId.toString()}`);
     }
     async onUpdateSuccess(onUpdate, updatedItemIds) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         if (onUpdate.updateBy.data.currentIncidentStateId &&
             onUpdate.updateBy.props.tenantId) {
             for (const itemId of updatedItemIds) {
@@ -980,6 +980,71 @@ ${incident.remediationNotes || "No remediation notes provided."}
                         },
                     });
                 }
+                // emit postmortem completion time metric when postmortemPostedAt is set
+                if (Object.prototype.hasOwnProperty.call(updatedIncidentData, "postmortemPostedAt") &&
+                    updatedIncidentData["postmortemPostedAt"]) {
+                    try {
+                        const postmortemPostedAt = updatedIncidentData["postmortemPostedAt"];
+                        // find the resolved state timeline to calculate time from resolution to postmortem
+                        const resolvedStateId = await IncidentStateTimelineService.getResolvedStateIdForProject(projectId);
+                        const resolvedTimeline = await IncidentStateTimelineService.findOneBy({
+                            query: {
+                                incidentId: incidentId,
+                                incidentStateId: resolvedStateId,
+                            },
+                            select: {
+                                startsAt: true,
+                            },
+                            sort: {
+                                startsAt: SortOrder.Descending,
+                            },
+                            props: {
+                                isRoot: true,
+                            },
+                        });
+                        // only emit if the incident has been resolved
+                        if (resolvedTimeline && resolvedTimeline.startsAt) {
+                            const postmortemMetric = new Metric();
+                            postmortemMetric.projectId = projectId;
+                            postmortemMetric.serviceId = incidentId;
+                            postmortemMetric.serviceType = ServiceType.Incident;
+                            postmortemMetric.name =
+                                IncidentMetricType.PostmortemCompletionTime;
+                            postmortemMetric.value = OneUptimeDate.getDifferenceInSeconds(postmortemPostedAt, resolvedTimeline.startsAt);
+                            postmortemMetric.attributes = {
+                                incidentId: incidentId.toString(),
+                                projectId: projectId.toString(),
+                            };
+                            postmortemMetric.attributeKeys = TelemetryUtil.getAttributeKeys(postmortemMetric.attributes);
+                            postmortemMetric.time = postmortemPostedAt;
+                            postmortemMetric.timeUnixNano = OneUptimeDate.toUnixNano(postmortemMetric.time);
+                            postmortemMetric.metricPointType = MetricPointType.Sum;
+                            await MetricService.create({
+                                data: postmortemMetric,
+                                props: {
+                                    isRoot: true,
+                                },
+                            });
+                            const postmortemMetricType = new MetricType();
+                            postmortemMetricType.name =
+                                IncidentMetricType.PostmortemCompletionTime;
+                            postmortemMetricType.description =
+                                "Time from incident resolution to postmortem publication";
+                            postmortemMetricType.unit = "seconds";
+                            TelemetryUtil.indexMetricNameServiceNameMap({
+                                metricNameServiceNameMap: {
+                                    [postmortemMetricType.name]: postmortemMetricType,
+                                },
+                                projectId: projectId,
+                            }).catch((err) => {
+                                logger.error(err);
+                            });
+                        }
+                    }
+                    catch (metricError) {
+                        logger.error(`Failed to emit postmortem completion time metric: ${metricError}`);
+                    }
+                }
                 let shouldAddIncidentFeed = false;
                 let feedInfoInMarkdown = `**[${incidentLabel}](${incidentLink.toString()}) was updated.**`;
                 if (Object.prototype.hasOwnProperty.call(updatedIncidentData, "title")) {
@@ -1075,6 +1140,48 @@ ${incidentSeverity.name}
                         catch (slaError) {
                             logger.error(`SLA recalculation failed in IncidentService.onUpdateSuccess: ${slaError}`);
                         }
+                        // emit severity change metric
+                        try {
+                            const severityChangeMetric = new Metric();
+                            severityChangeMetric.projectId = projectId;
+                            severityChangeMetric.serviceId = incidentId;
+                            severityChangeMetric.serviceType = ServiceType.Incident;
+                            severityChangeMetric.name = IncidentMetricType.SeverityChange;
+                            severityChangeMetric.value = 1;
+                            severityChangeMetric.attributes = {
+                                incidentId: incidentId.toString(),
+                                projectId: projectId.toString(),
+                                newIncidentSeverityId: ((_c = incidentSeverity._id) === null || _c === void 0 ? void 0 : _c.toString()) || "",
+                                newIncidentSeverityName: ((_d = incidentSeverity.name) === null || _d === void 0 ? void 0 : _d.toString()) || "",
+                            };
+                            severityChangeMetric.attributeKeys =
+                                TelemetryUtil.getAttributeKeys(severityChangeMetric.attributes);
+                            severityChangeMetric.time = OneUptimeDate.getCurrentDate();
+                            severityChangeMetric.timeUnixNano = OneUptimeDate.toUnixNano(severityChangeMetric.time);
+                            severityChangeMetric.metricPointType = MetricPointType.Sum;
+                            await MetricService.create({
+                                data: severityChangeMetric,
+                                props: {
+                                    isRoot: true,
+                                },
+                            });
+                            const severityChangeMetricType = new MetricType();
+                            severityChangeMetricType.name = IncidentMetricType.SeverityChange;
+                            severityChangeMetricType.description =
+                                "Count of incident severity changes";
+                            severityChangeMetricType.unit = "";
+                            TelemetryUtil.indexMetricNameServiceNameMap({
+                                metricNameServiceNameMap: {
+                                    [severityChangeMetricType.name]: severityChangeMetricType,
+                                },
+                                projectId: projectId,
+                            }).catch((err) => {
+                                logger.error(err);
+                            });
+                        }
+                        catch (metricError) {
+                            logger.error(`Failed to emit severity change metric: ${metricError}`);
+                        }
                     }
                 }
                 const carryForward = onUpdate.carryForward;
@@ -1162,7 +1269,7 @@ ${incidentSeverity.name}
                         }
                         const changeNewMonitorStatusTo = incidentCarryForward.newMonitorChangeStatusIdTo ||
                             incidentCarryForward.oldChangeMonitorStatusIdTo;
-                        if (((_c = incidentCarryForward.monitorsAdded) === null || _c === void 0 ? void 0 : _c.length) > 0) {
+                        if (((_e = incidentCarryForward.monitorsAdded) === null || _e === void 0 ? void 0 : _e.length) > 0) {
                             await this.disableActiveMonitoringIfManualIncident(incidentId);
                         }
                         if (changeNewMonitorStatusTo) {
@@ -1234,7 +1341,7 @@ ${incidentSeverity.name}
         });
         return incidentCount.toNumber() > 0;
     }
-    async markMonitorsActiveForMonitoring(projectId, monitors) {
+    async markMonitorsActiveForMonitoring(projectId, monitors, startsAt) {
         // resolve all the monitors.
         var _a;
         if (monitors.length > 0) {
@@ -1293,6 +1400,9 @@ ${incidentSeverity.name}
                     monitorStatusTimeline.monitorId = monitor.id;
                     monitorStatusTimeline.projectId = projectId;
                     monitorStatusTimeline.monitorStatusId = resolvedMonitorState.id;
+                    if (startsAt) {
+                        monitorStatusTimeline.startsAt = startsAt;
+                    }
                     await MonitorStatusTimelineService.create({
                         data: monitorStatusTimeline,
                         props: {
@@ -1401,7 +1511,7 @@ ${incidentSeverity.name}
         });
     }
     async refreshIncidentMetrics(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         const incident = await this.findOneById({
             id: data.incidentId,
             select: {
@@ -1426,6 +1536,73 @@ ${incidentSeverity.name}
         if (!incident.projectId) {
             throw new BadDataException("Incident Project ID not found");
         }
+        // fetch owner users and teams for metric attributes
+        const ownerUsers = await IncidentOwnerUserService.findBy({
+            query: {
+                incidentId: data.incidentId,
+            },
+            select: {
+                _id: true,
+                user: {
+                    _id: true,
+                    name: true,
+                },
+            },
+            props: {
+                isRoot: true,
+            },
+            limit: LIMIT_PER_PROJECT,
+            skip: 0,
+        });
+        const ownerTeams = await IncidentOwnerTeamService.findBy({
+            query: {
+                incidentId: data.incidentId,
+            },
+            select: {
+                _id: true,
+                team: {
+                    _id: true,
+                    name: true,
+                },
+            },
+            props: {
+                isRoot: true,
+            },
+            limit: LIMIT_PER_PROJECT,
+            skip: 0,
+        });
+        const ownerUserIds = ownerUsers
+            .map((ownerUser) => {
+            var _a, _b;
+            return (_b = (_a = ownerUser.user) === null || _a === void 0 ? void 0 : _a._id) === null || _b === void 0 ? void 0 : _b.toString();
+        })
+            .filter((id) => {
+            return Boolean(id);
+        });
+        const ownerUserNames = ownerUsers
+            .map((ownerUser) => {
+            var _a, _b;
+            return (_b = (_a = ownerUser.user) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.toString();
+        })
+            .filter((name) => {
+            return Boolean(name);
+        });
+        const ownerTeamIds = ownerTeams
+            .map((ownerTeam) => {
+            var _a, _b;
+            return (_b = (_a = ownerTeam.team) === null || _a === void 0 ? void 0 : _a._id) === null || _b === void 0 ? void 0 : _b.toString();
+        })
+            .filter((id) => {
+            return Boolean(id);
+        });
+        const ownerTeamNames = ownerTeams
+            .map((ownerTeam) => {
+            var _a, _b;
+            return (_b = (_a = ownerTeam.team) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.toString();
+        })
+            .filter((name) => {
+            return Boolean(name);
+        });
         // get incident state timeline
         const incidentStateTimelines = await IncidentStateTimelineService.findBy({
             query: {
@@ -1435,8 +1612,10 @@ ${incidentSeverity.name}
                 projectId: true,
                 incidentStateId: true,
                 incidentState: {
+                    name: true,
                     isAcknowledgedState: true,
                     isResolvedState: true,
+                    isCreatedState: true,
                 },
                 startsAt: true,
                 endsAt: true,
@@ -1468,13 +1647,8 @@ ${incidentSeverity.name}
             incident.createdAt ||
             OneUptimeDate.getCurrentDate();
         const metricTypesMap = {};
-        const incidentCountMetric = new Metric();
-        incidentCountMetric.projectId = incident.projectId;
-        incidentCountMetric.serviceId = incident.id;
-        incidentCountMetric.serviceType = ServiceType.Incident;
-        incidentCountMetric.name = IncidentMetricType.IncidentCount;
-        incidentCountMetric.value = 1;
-        incidentCountMetric.attributes = {
+        // common attributes shared by all incident metrics
+        const baseMetricAttributes = {
             incidentId: data.incidentId.toString(),
             projectId: incident.projectId.toString(),
             monitorIds: ((_a = incident.monitors) === null || _a === void 0 ? void 0 : _a.map((monitor) => {
@@ -1487,7 +1661,18 @@ ${incidentSeverity.name}
             })) || [],
             incidentSeverityId: (_d = (_c = incident.incidentSeverity) === null || _c === void 0 ? void 0 : _c._id) === null || _d === void 0 ? void 0 : _d.toString(),
             incidentSeverityName: (_f = (_e = incident.incidentSeverity) === null || _e === void 0 ? void 0 : _e.name) === null || _f === void 0 ? void 0 : _f.toString(),
+            ownerUserIds: ownerUserIds,
+            ownerUserNames: ownerUserNames,
+            ownerTeamIds: ownerTeamIds,
+            ownerTeamNames: ownerTeamNames,
         };
+        const incidentCountMetric = new Metric();
+        incidentCountMetric.projectId = incident.projectId;
+        incidentCountMetric.serviceId = incident.id;
+        incidentCountMetric.serviceType = ServiceType.Incident;
+        incidentCountMetric.name = IncidentMetricType.IncidentCount;
+        incidentCountMetric.value = 1;
+        incidentCountMetric.attributes = Object.assign({}, baseMetricAttributes);
         incidentCountMetric.attributeKeys = TelemetryUtil.getAttributeKeys(incidentCountMetric.attributes);
         incidentCountMetric.time = incidentStartsAt;
         incidentCountMetric.timeUnixNano = OneUptimeDate.toUnixNano(incidentCountMetric.time);
@@ -1518,20 +1703,7 @@ ${incidentSeverity.name}
                 timeToAcknowledgeMetric.serviceType = ServiceType.Incident;
                 timeToAcknowledgeMetric.name = IncidentMetricType.TimeToAcknowledge;
                 timeToAcknowledgeMetric.value = OneUptimeDate.getDifferenceInSeconds((ackIncidentStateTimeline === null || ackIncidentStateTimeline === void 0 ? void 0 : ackIncidentStateTimeline.startsAt) || OneUptimeDate.getCurrentDate(), incidentStartsAt);
-                timeToAcknowledgeMetric.attributes = {
-                    incidentId: data.incidentId.toString(),
-                    projectId: incident.projectId.toString(),
-                    monitorIds: ((_g = incident.monitors) === null || _g === void 0 ? void 0 : _g.map((monitor) => {
-                        var _a;
-                        return (_a = monitor._id) === null || _a === void 0 ? void 0 : _a.toString();
-                    })) || [],
-                    monitorNames: ((_h = incident.monitors) === null || _h === void 0 ? void 0 : _h.map((monitor) => {
-                        var _a;
-                        return (_a = monitor.name) === null || _a === void 0 ? void 0 : _a.toString();
-                    })) || [],
-                    incidentSeverityId: (_k = (_j = incident.incidentSeverity) === null || _j === void 0 ? void 0 : _j._id) === null || _k === void 0 ? void 0 : _k.toString(),
-                    incidentSeverityName: (_m = (_l = incident.incidentSeverity) === null || _l === void 0 ? void 0 : _l.name) === null || _m === void 0 ? void 0 : _m.toString(),
-                };
+                timeToAcknowledgeMetric.attributes = Object.assign({}, baseMetricAttributes);
                 timeToAcknowledgeMetric.attributeKeys = TelemetryUtil.getAttributeKeys(timeToAcknowledgeMetric.attributes);
                 timeToAcknowledgeMetric.time =
                     (ackIncidentStateTimeline === null || ackIncidentStateTimeline === void 0 ? void 0 : ackIncidentStateTimeline.startsAt) ||
@@ -1568,20 +1740,7 @@ ${incidentSeverity.name}
                 timeToResolveMetric.name = IncidentMetricType.TimeToResolve;
                 timeToResolveMetric.value = OneUptimeDate.getDifferenceInSeconds((resolvedIncidentStateTimeline === null || resolvedIncidentStateTimeline === void 0 ? void 0 : resolvedIncidentStateTimeline.startsAt) ||
                     OneUptimeDate.getCurrentDate(), incidentStartsAt);
-                timeToResolveMetric.attributes = {
-                    incidentId: data.incidentId.toString(),
-                    projectId: incident.projectId.toString(),
-                    monitorIds: ((_o = incident.monitors) === null || _o === void 0 ? void 0 : _o.map((monitor) => {
-                        var _a;
-                        return (_a = monitor._id) === null || _a === void 0 ? void 0 : _a.toString();
-                    })) || [],
-                    monitorNames: ((_p = incident.monitors) === null || _p === void 0 ? void 0 : _p.map((monitor) => {
-                        var _a;
-                        return (_a = monitor.name) === null || _a === void 0 ? void 0 : _a.toString();
-                    })) || [],
-                    incidentSeverityId: (_r = (_q = incident.incidentSeverity) === null || _q === void 0 ? void 0 : _q._id) === null || _r === void 0 ? void 0 : _r.toString(),
-                    incidentSeverityName: (_t = (_s = incident.incidentSeverity) === null || _s === void 0 ? void 0 : _s.name) === null || _t === void 0 ? void 0 : _t.toString(),
-                };
+                timeToResolveMetric.attributes = Object.assign({}, baseMetricAttributes);
                 timeToResolveMetric.attributeKeys = TelemetryUtil.getAttributeKeys(timeToResolveMetric.attributes);
                 timeToResolveMetric.time =
                     (resolvedIncidentStateTimeline === null || resolvedIncidentStateTimeline === void 0 ? void 0 : resolvedIncidentStateTimeline.startsAt) ||
@@ -1611,20 +1770,7 @@ ${incidentSeverity.name}
             incidentDurationMetric.serviceType = ServiceType.Incident;
             incidentDurationMetric.name = IncidentMetricType.IncidentDuration;
             incidentDurationMetric.value = OneUptimeDate.getDifferenceInSeconds(incidentEndsAt, incidentStartsAt);
-            incidentDurationMetric.attributes = {
-                incidentId: data.incidentId.toString(),
-                projectId: incident.projectId.toString(),
-                monitorIds: ((_u = incident.monitors) === null || _u === void 0 ? void 0 : _u.map((monitor) => {
-                    var _a;
-                    return (_a = monitor._id) === null || _a === void 0 ? void 0 : _a.toString();
-                })) || [],
-                monitorNames: ((_v = incident.monitors) === null || _v === void 0 ? void 0 : _v.map((monitor) => {
-                    var _a;
-                    return (_a = monitor.name) === null || _a === void 0 ? void 0 : _a.toString();
-                })) || [],
-                incidentSeverityId: (_x = (_w = incident.incidentSeverity) === null || _w === void 0 ? void 0 : _w._id) === null || _x === void 0 ? void 0 : _x.toString(),
-                incidentSeverityName: (_z = (_y = incident.incidentSeverity) === null || _y === void 0 ? void 0 : _y.name) === null || _z === void 0 ? void 0 : _z.toString(),
-            };
+            incidentDurationMetric.attributes = Object.assign({}, baseMetricAttributes);
             incidentDurationMetric.attributeKeys = TelemetryUtil.getAttributeKeys(incidentDurationMetric.attributes);
             incidentDurationMetric.time =
                 (lastIncidentStateTimeline === null || lastIncidentStateTimeline === void 0 ? void 0 : lastIncidentStateTimeline.startsAt) ||
@@ -1642,6 +1788,36 @@ ${incidentSeverity.name}
             // add to map.
             metricTypesMap[incidentDurationMetric.name] = metricType;
         }
+        // time-in-state metrics — emit one metric per state transition that has a completed duration
+        for (const timeline of incidentStateTimelines) {
+            if (!timeline.startsAt || !timeline.endsAt) {
+                continue;
+            }
+            const stateName = ((_h = (_g = timeline.incidentState) === null || _g === void 0 ? void 0 : _g.name) === null || _h === void 0 ? void 0 : _h.toString()) || "Unknown";
+            const timeInStateMetric = new Metric();
+            timeInStateMetric.projectId = incident.projectId;
+            timeInStateMetric.serviceId = incident.id;
+            timeInStateMetric.serviceType = ServiceType.Incident;
+            timeInStateMetric.name = IncidentMetricType.TimeInState;
+            timeInStateMetric.value = OneUptimeDate.getDifferenceInSeconds(timeline.endsAt, timeline.startsAt);
+            timeInStateMetric.attributes = Object.assign(Object.assign({}, baseMetricAttributes), { incidentStateName: stateName, incidentStateId: (_j = timeline.incidentStateId) === null || _j === void 0 ? void 0 : _j.toString(), isCreatedState: ((_l = (_k = timeline.incidentState) === null || _k === void 0 ? void 0 : _k.isCreatedState) === null || _l === void 0 ? void 0 : _l.toString()) || "false", isAcknowledgedState: ((_o = (_m = timeline.incidentState) === null || _m === void 0 ? void 0 : _m.isAcknowledgedState) === null || _o === void 0 ? void 0 : _o.toString()) || "false", isResolvedState: ((_q = (_p = timeline.incidentState) === null || _p === void 0 ? void 0 : _p.isResolvedState) === null || _q === void 0 ? void 0 : _q.toString()) || "false" });
+            timeInStateMetric.attributeKeys = TelemetryUtil.getAttributeKeys(timeInStateMetric.attributes);
+            timeInStateMetric.time = timeline.startsAt;
+            timeInStateMetric.timeUnixNano = OneUptimeDate.toUnixNano(timeInStateMetric.time);
+            timeInStateMetric.metricPointType = MetricPointType.Sum;
+            itemsToSave.push(timeInStateMetric);
+        }
+        // add metric type for time-in-state to map (only once)
+        if (incidentStateTimelines.some((t) => {
+            return t.startsAt && t.endsAt;
+        })) {
+            const timeInStateMetricType = new MetricType();
+            timeInStateMetricType.name = IncidentMetricType.TimeInState;
+            timeInStateMetricType.description =
+                "Time spent in each incident state (e.g. Created, Investigating, Acknowledged)";
+            timeInStateMetricType.unit = "seconds";
+            metricTypesMap[timeInStateMetricType.name] = timeInStateMetricType;
+        }
         await MetricService.createMany({
             items: itemsToSave,
             props: {
@@ -1911,7 +2087,7 @@ __decorate([
     CaptureSpan(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [ObjectID,
-        Array]),
+        Array, Object]),
     __metadata("design:returntype", Promise)
 ], Service.prototype, "markMonitorsActiveForMonitoring", null);
 __decorate([