@oneuptime/common 14.0.12 → 14.0.14

package/build/dist/Server/Utils/Greenlock/Greenlock.js.map

@@ -1 +1 @@
-{"version":3,"file":"Greenlock.js","sourceRoot":"","sources":["../../../../../Server/Utils/Greenlock/Greenlock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Greenlock.js","sourceRoot":"","sources":["../../../../../Server/Utils/Greenlock/Greenlock.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Measurement/MeasurementDefinitionChange.js

@@ -0,0 +1,43 @@
+import MeasurementStateReference from "./MeasurementStateReference";
+export default class MeasurementDefinitionChange {
+    // Empty, null and missing are the same: nothing set.
+    static normalize(value) {
+        if (value === null || value === undefined) {
+            return "";
+        }
+        if (typeof value === "string") {
+            return value.trim();
+        }
+        return String(value);
+    }
+    static isChanged(data) {
+        const sets = (key) => {
+            return Object.prototype.hasOwnProperty.call(data.update, key);
+        };
+        for (const column of data.columns) {
+            if (sets(column) &&
+                MeasurementDefinitionChange.normalize(data.update[column]) !==
+                    MeasurementDefinitionChange.normalize(data.stored[column])) {
+                return true;
+            }
+        }
+        for (const pickedState of data.pickedStates) {
+            if (!sets(pickedState.stateIdKey) && !sets(pickedState.stateKey)) {
+                continue;
+            }
+            const updatedStateId = MeasurementStateReference.getStateIdForUpdate({
+                update: data.update,
+                stateIdKey: pickedState.stateIdKey,
+                stateKey: pickedState.stateKey,
+                storedStateId: data.stored[pickedState.stateIdKey],
+            }) || "";
+            const storedStateId = MeasurementStateReference.getId(data.stored[pickedState.stateIdKey]) ||
+                "";
+            if (updatedStateId !== storedStateId) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
+//# sourceMappingURL=MeasurementDefinitionChange.js.map

package/build/dist/Server/Utils/Measurement/MeasurementDefinitionChange.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MeasurementDefinitionChange.js","sourceRoot":"","sources":["../../../../../Server/Utils/Measurement/MeasurementDefinitionChange.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AAoBpE,MAAM,CAAC,OAAO,OAAO,2BAA2B;IAC9C,qDAAqD;IAC7C,MAAM,CAAC,SAAS,CAAC,KAAc;QACrC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAC1C,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC;QAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,IAOvB;QACC,MAAM,IAAI,GAA6B,CAAC,GAAW,EAAW,EAAE;YAC9D,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAChE,CAAC,CAAC;QAEF,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,IACE,IAAI,CAAC,MAAM,CAAC;gBACZ,2BAA2B,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBACxD,2BAA2B,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAC5D,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACjE,SAAS;YACX,CAAC;YAED,MAAM,cAAc,GAClB,yBAAyB,CAAC,mBAAmB,CAAC;gBAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC;aACnD,CAAC,IAAI,EAAE,CAAC;YAEX,MAAM,aAAa,GACjB,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;gBACpE,EAAE,CAAC;YAEL,IAAI,cAAc,KAAK,aAAa,EAAE,CAAC;gBACrC,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}

package/build/dist/Server/Utils/Measurement/MeasurementDefinitionValidator.js

@@ -1,5 +1,6 @@
 import BadDataException from "../../../Types/Exception/BadDataException";
 import MeasurementOccurrence from "../../../Types/Measurement/MeasurementOccurrence";
+import { MEASUREMENT_KEY_PATTERN, isValidMeasurementKey, } from "../../../Types/Measurement/MeasurementKey";
 /*
  * Validation shared by the incident, alert and scheduled maintenance
  * measurement services.
@@ -13,7 +14,7 @@ class MeasurementDefinitionValidator {
         if (!key) {
             throw new BadDataException("A measurement needs a key. Use lowercase letters, numbers and hyphens, for example: time-to-detect");
         }
-        if (!MeasurementDefinitionValidator.KEY_PATTERN.test(key)) {
+        if (!isValidMeasurementKey(key)) {
             throw new BadDataException(`"${key}" is not a valid measurement key. Keys start with a lowercase letter or number, contain only lowercase letters, numbers and hyphens, and are at most 50 characters. For example: time-to-detect`);
         }
     }
@@ -101,9 +102,10 @@ class MeasurementDefinitionValidator {
 /*
  * The key becomes part of the metric name, which lands in ClickHouse, in
  * the dashboard chart picker and in the API. It is immutable after
- * creation, so it is worth rejecting a bad one loudly at the only moment
- * it can still be changed.
+ * creation, so a key someone typed is worth rejecting loudly at the only
+ * moment it can still be changed. A key left out is made from the name
+ * instead (MeasurementKeyAssigner), and always fits.
  */
-MeasurementDefinitionValidator.KEY_PATTERN = /^[a-z0-9][a-z0-9-]{0,49}$/;
+MeasurementDefinitionValidator.KEY_PATTERN = MEASUREMENT_KEY_PATTERN;
 export default MeasurementDefinitionValidator;
 //# sourceMappingURL=MeasurementDefinitionValidator.js.map

package/build/dist/Server/Utils/Measurement/MeasurementDefinitionValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"MeasurementDefinitionValidator.js","sourceRoot":"","sources":["../../../../../Server/Utils/Measurement/MeasurementDefinitionValidator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MeasurementDefinitionValidator.js","sourceRoot":"","sources":["../../../../../Server/Utils/Measurement/MeasurementDefinitionValidator.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Measurement/MeasurementKeyAssigner.js

@@ -0,0 +1,33 @@
+import MeasurementDefinitionValidator from "./MeasurementDefinitionValidator";
+import BadDataException from "../../../Types/Exception/BadDataException";
+import { generateMeasurementKey } from "../../../Types/Measurement/MeasurementKey";
+/*
+ * The key a new incident, alert or scheduled maintenance measurement is
+ * created with. Shared by the three measurement services.
+ *
+ * A key is never required. Left out - by the dashboard, which only sends one
+ * someone typed, by an API client or by Terraform - it is made from the name
+ * ("Time to Detect" -> "time-to-detect"), with -2, -3 and so on added when
+ * another measurement of the project already has it. A key that is sent is
+ * kept exactly as sent, or refused: it must be a valid key, and no other
+ * measurement of the project may have it. Refused rather than renumbered,
+ * because whoever typed it is going to look for that metric name.
+ */
+export default class MeasurementKeyAssigner {
+    static async getKeyForCreate(data) {
+        const requestedKey = typeof data.key === "string" ? data.key : "";
+        if (requestedKey.trim().length === 0) {
+            return generateMeasurementKey({
+                name: typeof data.name === "string" ? data.name : "",
+                existingKeys: await data.getKeysInProject(),
+            });
+        }
+        MeasurementDefinitionValidator.validateKey(requestedKey);
+        const keysInProject = await data.getKeysInProject();
+        if (keysInProject.includes(requestedKey)) {
+            throw new BadDataException(`Another measurement in this project already has the key "${requestedKey}". Pick a different key, or leave the key out and one is made from the name.`);
+        }
+        return requestedKey;
+    }
+}
+//# sourceMappingURL=MeasurementKeyAssigner.js.map

package/build/dist/Server/Utils/Measurement/MeasurementKeyAssigner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MeasurementKeyAssigner.js","sourceRoot":"","sources":["../../../../../Server/Utils/Measurement/MeasurementKeyAssigner.ts"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAC9E,OAAO,gBAAgB,MAAM,2CAA2C,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAC;AAEnF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,OAAO,OAAO,sBAAsB;IAClC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,IAUnC;QACC,MAAM,YAAY,GAAW,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAE1E,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,OAAO,sBAAsB,CAAC;gBAC5B,IAAI,EAAE,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gBACpD,YAAY,EAAE,MAAM,IAAI,CAAC,gBAAgB,EAAE;aAC5C,CAAC,CAAC;QACL,CAAC;QAED,8BAA8B,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAEzD,MAAM,aAAa,GAAkB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAEnE,IAAI,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,gBAAgB,CACxB,4DAA4D,YAAY,8EAA8E,CACvJ,CAAC;QACJ,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CACF"}

package/build/dist/Server/Utils/Measurement/MeasurementMetricWriter.js

@@ -5,6 +5,7 @@ import GlobalConfigService from "../../Services/GlobalConfigService";
 import MutableMetricService from "../../Services/MutableMetricService";
 import ObjectID from "../../../Types/ObjectID";
 import OneUptimeDate from "../../../Types/Date";
+import { convertMeasurementValueFromSeconds, getMeasurementUnit, } from "../../../Types/Measurement/MeasurementUnit";
 import TelemetryUtil from "../Telemetry/Telemetry";
 import logger from "../Logger";
 const DEFAULT_METRIC_RETENTION_IN_DAYS = 180;
@@ -40,7 +41,15 @@ export default class MeasurementMetricWriter {
              * definitions would make each refresh overwrite the others.
              */
             metric.metricPointId = `measurement:${point.measurementId}`;
-            metric.value = point.valueInSeconds;
+            /*
+             * In the measurement's unit, which is what the metric is registered
+             * with below: a chart labels the number with the unit, so the number
+             * has to be in it. Seconds - the default - stay as they are.
+             */
+            metric.value = convertMeasurementValueFromSeconds({
+                valueInSeconds: point.valueInSeconds,
+                unit: point.unit,
+            });
             metric.time = point.time;
             metric.timeUnixNano = OneUptimeDate.toUnixNano(point.time);
             metric.metricPointType = MetricPointType.Sum;
@@ -59,7 +68,11 @@ export default class MeasurementMetricWriter {
             metricType.description =
                 point.description ||
                     `${point.measurementName}, a measurement defined for this project`;
-            metricType.unit = point.unit || "seconds";
+            /*
+             * The unit the value above was written in - "seconds", "minutes",
+             * "hours" or "days" - never a spelling a chart cannot read as one.
+             */
+            metricType.unit = getMeasurementUnit(point.unit);
             metricTypesMap[point.metricName] = metricType;
         }
         await MutableMetricService.replaceEntityMetrics({

package/build/dist/Server/Utils/Measurement/MeasurementMetricWriter.js.map

@@ -1 +1 @@
-{"version":3,"file":"MeasurementMetricWriter.js","sourceRoot":"","sources":["../../../../../Server/Utils/Measurement/MeasurementMetricWriter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MeasurementMetricWriter.js","sourceRoot":"","sources":["../../../../../Server/Utils/Measurement/MeasurementMetricWriter.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Measurement/MeasurementStateReference.js

@@ -0,0 +1,72 @@
+import { ObjectType } from "../../../Types/JSON";
+import ObjectID from "../../../Types/ObjectID";
+/*
+ * The state one end of a measurement is pinned to, when that end is "the
+ * moment it entered this state" (State Entered).
+ *
+ * A measurement model holds the state twice: the relation
+ * (startIncidentState) and its id column (startIncidentStateId), and a
+ * request may send either. The dashboard's state picker sends the relation
+ * - ModelForm turns the picked id into a related row - while the services
+ * validated the id column alone. So every measurement set up in the
+ * dashboard to start or end at a state was refused with "Pick the state
+ * this measurement starts from", the state picked right there on the form.
+ * The services read the state through here instead, from whichever of the
+ * two a request sent.
+ *
+ * Read only: the request is saved as it was sent. Writing the id column
+ * next to a relation that sets the same database column would have the
+ * update name that column twice.
+ */
+export default class MeasurementStateReference {
+    /**
+     * The id a value holds: an id (a string or an ObjectID), or a related row
+     * ({ _id } or { id }). Undefined for anything else.
+     */
+    static getId(value) {
+        if (value === null || value === undefined) {
+            return undefined;
+        }
+        if (typeof value === "string") {
+            return value.trim() || undefined;
+        }
+        if (value instanceof ObjectID) {
+            return value.toString().trim() || undefined;
+        }
+        if (typeof value !== "object") {
+            return undefined;
+        }
+        const record = value;
+        // An ObjectID as JSON: { _type: "ObjectID", value }.
+        if (record["_type"] === ObjectType.ObjectID) {
+            return MeasurementStateReference.getId(record["value"]);
+        }
+        return (MeasurementStateReference.getId(record["_id"]) ||
+            MeasurementStateReference.getId(record["id"]));
+    }
+    /**
+     * The state a new measurement names: its id column, or else its relation.
+     */
+    static getStateIdForCreate(data) {
+        return (MeasurementStateReference.getId(data.stateId) ||
+            MeasurementStateReference.getId(data.state));
+    }
+    /**
+     * The state a measurement names once an update is applied: what the
+     * update sets - the id column, or the relation, where null clears it - and
+     * otherwise the state it already had.
+     */
+    static getStateIdForUpdate(data) {
+        const sets = (key) => {
+            return Object.prototype.hasOwnProperty.call(data.update, key);
+        };
+        if (sets(data.stateIdKey)) {
+            return MeasurementStateReference.getId(data.update[data.stateIdKey]);
+        }
+        if (sets(data.stateKey)) {
+            return MeasurementStateReference.getId(data.update[data.stateKey]);
+        }
+        return MeasurementStateReference.getId(data.storedStateId);
+    }
+}
+//# sourceMappingURL=MeasurementStateReference.js.map

package/build/dist/Server/Utils/Measurement/MeasurementStateReference.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MeasurementStateReference.js","sourceRoot":"","sources":["../../../../../Server/Utils/Measurement/MeasurementStateReference.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAE/C;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,OAAO,OAAO,yBAAyB;IAC5C;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,KAAc;QAChC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAC1C,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;QACnC,CAAC;QAED,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC;QAC9C,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,MAAM,GAA4B,KAAgC,CAAC;QAEzE,qDAAqD;QACrD,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC5C,OAAO,yBAAyB,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO,CACL,yBAAyB,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC9C,yBAAyB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAC9C,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,mBAAmB,CAAC,IAGjC;QACC,OAAO,CACL,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;YAC7C,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAC5C,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,mBAAmB,CAAC,IAKjC;QACC,MAAM,IAAI,GAA6B,CAAC,GAAW,EAAW,EAAE;YAC9D,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAChE,CAAC,CAAC;QAEF,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC1B,OAAO,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QACvE,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxB,OAAO,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC7D,CAAC;CACF"}