@oneuptime/common 7.0.3263 → 7.0.3279

package/Server/API/ProbeAPI.ts

@@ -13,7 +13,7 @@ import LIMIT_MAX from "Common/Types/Database/LimitMax";
 import PositiveNumber from "Common/Types/PositiveNumber";
 import Probe from "Common/Models/DatabaseModels/Probe";
 
-export default class Ingestor extends BaseAPI<Probe, ProbeServiceType> {
+export default class ProbeAPI extends BaseAPI<Probe, ProbeServiceType> {
   public constructor() {
     super(Probe, ProbeService);
 

package/Server/EnvironmentConfig.ts

@@ -18,6 +18,7 @@ export enum ConfigLogLevel {
   WARN = "WARN",
   ERROR = "ERROR",
   DEBUG = "DEBUG",
+  OFF = "OFF",
 }
 
 export const getAllEnvVars: () => JSONObject = (): JSONObject => {
@@ -88,9 +89,27 @@ export const AppApiHostname: Hostname = Hostname.fromString(
   }`,
 );
 
-export const IngestorHostname: Hostname = Hostname.fromString(
-  `${process.env["SERVER_INGESTOR_HOSTNAME"] || "localhost"}:${
-    process.env["INGESTOR_PORT"] || 80
+export const ProbeIngestHostname: Hostname = Hostname.fromString(
+  `${process.env["SERVER_PROBE_INGEST_HOSTNAME"] || "localhost"}:${
+    process.env["PROBE_INGEST_PORT"] || 80
+  }`,
+);
+
+export const OpenTelemetryIngestHostname: Hostname = Hostname.fromString(
+  `${process.env["SERVER_OPEN_TELEMETRY_INGEST_HOSTNAME"] || "localhost"}:${
+    process.env["OPEN_TELEMETRY_INGEST_PORT"] || 80
+  }`,
+);
+
+export const IncomingRequestIngestHostname: Hostname = Hostname.fromString(
+  `${process.env["SERVER_INCOMING_REQUEST_INGEST_HOSTNAME"] || "localhost"}:${
+    process.env["INCOMING_REQUEST_INGEST_PORT"] || 80
+  }`,
+);
+
+export const FluentIngestHostname: Hostname = Hostname.fromString(
+  `${process.env["SERVER_FLUENT_INGEST_HOSTNAME"] || "localhost"}:${
+    process.env["FLUENT_INGEST_PORT"] || 80
   }`,
 );
 

package/Server/Infrastructure/ClickhouseConfig.ts

@@ -17,7 +17,7 @@ export type ClickHouseClientConfigOptions = NodeClickHouseClientConfigOptions;
 const hostProtocol: string = ClickHouseIsHostHttps ? "https" : "http";
 
 const options: ClickHouseClientConfigOptions = {
-  host: `${hostProtocol}://${ClickhouseHost.toString()}:${ClickhousePort.toNumber()}`,
+  url: `${hostProtocol}://${ClickhouseHost.toString()}:${ClickhousePort.toNumber()}`,
   username: ClickhouseUsername,
   password: ClickhousePassword,
   database: ClickhouseDatabase,

package/Server/Infrastructure/ClickhouseDatabase.ts

@@ -100,7 +100,12 @@ export default class ClickhouseDatabase {
   public async checkConnnectionStatus(): Promise<boolean> {
     // Ping clickhouse to check if the connection is still alive
     try {
+      logger.debug(
+        "Checking Clickhouse Connection Status - pinging clickhouse",
+      );
       const result: PingResult | undefined = await this.getDataSource()?.ping();
+      logger.debug("Clickhouse Connection Status Result");
+      logger.debug(result);
 
       if (!result) {
         throw new DatabaseNotConnectedException(

package/Server/Middleware/TelemetryIngest.ts

@@ -0,0 +1,77 @@
+import BadRequestException from "../../Types/Exception/BadRequestException";
+import ProductType from "../../Types/MeteredPlan/ProductType";
+import ObjectID from "../../Types/ObjectID";
+import {
+  ExpressRequest,
+  ExpressResponse,
+  NextFunction,
+} from "../../Server/Utils/Express";
+import TelemetryIngestionKeyService from "../../Server/Services/TelemetryIngestionKeyService";
+import TelemetryIngestionKey from "../../Models/DatabaseModels/TelemetryIngestionKey";
+
+export interface TelemetryRequest extends ExpressRequest {
+  projectId: ObjectID; // Project ID
+  productType: ProductType; // what is the product type of the request - logs, metrics or traces.
+}
+
+export default class TelemetryIngest {
+  public static async isAuthorizedServiceMiddleware(
+    req: ExpressRequest,
+    _res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> {
+    try {
+      // check header.
+
+      let oneuptimeToken: string | undefined = req.headers[
+        "x-oneuptime-token"
+      ] as string | undefined;
+
+      // if x-oneuptime-service-token header is present then use that as token.
+      if (!oneuptimeToken) {
+        oneuptimeToken = req.headers["x-oneuptime-service-token"] as
+          | string
+          | undefined;
+      }
+
+      if (!oneuptimeToken) {
+        throw new BadRequestException("Missing header: x-oneuptime-token");
+      }
+
+      let projectId: ObjectID | undefined = undefined;
+
+      const token: TelemetryIngestionKey | null =
+        await TelemetryIngestionKeyService.findOneBy({
+          query: {
+            secretKey: new ObjectID(oneuptimeToken?.toString() || ""),
+          },
+          select: {
+            projectId: true,
+          },
+          props: {
+            isRoot: true,
+          },
+        });
+
+      if (!token) {
+        throw new BadRequestException(
+          "Invalid service token: " + oneuptimeToken,
+        );
+      }
+
+      projectId = token.projectId as ObjectID;
+
+      if (!projectId) {
+        throw new BadRequestException(
+          "Project ID not found for service token: " + oneuptimeToken,
+        );
+      }
+
+      (req as TelemetryRequest).projectId = projectId as ObjectID;
+
+      next();
+    } catch (err) {
+      return next(err);
+    }
+  }
+}

package/Server/Services/OpenTelemetryIngestService.ts

@@ -0,0 +1,198 @@
+import OneUptimeDate from "Common/Types/Date";
+import { JSONArray, JSONObject } from "Common/Types/JSON";
+import JSONFunctions from "Common/Types/JSONFunctions";
+import ObjectID from "Common/Types/ObjectID";
+import Metric, {
+  AggregationTemporality,
+} from "Common/Models/AnalyticsModels/Metric";
+import Dictionary from "Common/Types/Dictionary";
+import ProductType from "Common/Types/MeteredPlan/ProductType";
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
+import TelemetryUsageBillingService from "Common/Server/Services/TelemetryUsageBillingService";
+import logger from "Common/Server/Utils/Logger";
+import TelemetryService from "Common/Models/DatabaseModels/TelemetryService";
+import TelemetryServiceService from "Common/Server/Services/TelemetryServiceService";
+import { DEFAULT_RETENTION_IN_DAYS } from "Common/Models/DatabaseModels/TelemetryUsageBilling";
+import TelemetryUtil from "Common/Server/Utils/Telemetry/Telemetry";
+
+export enum OtelAggregationTemporality {
+  Cumulative = "AGGREGATION_TEMPORALITY_CUMULATIVE",
+  Delta = "AGGREGATION_TEMPORALITY_DELTA",
+}
+
+export interface TelemetryServiceDataIngested {
+  serviceName: string;
+  serviceId: ObjectID;
+  dataIngestedInGB: number;
+  dataRententionInDays: number;
+}
+
+export default class OTelIngestService {
+  public static async telemetryServiceFromName(data: {
+    serviceName: string;
+    projectId: ObjectID;
+  }): Promise<{
+    serviceId: ObjectID;
+    dataRententionInDays: number;
+  }> {
+    const service: TelemetryService | null =
+      await TelemetryServiceService.findOneBy({
+        query: {
+          projectId: data.projectId,
+          name: data.serviceName,
+        },
+        select: {
+          _id: true,
+          retainTelemetryDataForDays: true,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+    if (!service) {
+      // create service
+
+      const newService: TelemetryService = new TelemetryService();
+      newService.projectId = data.projectId;
+      newService.name = data.serviceName;
+      newService.description = data.serviceName;
+      newService.retainTelemetryDataForDays = DEFAULT_RETENTION_IN_DAYS;
+
+      const createdService: TelemetryService =
+        await TelemetryServiceService.create({
+          data: newService,
+          props: {
+            isRoot: true,
+          },
+        });
+
+      return {
+        serviceId: createdService.id!,
+        dataRententionInDays: DEFAULT_RETENTION_IN_DAYS,
+      };
+    }
+
+    return {
+      serviceId: service.id!,
+      dataRententionInDays:
+        service.retainTelemetryDataForDays || DEFAULT_RETENTION_IN_DAYS,
+    };
+  }
+
+  public static async recordDataIngestedUsgaeBilling(data: {
+    services: Dictionary<TelemetryServiceDataIngested>;
+    projectId: ObjectID;
+    productType: ProductType;
+  }): Promise<void> {
+    if (!IsBillingEnabled) {
+      return;
+    }
+
+    for (const serviceName in data.services) {
+      const serviceData: TelemetryServiceDataIngested | undefined =
+        data.services[serviceName];
+
+      if (!serviceData) {
+        continue;
+      }
+
+      TelemetryUsageBillingService.updateUsageBilling({
+        projectId: data.projectId,
+        productType: data.productType,
+        dataIngestedInGB: serviceData.dataIngestedInGB || 0,
+        telemetryServiceId: serviceData.serviceId,
+        retentionInDays: serviceData.dataRententionInDays,
+      }).catch((err: Error) => {
+        logger.error("Failed to update usage billing for OTel");
+        logger.error(err);
+      });
+    }
+  }
+
+  public static getMetricFromDatapoint(data: {
+    dbMetric: Metric;
+    datapoint: JSONObject;
+    aggregationTemporality: OtelAggregationTemporality;
+    isMonotonic: boolean | undefined;
+    telemetryServiceId: ObjectID;
+    telemetryServiceName: string;
+  }): Metric {
+    const { dbMetric, datapoint, aggregationTemporality, isMonotonic } = data;
+
+    const newDbMetric: Metric = Metric.fromJSON(
+      dbMetric.toJSON(),
+      Metric,
+    ) as Metric;
+
+    newDbMetric.startTimeUnixNano = datapoint["startTimeUnixNano"] as number;
+    newDbMetric.startTime = OneUptimeDate.fromUnixNano(
+      datapoint["startTimeUnixNano"] as number,
+    );
+
+    newDbMetric.timeUnixNano = datapoint["timeUnixNano"] as number;
+    newDbMetric.time = OneUptimeDate.fromUnixNano(
+      datapoint["timeUnixNano"] as number,
+    );
+
+    if (Object.keys(datapoint).includes("asInt")) {
+      newDbMetric.value = datapoint["asInt"] as number;
+    } else if (Object.keys(datapoint).includes("asDouble")) {
+      newDbMetric.value = datapoint["asDouble"] as number;
+    }
+
+    newDbMetric.count = datapoint["count"] as number;
+    newDbMetric.sum = datapoint["sum"] as number;
+
+    newDbMetric.min = datapoint["min"] as number;
+    newDbMetric.max = datapoint["max"] as number;
+
+    newDbMetric.bucketCounts = datapoint["bucketCounts"] as Array<number>;
+    newDbMetric.explicitBounds = datapoint["explicitBounds"] as Array<number>;
+
+    if (!newDbMetric.value) {
+      newDbMetric.value = newDbMetric.sum;
+    }
+
+    // attrbutes
+
+    if (Object.keys(datapoint).includes("attributes")) {
+      if (!newDbMetric.attributes) {
+        newDbMetric.attributes = {};
+      }
+
+      newDbMetric.attributes = {
+        ...(newDbMetric.attributes || {}),
+        ...TelemetryUtil.getAttributes({
+          items: datapoint["attributes"] as JSONArray,
+          telemetryServiceId: data.telemetryServiceId,
+          telemetryServiceName: data.telemetryServiceName,
+        }),
+      };
+    }
+
+    if (newDbMetric.attributes) {
+      newDbMetric.attributes = JSONFunctions.flattenObject(
+        newDbMetric.attributes,
+      );
+    }
+
+    // aggregationTemporality
+
+    if (aggregationTemporality) {
+      if (aggregationTemporality === OtelAggregationTemporality.Cumulative) {
+        newDbMetric.aggregationTemporality = AggregationTemporality.Cumulative;
+      }
+
+      if (aggregationTemporality === OtelAggregationTemporality.Delta) {
+        newDbMetric.aggregationTemporality = AggregationTemporality.Delta;
+      }
+    }
+
+    if (isMonotonic !== undefined) {
+      newDbMetric.isMonotonic = isMonotonic;
+    }
+
+    return newDbMetric;
+  }
+}

package/ServiceRoute.ts

@@ -26,7 +26,17 @@ export const ApiReferenceRoute: Route = new Route("/reference");
 
 export const AdminDashboardRoute: Route = new Route("/admin");
 
-export const IngestorRoute: Route = new Route("/ingestor");
+export const ProbeIngestRoute: Route = new Route("/probe-ingest");
+
+export const OpenTelemetryIngestRoute: Route = new Route(
+  "/open-telemetry-ingest",
+);
+
+export const IncomingRequestIngestRoute: Route = new Route(
+  "/incoming-request-ingest",
+);
+
+export const FluentIngestRoute: Route = new Route("/fluent-ingest");
 
 export const RealtimeRoute: Route = new Route("/realtime/socket");
 

package/Tests/Server/API/ProbeAPI.test.ts

@@ -1,4 +1,4 @@
-import Ingestor from "../../../Server/API/ProbeAPI";
+import ProbeAPI from "../../../Server/API/ProbeAPI";
 import ProbeService from "../../../Server/Services/ProbeService";
 import {
   ExpressRequest,
@@ -37,13 +37,13 @@ jest.mock("../../../Server/Utils/Response", () => {
 
 jest.mock("../../../Server/Services/ProbeService");
 
-describe("Ingestor", () => {
+describe("ProbeAPI", () => {
   let mockRequest: ExpressRequest;
   let mockResponse: ExpressResponse;
   let nextFunction: NextFunction;
 
   beforeEach(() => {
-    new Ingestor();
+    new ProbeAPI();
     mockRequest = {} as ExpressRequest;
     mockResponse = {
       send: jest.fn(),

package/UI/Config.ts

@@ -8,13 +8,16 @@ import {
   FileRoute,
   HomeRoute,
   IdentityRoute,
-  IngestorRoute,
+  ProbeIngestRoute,
   IntegrationRoute,
   NotificationRoute,
   RealtimeRoute,
   StatusPageApiRoute,
   StatusPageRoute,
   WorkflowRoute,
+  FluentIngestRoute,
+  IncomingRequestIngestRoute,
+  OpenTelemetryIngestRoute,
 } from "Common/ServiceRoute";
 import Hostname from "Common/Types/API/Hostname";
 import Protocol from "Common/Types/API/Protocol";
@@ -65,7 +68,15 @@ export const STATUS_PAGE_HOSTNAME: Hostname = Hostname.fromString(HOST);
 
 export const WORKFLOW_HOSTNAME: Hostname = Hostname.fromString(HOST);
 
-export const INGESTOR_HOSTNAME: Hostname = Hostname.fromString(HOST);
+export const PROBE_INGEST_HOSTNAME: Hostname = Hostname.fromString(HOST);
+
+export const OPEN_TELEMETRY_INGEST_HOSTNAME: Hostname =
+  Hostname.fromString(HOST);
+
+export const INCOMING_REQUEST_INGEST_HOSTNAME: Hostname =
+  Hostname.fromString(HOST);
+
+export const FLUENT_INGEST_HOSTNAME: Hostname = Hostname.fromString(HOST);
 
 export const HELM_HOSTNAME: Hostname = Hostname.fromString(HOST);
 
@@ -101,6 +112,18 @@ export const STATUS_PAGE_API_URL: URL = new URL(
   StatusPageApiRoute,
 );
 
+export const OPEN_TELEMETRY_INGEST_URL: URL = new URL(
+  HTTP_PROTOCOL,
+  OPEN_TELEMETRY_INGEST_HOSTNAME,
+  OpenTelemetryIngestRoute,
+);
+
+export const FLUENT_INGEST_URL: URL = new URL(
+  HTTP_PROTOCOL,
+  FLUENT_INGEST_HOSTNAME,
+  FluentIngestRoute,
+);
+
 export const IDENTITY_URL: URL = new URL(
   HTTP_PROTOCOL,
   IDENTITY_HOSTNAME,
@@ -119,10 +142,16 @@ export const WORKFLOW_URL: URL = new URL(
   WorkflowRoute,
 );
 
-export const INGESTOR_URL: URL = new URL(
+export const PROBE_INGEST_URL: URL = new URL(
+  HTTP_PROTOCOL,
+  PROBE_INGEST_HOSTNAME,
+  ProbeIngestRoute,
+);
+
+export const INCOMING_REQUEST_INGEST_URL: URL = new URL(
   HTTP_PROTOCOL,
-  INGESTOR_HOSTNAME,
-  IngestorRoute,
+  INCOMING_REQUEST_INGEST_HOSTNAME,
+  IncomingRequestIngestRoute,
 );
 
 export const STATUS_PAGE_URL: URL = new URL(

package/build/dist/Server/API/ProbeAPI.js

@@ -5,7 +5,7 @@ import BaseAPI from "./BaseAPI";
 import LIMIT_MAX from "Common/Types/Database/LimitMax";
 import PositiveNumber from "Common/Types/PositiveNumber";
 import Probe from "Common/Models/DatabaseModels/Probe";
-export default class Ingestor extends BaseAPI {
+export default class ProbeAPI extends BaseAPI {
     constructor() {
         var _a;
         super(Probe, ProbeService);

package/build/dist/Server/EnvironmentConfig.js

@@ -13,6 +13,7 @@ export var ConfigLogLevel;
     ConfigLogLevel["WARN"] = "WARN";
     ConfigLogLevel["ERROR"] = "ERROR";
     ConfigLogLevel["DEBUG"] = "DEBUG";
+    ConfigLogLevel["OFF"] = "OFF";
 })(ConfigLogLevel || (ConfigLogLevel = {}));
 export const getAllEnvVars = () => {
     return process.env;
@@ -38,7 +39,10 @@ export const AirtableBaseId = process.env["AIRTABLE_BASE_ID"] || "";
 export const ClusterKey = new ObjectID(process.env["ONEUPTIME_SECRET"] || "secret");
 export const HasClusterKey = Boolean(process.env["ONEUPTIME_SECRET"]);
 export const AppApiHostname = Hostname.fromString(`${process.env["SERVER_APP_HOSTNAME"] || "localhost"}:${process.env["APP_PORT"] || 80}`);
-export const IngestorHostname = Hostname.fromString(`${process.env["SERVER_INGESTOR_HOSTNAME"] || "localhost"}:${process.env["INGESTOR_PORT"] || 80}`);
+export const ProbeIngestHostname = Hostname.fromString(`${process.env["SERVER_PROBE_INGEST_HOSTNAME"] || "localhost"}:${process.env["PROBE_INGEST_PORT"] || 80}`);
+export const OpenTelemetryIngestHostname = Hostname.fromString(`${process.env["SERVER_OPEN_TELEMETRY_INGEST_HOSTNAME"] || "localhost"}:${process.env["OPEN_TELEMETRY_INGEST_PORT"] || 80}`);
+export const IncomingRequestIngestHostname = Hostname.fromString(`${process.env["SERVER_INCOMING_REQUEST_INGEST_HOSTNAME"] || "localhost"}:${process.env["INCOMING_REQUEST_INGEST_PORT"] || 80}`);
+export const FluentIngestHostname = Hostname.fromString(`${process.env["SERVER_FLUENT_INGEST_HOSTNAME"] || "localhost"}:${process.env["FLUENT_INGEST_PORT"] || 80}`);
 export const IsolatedVMHostname = Hostname.fromString(`${process.env["SERVER_ISOLATED_VM_HOSTNAME"] || "localhost"}:${process.env["ISOLATED_VM_PORT"] || 80}`);
 export const WorkerHostname = Hostname.fromString(`${process.env["SERVER_WORKER_HOSTNAME"] || "localhost"}:${process.env["WORKER_PORT"] || 80}`);
 export const WorkflowHostname = Hostname.fromString(`${process.env["SERVER_WORKFLOW_HOSTNAME"] || "localhost"}:${process.env["WORKFLOW_PORT"] || 80}`);

package/build/dist/Server/EnvironmentConfig.js.map

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

package/build/dist/Server/Infrastructure/ClickhouseConfig.js

@@ -1,7 +1,7 @@
 import { ClickHouseIsHostHttps, ClickhouseDatabase, ClickhouseHost, ClickhousePassword, ClickhousePort, ClickhouseTlsCa, ClickhouseTlsCert, ClickhouseTlsKey, ClickhouseUsername, ShouldClickhouseSslEnable, } from "../EnvironmentConfig";
 const hostProtocol = ClickHouseIsHostHttps ? "https" : "http";
 const options = {
-    host: `${hostProtocol}://${ClickhouseHost.toString()}:${ClickhousePort.toNumber()}`,
+    url: `${hostProtocol}://${ClickhouseHost.toString()}:${ClickhousePort.toNumber()}`,
     username: ClickhouseUsername,
     password: ClickhousePassword,
     database: ClickhouseDatabase,

package/build/dist/Server/Infrastructure/ClickhouseConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClickhouseConfig.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/ClickhouseConfig.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAI9B,MAAM,YAAY,GAAW,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AAEtE,MAAM,OAAO,GAAkC;IAC7C,IAAI,EAAE,GAAG,YAAY,MAAM,cAAc,CAAC,QAAQ,EAAE,IAAI,cAAc,CAAC,QAAQ,EAAE,EAAE;IACnF,QAAQ,EAAE,kBAAkB;IAC5B,QAAQ,EAAE,kBAAkB;IAC5B,QAAQ,EAAE,kBAAkB;IAC5B,WAAW,EAAE,WAAW;CACzB,CAAC;AAEF,IAAI,yBAAyB,IAAI,eAAe,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,GAAG;QACZ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;KACtC,CAAC;AACJ,CAAC;AAED,IACE,yBAAyB;IACzB,eAAe;IACf,iBAAiB;IACjB,gBAAgB,EAChB,CAAC;IACD,OAAO,CAAC,GAAG,GAAG;QACZ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;QACrC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;QACpC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;KACnC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAkC,OAAO,CAAC;AAExE,MAAM,CAAC,MAAM,qBAAqB,GAChC,iBAAiB,CAAC"}
+{"version":3,"file":"ClickhouseConfig.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/ClickhouseConfig.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAI9B,MAAM,YAAY,GAAW,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AAEtE,MAAM,OAAO,GAAkC;IAC7C,GAAG,EAAE,GAAG,YAAY,MAAM,cAAc,CAAC,QAAQ,EAAE,IAAI,cAAc,CAAC,QAAQ,EAAE,EAAE;IAClF,QAAQ,EAAE,kBAAkB;IAC5B,QAAQ,EAAE,kBAAkB;IAC5B,QAAQ,EAAE,kBAAkB;IAC5B,WAAW,EAAE,WAAW;CACzB,CAAC;AAEF,IAAI,yBAAyB,IAAI,eAAe,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,GAAG;QACZ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;KACtC,CAAC;AACJ,CAAC;AAED,IACE,yBAAyB;IACzB,eAAe;IACf,iBAAiB;IACjB,gBAAgB,EAChB,CAAC;IACD,OAAO,CAAC,GAAG,GAAG;QACZ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;QACrC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;QACpC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;KACnC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAkC,OAAO,CAAC;AAExE,MAAM,CAAC,MAAM,qBAAqB,GAChC,iBAAiB,CAAC"}

package/build/dist/Server/Infrastructure/ClickhouseDatabase.js

@@ -65,7 +65,10 @@ export default class ClickhouseDatabase {
         var _a;
         // Ping clickhouse to check if the connection is still alive
         try {
+            logger.debug("Checking Clickhouse Connection Status - pinging clickhouse");
             const result = await ((_a = this.getDataSource()) === null || _a === void 0 ? void 0 : _a.ping());
+            logger.debug("Clickhouse Connection Status Result");
+            logger.debug(result);
             if (!result) {
                 throw new DatabaseNotConnectedException("Clickhouse Database is not connected");
             }

package/build/dist/Server/Infrastructure/ClickhouseDatabase.js.map

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

package/build/dist/Server/Middleware/TelemetryIngest.js

@@ -0,0 +1,43 @@
+import BadRequestException from "../../Types/Exception/BadRequestException";
+import ObjectID from "../../Types/ObjectID";
+import TelemetryIngestionKeyService from "../../Server/Services/TelemetryIngestionKeyService";
+export default class TelemetryIngest {
+    static async isAuthorizedServiceMiddleware(req, _res, next) {
+        try {
+            // check header.
+            let oneuptimeToken = req.headers["x-oneuptime-token"];
+            // if x-oneuptime-service-token header is present then use that as token.
+            if (!oneuptimeToken) {
+                oneuptimeToken = req.headers["x-oneuptime-service-token"];
+            }
+            if (!oneuptimeToken) {
+                throw new BadRequestException("Missing header: x-oneuptime-token");
+            }
+            let projectId = undefined;
+            const token = await TelemetryIngestionKeyService.findOneBy({
+                query: {
+                    secretKey: new ObjectID((oneuptimeToken === null || oneuptimeToken === void 0 ? void 0 : oneuptimeToken.toString()) || ""),
+                },
+                select: {
+                    projectId: true,
+                },
+                props: {
+                    isRoot: true,
+                },
+            });
+            if (!token) {
+                throw new BadRequestException("Invalid service token: " + oneuptimeToken);
+            }
+            projectId = token.projectId;
+            if (!projectId) {
+                throw new BadRequestException("Project ID not found for service token: " + oneuptimeToken);
+            }
+            req.projectId = projectId;
+            next();
+        }
+        catch (err) {
+            return next(err);
+        }
+    }
+}
+//# sourceMappingURL=TelemetryIngest.js.map

package/build/dist/Server/Middleware/TelemetryIngest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TelemetryIngest.js","sourceRoot":"","sources":["../../../../Server/Middleware/TelemetryIngest.ts"],"names":[],"mappings":"AAAA,OAAO,mBAAmB,MAAM,2CAA2C,CAAC;AAE5E,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAM5C,OAAO,4BAA4B,MAAM,oDAAoD,CAAC;AAQ9F,MAAM,CAAC,OAAO,OAAO,eAAe;IAC3B,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAC/C,GAAmB,EACnB,IAAqB,EACrB,IAAkB;QAElB,IAAI,CAAC;YACH,gBAAgB;YAEhB,IAAI,cAAc,GAAuB,GAAG,CAAC,OAAO,CAClD,mBAAmB,CACE,CAAC;YAExB,yEAAyE;YACzE,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,2BAA2B,CAE3C,CAAC;YAChB,CAAC;YAED,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,MAAM,IAAI,mBAAmB,CAAC,mCAAmC,CAAC,CAAC;YACrE,CAAC;YAED,IAAI,SAAS,GAAyB,SAAS,CAAC;YAEhD,MAAM,KAAK,GACT,MAAM,4BAA4B,CAAC,SAAS,CAAC;gBAC3C,KAAK,EAAE;oBACL,SAAS,EAAE,IAAI,QAAQ,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;iBAC1D;gBACD,MAAM,EAAE;oBACN,SAAS,EAAE,IAAI;iBAChB;gBACD,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;iBACb;aACF,CAAC,CAAC;YAEL,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,mBAAmB,CAC3B,yBAAyB,GAAG,cAAc,CAC3C,CAAC;YACJ,CAAC;YAED,SAAS,GAAG,KAAK,CAAC,SAAqB,CAAC;YAExC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,IAAI,mBAAmB,CAC3B,0CAA0C,GAAG,cAAc,CAC5D,CAAC;YACJ,CAAC;YAEA,GAAwB,CAAC,SAAS,GAAG,SAAqB,CAAC;YAE5D,IAAI,EAAE,CAAC;QACT,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;CACF"}

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

@@ -0,0 +1,126 @@
+import OneUptimeDate from "Common/Types/Date";
+import JSONFunctions from "Common/Types/JSONFunctions";
+import Metric, { AggregationTemporality, } from "Common/Models/AnalyticsModels/Metric";
+import { IsBillingEnabled } from "Common/Server/EnvironmentConfig";
+import TelemetryUsageBillingService from "Common/Server/Services/TelemetryUsageBillingService";
+import logger from "Common/Server/Utils/Logger";
+import TelemetryService from "Common/Models/DatabaseModels/TelemetryService";
+import TelemetryServiceService from "Common/Server/Services/TelemetryServiceService";
+import { DEFAULT_RETENTION_IN_DAYS } from "Common/Models/DatabaseModels/TelemetryUsageBilling";
+import TelemetryUtil from "Common/Server/Utils/Telemetry/Telemetry";
+export var OtelAggregationTemporality;
+(function (OtelAggregationTemporality) {
+    OtelAggregationTemporality["Cumulative"] = "AGGREGATION_TEMPORALITY_CUMULATIVE";
+    OtelAggregationTemporality["Delta"] = "AGGREGATION_TEMPORALITY_DELTA";
+})(OtelAggregationTemporality || (OtelAggregationTemporality = {}));
+export default class OTelIngestService {
+    static async telemetryServiceFromName(data) {
+        const service = await TelemetryServiceService.findOneBy({
+            query: {
+                projectId: data.projectId,
+                name: data.serviceName,
+            },
+            select: {
+                _id: true,
+                retainTelemetryDataForDays: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        if (!service) {
+            // create service
+            const newService = new TelemetryService();
+            newService.projectId = data.projectId;
+            newService.name = data.serviceName;
+            newService.description = data.serviceName;
+            newService.retainTelemetryDataForDays = DEFAULT_RETENTION_IN_DAYS;
+            const createdService = await TelemetryServiceService.create({
+                data: newService,
+                props: {
+                    isRoot: true,
+                },
+            });
+            return {
+                serviceId: createdService.id,
+                dataRententionInDays: DEFAULT_RETENTION_IN_DAYS,
+            };
+        }
+        return {
+            serviceId: service.id,
+            dataRententionInDays: service.retainTelemetryDataForDays || DEFAULT_RETENTION_IN_DAYS,
+        };
+    }
+    static async recordDataIngestedUsgaeBilling(data) {
+        if (!IsBillingEnabled) {
+            return;
+        }
+        for (const serviceName in data.services) {
+            const serviceData = data.services[serviceName];
+            if (!serviceData) {
+                continue;
+            }
+            TelemetryUsageBillingService.updateUsageBilling({
+                projectId: data.projectId,
+                productType: data.productType,
+                dataIngestedInGB: serviceData.dataIngestedInGB || 0,
+                telemetryServiceId: serviceData.serviceId,
+                retentionInDays: serviceData.dataRententionInDays,
+            }).catch((err) => {
+                logger.error("Failed to update usage billing for OTel");
+                logger.error(err);
+            });
+        }
+    }
+    static getMetricFromDatapoint(data) {
+        const { dbMetric, datapoint, aggregationTemporality, isMonotonic } = data;
+        const newDbMetric = Metric.fromJSON(dbMetric.toJSON(), Metric);
+        newDbMetric.startTimeUnixNano = datapoint["startTimeUnixNano"];
+        newDbMetric.startTime = OneUptimeDate.fromUnixNano(datapoint["startTimeUnixNano"]);
+        newDbMetric.timeUnixNano = datapoint["timeUnixNano"];
+        newDbMetric.time = OneUptimeDate.fromUnixNano(datapoint["timeUnixNano"]);
+        if (Object.keys(datapoint).includes("asInt")) {
+            newDbMetric.value = datapoint["asInt"];
+        }
+        else if (Object.keys(datapoint).includes("asDouble")) {
+            newDbMetric.value = datapoint["asDouble"];
+        }
+        newDbMetric.count = datapoint["count"];
+        newDbMetric.sum = datapoint["sum"];
+        newDbMetric.min = datapoint["min"];
+        newDbMetric.max = datapoint["max"];
+        newDbMetric.bucketCounts = datapoint["bucketCounts"];
+        newDbMetric.explicitBounds = datapoint["explicitBounds"];
+        if (!newDbMetric.value) {
+            newDbMetric.value = newDbMetric.sum;
+        }
+        // attrbutes
+        if (Object.keys(datapoint).includes("attributes")) {
+            if (!newDbMetric.attributes) {
+                newDbMetric.attributes = {};
+            }
+            newDbMetric.attributes = Object.assign(Object.assign({}, (newDbMetric.attributes || {})), TelemetryUtil.getAttributes({
+                items: datapoint["attributes"],
+                telemetryServiceId: data.telemetryServiceId,
+                telemetryServiceName: data.telemetryServiceName,
+            }));
+        }
+        if (newDbMetric.attributes) {
+            newDbMetric.attributes = JSONFunctions.flattenObject(newDbMetric.attributes);
+        }
+        // aggregationTemporality
+        if (aggregationTemporality) {
+            if (aggregationTemporality === OtelAggregationTemporality.Cumulative) {
+                newDbMetric.aggregationTemporality = AggregationTemporality.Cumulative;
+            }
+            if (aggregationTemporality === OtelAggregationTemporality.Delta) {
+                newDbMetric.aggregationTemporality = AggregationTemporality.Delta;
+            }
+        }
+        if (isMonotonic !== undefined) {
+            newDbMetric.isMonotonic = isMonotonic;
+        }
+        return newDbMetric;
+    }
+}
+//# sourceMappingURL=OpenTelemetryIngestService.js.map

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

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

package/build/dist/ServiceRoute.js

@@ -12,7 +12,10 @@ export const AccountsRoute = new Route("/accounts");
 export const WorkflowRoute = new Route("/workflow");
 export const ApiReferenceRoute = new Route("/reference");
 export const AdminDashboardRoute = new Route("/admin");
-export const IngestorRoute = new Route("/ingestor");
+export const ProbeIngestRoute = new Route("/probe-ingest");
+export const OpenTelemetryIngestRoute = new Route("/open-telemetry-ingest");
+export const IncomingRequestIngestRoute = new Route("/incoming-request-ingest");
+export const FluentIngestRoute = new Route("/fluent-ingest");
 export const RealtimeRoute = new Route("/realtime/socket");
 export const DocsRoute = new Route("/docs");
 export const StatusPageApiRoute = new Route("/status-page-api");

package/build/dist/ServiceRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceRoute.js","sourceRoot":"","sources":["../../ServiceRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,mBAAmB,CAAC;AAEtC,MAAM,CAAC,MAAM,SAAS,GAAU,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;AAE/C,MAAM,CAAC,MAAM,WAAW,GAAU,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;AAEpD,MAAM,CAAC,MAAM,aAAa,GAAU,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,SAAS,GAAU,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;AAEnD,MAAM,CAAC,MAAM,eAAe,GAAU,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,kBAAkB,GAAU,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;AAEzD,MAAM,CAAC,MAAM,cAAc,GAAU,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,gBAAgB,GAAU,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;AAEjE,MAAM,CAAC,MAAM,iBAAiB,GAAU,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,aAAa,GAAU,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,aAAa,GAAU,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,iBAAiB,GAAU,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,mBAAmB,GAAU,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;AAE9D,MAAM,CAAC,MAAM,aAAa,GAAU,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,aAAa,GAAU,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;AAElE,MAAM,CAAC,MAAM,SAAS,GAAU,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;AAEnD,MAAM,CAAC,MAAM,kBAAkB,GAAU,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"ServiceRoute.js","sourceRoot":"","sources":["../../ServiceRoute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,mBAAmB,CAAC;AAEtC,MAAM,CAAC,MAAM,SAAS,GAAU,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC;AAE/C,MAAM,CAAC,MAAM,WAAW,GAAU,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;AAEpD,MAAM,CAAC,MAAM,aAAa,GAAU,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,SAAS,GAAU,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;AAEnD,MAAM,CAAC,MAAM,eAAe,GAAU,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,kBAAkB,GAAU,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;AAEzD,MAAM,CAAC,MAAM,cAAc,GAAU,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;AAE7D,MAAM,CAAC,MAAM,gBAAgB,GAAU,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;AAEjE,MAAM,CAAC,MAAM,iBAAiB,GAAU,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,aAAa,GAAU,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,aAAa,GAAU,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,iBAAiB,GAAU,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,mBAAmB,GAAU,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC;AAE9D,MAAM,CAAC,MAAM,gBAAgB,GAAU,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;AAElE,MAAM,CAAC,MAAM,wBAAwB,GAAU,IAAI,KAAK,CACtD,wBAAwB,CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAU,IAAI,KAAK,CACxD,0BAA0B,CAC3B,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAU,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;AAEpE,MAAM,CAAC,MAAM,aAAa,GAAU,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;AAElE,MAAM,CAAC,MAAM,SAAS,GAAU,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;AAEnD,MAAM,CAAC,MAAM,kBAAkB,GAAU,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC"}

package/build/dist/Tests/Server/API/ProbeAPI.test.js

@@ -1,4 +1,4 @@
-import Ingestor from "../../../Server/API/ProbeAPI";
+import ProbeAPI from "../../../Server/API/ProbeAPI";
 import ProbeService from "../../../Server/Services/ProbeService";
 import Response from "../../../Server/Utils/Response";
 import { mockRouter } from "./Helpers";
@@ -28,12 +28,12 @@ jest.mock("../../../Server/Utils/Response", () => {
     };
 });
 jest.mock("../../../Server/Services/ProbeService");
-describe("Ingestor", () => {
+describe("ProbeAPI", () => {
     let mockRequest;
     let mockResponse;
     let nextFunction;
     beforeEach(() => {
-        new Ingestor();
+        new ProbeAPI();
         mockRequest = {};
         mockResponse = {
             send: jest.fn(),

package/build/dist/UI/Config.js

@@ -1,4 +1,4 @@
-import { AccountsRoute, AdminDashboardRoute, ApiReferenceRoute, AppApiRoute, DashboardRoute, DocsRoute, FileRoute, HomeRoute, IdentityRoute, IngestorRoute, IntegrationRoute, NotificationRoute, RealtimeRoute, StatusPageApiRoute, StatusPageRoute, WorkflowRoute, } from "Common/ServiceRoute";
+import { AccountsRoute, AdminDashboardRoute, ApiReferenceRoute, AppApiRoute, DashboardRoute, DocsRoute, FileRoute, HomeRoute, IdentityRoute, ProbeIngestRoute, IntegrationRoute, NotificationRoute, RealtimeRoute, StatusPageApiRoute, StatusPageRoute, WorkflowRoute, FluentIngestRoute, IncomingRequestIngestRoute, OpenTelemetryIngestRoute, } from "Common/ServiceRoute";
 import Hostname from "Common/Types/API/Hostname";
 import Protocol from "Common/Types/API/Protocol";
 import URL from "Common/Types/API/URL";
@@ -27,7 +27,10 @@ export const REALTIME_HOSTNAME = Hostname.fromString(HOST);
 export const INTEGRATION_HOSTNAME = Hostname.fromString(HOST);
 export const STATUS_PAGE_HOSTNAME = Hostname.fromString(HOST);
 export const WORKFLOW_HOSTNAME = Hostname.fromString(HOST);
-export const INGESTOR_HOSTNAME = Hostname.fromString(HOST);
+export const PROBE_INGEST_HOSTNAME = Hostname.fromString(HOST);
+export const OPEN_TELEMETRY_INGEST_HOSTNAME = Hostname.fromString(HOST);
+export const INCOMING_REQUEST_INGEST_HOSTNAME = Hostname.fromString(HOST);
+export const FLUENT_INGEST_HOSTNAME = Hostname.fromString(HOST);
 export const HELM_HOSTNAME = Hostname.fromString(HOST);
 export const API_DOCS_HOSTNAME = Hostname.fromString(HOST);
 export const ADMIN_DASHBOARD_HOSTNAME = Hostname.fromString(HOST);
@@ -38,10 +41,13 @@ export const APP_API_URL = new URL(HTTP_PROTOCOL, APP_HOSTNAME, AppApiRoute);
 export const REALTIME_URL = new URL(HTTP_PROTOCOL, REALTIME_HOSTNAME, RealtimeRoute);
 export const DOCS_URL = new URL(HTTP_PROTOCOL, REALTIME_HOSTNAME, DocsRoute);
 export const STATUS_PAGE_API_URL = new URL(HTTP_PROTOCOL, STATUS_PAGE_HOSTNAME, StatusPageApiRoute);
+export const OPEN_TELEMETRY_INGEST_URL = new URL(HTTP_PROTOCOL, OPEN_TELEMETRY_INGEST_HOSTNAME, OpenTelemetryIngestRoute);
+export const FLUENT_INGEST_URL = new URL(HTTP_PROTOCOL, FLUENT_INGEST_HOSTNAME, FluentIngestRoute);
 export const IDENTITY_URL = new URL(HTTP_PROTOCOL, IDENTITY_HOSTNAME, IdentityRoute);
 export const NOTIFICATION_URL = new URL(HTTP_PROTOCOL, NOTIFICATION_HOSTNAME, NotificationRoute);
 export const WORKFLOW_URL = new URL(HTTP_PROTOCOL, WORKFLOW_HOSTNAME, WorkflowRoute);
-export const INGESTOR_URL = new URL(HTTP_PROTOCOL, INGESTOR_HOSTNAME, IngestorRoute);
+export const PROBE_INGEST_URL = new URL(HTTP_PROTOCOL, PROBE_INGEST_HOSTNAME, ProbeIngestRoute);
+export const INCOMING_REQUEST_INGEST_URL = new URL(HTTP_PROTOCOL, INCOMING_REQUEST_INGEST_HOSTNAME, IncomingRequestIngestRoute);
 export const STATUS_PAGE_URL = new URL(HTTP_PROTOCOL, STATUS_PAGE_HOSTNAME, StatusPageRoute);
 export const FILE_URL = new URL(HTTP_PROTOCOL, FILE_HOSTNAME, FileRoute);
 export const DASHBOARD_URL = new URL(HTTP_PROTOCOL, DASHBOARD_HOSTNAME, DashboardRoute);

package/build/dist/UI/Config.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@oneuptime/common",
-    "version": "7.0.3263",
+    "version": "7.0.3279",
     "description": "",
     "main": "index.js",
     "scripts": {
@@ -77,7 +77,7 @@
         "airtable": "^0.12.2",
         "axios": "^1.7.2",
         "bullmq": "^5.3.3",
-        "Common": "npm:@oneuptime/common@7.0.3263",
+        "Common": "npm:@oneuptime/common@7.0.3279",
         "cookie-parser": "^1.4.7",
         "cors": "^2.8.5",
         "cron-parser": "^4.8.1",