refactor: Update import statements for ProbeMonitor and ServerMonitor to use ProbeMonitorResponse and ServerMonitorResponse

This commit is contained in:
Simon Larsen
2024-08-05 13:05:53 -06:00
parent b29fb6e833
commit a096591c52
40 changed files with 400 additions and 400 deletions

View File

@@ -321,10 +321,10 @@ import ProbeOwnerUserService, {
import FeatureSet from "CommonServer/Types/FeatureSet";
import Express, { ExpressApplication } from "CommonServer/Utils/Express";
import Log from "Common/AppModels/AnalyticsModels/Log";
import Metric from "Common/AppModels/AnalyticsModels/Metric";
import MonitorMetricsByMinute from "Common/AppModels/AnalyticsModels/MonitorMetricsByMinute";
import Span from "Common/AppModels/AnalyticsModels/Span";
import Log from "Common/Models/AnalyticsModels/Log";
import Metric from "Common/Models/AnalyticsModels/Metric";
import MonitorMetricsByMinute from "Common/Models/AnalyticsModels/MonitorMetricsByMinute";
import Span from "Common/Models/AnalyticsModels/Span";
import ApiKey from "Common/Models/DatabaseModels/ApiKey";
import ApiKeyPermission from "Common/Models/DatabaseModels/ApiKeyPermission";
import CallLog from "Common/Models/DatabaseModels/CallLog";
@@ -414,7 +414,7 @@ import WorkflowVariable from "Common/Models/DatabaseModels/WorkflowVariable";
import ProbeOwnerTeam from "Common/Models/DatabaseModels/ProbeOwnerTeam";
import ProbeOwnerUser from "Common/Models/DatabaseModels/ProbeOwnerUser";
import ServiceCatalogDependency from "Common/Models/DatabaseModels/ServiceCatalogDependency";
import TelemetryAttribute from "Common/AppModels/AnalyticsModels/TelemetryAttribute";
import TelemetryAttribute from "Common/Models/AnalyticsModels/TelemetryAttribute";
const BaseAPIFeatureSet: FeatureSet = {
init: async (): Promise<void> => {

View File

@@ -2,7 +2,7 @@ import DataMigrationBase from "./DataMigrationBase";
import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";
import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
import MetricService from "CommonServer/Services/MetricService";
import Metric from "Common/AppModels/AnalyticsModels/Metric";
import Metric from "Common/Models/AnalyticsModels/Metric";
export default class AddAggregationTemporalityToMetric extends DataMigrationBase {
public constructor() {

View File

@@ -3,8 +3,8 @@ import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";
import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
import LogService from "CommonServer/Services/LogService";
import SpanService from "CommonServer/Services/SpanService";
import Log from "Common/AppModels/AnalyticsModels/Log";
import Span from "Common/AppModels/AnalyticsModels/Span";
import Log from "Common/Models/AnalyticsModels/Log";
import Span from "Common/Models/AnalyticsModels/Span";
export default class AddAttributeColumnToSpanAndLog extends DataMigrationBase {
public constructor() {

View File

@@ -1,7 +1,7 @@
import DataMigrationBase from "./DataMigrationBase";
import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";
import SpanService from "CommonServer/Services/SpanService";
import Span from "Common/AppModels/AnalyticsModels/Span";
import Span from "Common/Models/AnalyticsModels/Span";
export default class AddDurationColumnToSpanTable extends DataMigrationBase {
public constructor() {

View File

@@ -2,7 +2,7 @@ import DataMigrationBase from "./DataMigrationBase";
import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";
import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
import MetricService from "CommonServer/Services/MetricService";
import Metric from "Common/AppModels/AnalyticsModels/Metric";
import Metric from "Common/Models/AnalyticsModels/Metric";
export default class AddIsMonotonicToMetric extends DataMigrationBase {
public constructor() {

View File

@@ -2,7 +2,7 @@ import DataMigrationBase from "./DataMigrationBase";
import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";
import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
import MetricService from "CommonServer/Services/MetricService";
import Metric from "Common/AppModels/AnalyticsModels/Metric";
import Metric from "Common/Models/AnalyticsModels/Metric";
export default class AddPointTypeToMetric extends DataMigrationBase {
public constructor() {

View File

@@ -2,7 +2,7 @@ import DataMigrationBase from "./DataMigrationBase";
import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";
import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
import MetricService from "CommonServer/Services/MetricService";
import Metric from "Common/AppModels/AnalyticsModels/Metric";
import Metric from "Common/Models/AnalyticsModels/Metric";
export default class AddUnitColumnToMetricsTable extends DataMigrationBase {
public constructor() {

View File

@@ -2,7 +2,7 @@ import DataMigrationBase from "./DataMigrationBase";
import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";
import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
import LogService from "CommonServer/Services/LogService";
import Log from "Common/AppModels/AnalyticsModels/Log";
import Log from "Common/Models/AnalyticsModels/Log";
export default class ChangeLogSeverityColumnTypeFromTextToNumber extends DataMigrationBase {
public constructor() {

View File

@@ -2,7 +2,7 @@ import DataMigrationBase from "./DataMigrationBase";
import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";
import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
import MetricService from "CommonServer/Services/MetricService";
import Metric from "Common/AppModels/AnalyticsModels/Metric";
import Metric from "Common/Models/AnalyticsModels/Metric";
export default class ChangeMetricColumnTypeToDecimal extends DataMigrationBase {
public constructor() {

View File

@@ -1,6 +1,6 @@
import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase";
import AnalyticsDatabaseService from "./AnalyticsDatabaseService";
import Log from "Common/AppModels/AnalyticsModels/Log";
import Log from "Common/Models/AnalyticsModels/Log";
export class LogService extends AnalyticsDatabaseService<Log> {
public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) {

View File

@@ -1,6 +1,6 @@
import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase";
import AnalyticsDatabaseService from "./AnalyticsDatabaseService";
import MetricSum from "Common/AppModels/AnalyticsModels/Metric";
import MetricSum from "Common/Models/AnalyticsModels/Metric";
export class MetricService extends AnalyticsDatabaseService<MetricSum> {
public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) {

View File

@@ -1,6 +1,6 @@
import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase";
import AnalyticsDatabaseService from "./AnalyticsDatabaseService";
import MonitorMetricsByMinute from "Common/AppModels/AnalyticsModels/MonitorMetricsByMinute";
import MonitorMetricsByMinute from "Common/Models/AnalyticsModels/MonitorMetricsByMinute";
export class MonitorMetricsByMinuteService extends AnalyticsDatabaseService<MonitorMetricsByMinute> {
public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) {

View File

@@ -1,6 +1,6 @@
import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase";
import AnalyticsDatabaseService from "./AnalyticsDatabaseService";
import Span from "Common/AppModels/AnalyticsModels/Span";
import Span from "Common/Models/AnalyticsModels/Span";
export class SpanService extends AnalyticsDatabaseService<Span> {
public constructor(clickhouseDatabase?: ClickhouseDatabase | undefined) {

View File

@@ -57,7 +57,7 @@ import IncidentService from "./IncidentService";
import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTimeline";
import MonitorStatusTimelineService from "./MonitorStatusTimelineService";
import SortOrder from "Common/Types/BaseDatabase/SortOrder";
import UptimeUtil from "CommonProject/Utils/Uptime/UptimeUtil";
import UptimeUtil from "Common/Utils/Uptime/UptimeUtil";
export interface StatusPageReportItem {
resourceName: string;

View File

@@ -1,7 +1,7 @@
import TelemetryType from "Common/Types/Telemetry/TelemetryType";
import ClickhouseDatabase from "../Infrastructure/ClickhouseDatabase";
import AnalyticsDatabaseService from "./AnalyticsDatabaseService";
import TelemetryAttribute from "Common/AppModels/AnalyticsModels/TelemetryAttribute";
import TelemetryAttribute from "Common/Models/AnalyticsModels/TelemetryAttribute";
import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
import ObjectID from "Common/Types/ObjectID";

View File

@@ -5,7 +5,7 @@ import StatementGenerator from "../../../Utils/AnalyticsDatabase/StatementGenera
import logger from "../../../Utils/Logger";
import "../../TestingUtils/Init";
import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
import NestedModel from "Common/AnalyticsModels/NestedModel";
import NestedModel from "Common/Models/AnalyticsModels/AnalyticsBaseModelNestedModel";
import Route from "Common/Types/API/Route";
import AnalyticsTableEngine from "Common/Types/AnalyticsDatabase/AnalyticsTableEngine";
import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";

View File

@@ -1,6 +1,6 @@
import Query from "../Query";
import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
import UserModel from "Common/Models/UserModel";
import UserModel from "Common/Models/DatabaseModels/User";
import DatabaseCommonInteractionProps from "Common/Types/BaseDatabase/DatabaseCommonInteractionProps";
import NotAuthorizedException from "Common/Types/Exception/NotAuthorizedException";

View File

@@ -1,6 +1,6 @@
import { BaseQueryParams } from "@clickhouse/client";
import { integer } from "@elastic/elasticsearch/lib/api/types";
import { RecordValue } from "Common/AnalyticsModels/CommonModel";
import { RecordValue } from "Common/Models/AnalyticsModels/AnalyticsBaseModel/CommonModel";
import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
import GreaterThan from "Common/Types/BaseDatabase/GreaterThan";
import GreaterThanOrEqual from "Common/Types/BaseDatabase/GreaterThanOrEqual";

View File

@@ -10,7 +10,7 @@ import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel
import CommonModel, {
Record,
RecordValue,
} from "Common/AnalyticsModels/CommonModel";
} from "Common/Models/AnalyticsModels/AnalyticsBaseModel/CommonModel";
import AnalyticsTableColumn from "Common/Types/AnalyticsDatabase/TableColumn";
import TableColumnType from "Common/Types/AnalyticsDatabase/TableColumnType";
import GreaterThan from "Common/Types/BaseDatabase/GreaterThan";

View File

@@ -10,7 +10,7 @@ import {
EvaluateOverTimeType,
} from "Common/Types/Monitor/CriteriaFilter";
import ObjectID from "Common/Types/ObjectID";
import MonitorMetricsByMinute from "Common/AppModels/AnalyticsModels/MonitorMetricsByMinute";
import MonitorMetricsByMinute from "Common/Models/AnalyticsModels/MonitorMetricsByMinute";
export default class EvaluateOverTime {
public static async getValueOverTime(data: {

View File

@@ -40,7 +40,7 @@ import ObjectID from "Common/Types/ObjectID";
import ProbeApiIngestResponse from "Common/Types/Probe/ProbeApiIngestResponse";
import ProbeMonitorResponse from "Common/Types/Probe/ProbeMonitorResponse";
import Typeof from "Common/Types/Typeof";
import MonitorMetricsByMinute from "Common/AppModels/AnalyticsModels/MonitorMetricsByMinute";
import MonitorMetricsByMinute from "Common/Models/AnalyticsModels/MonitorMetricsByMinute";
import Incident from "Common/Models/DatabaseModels/Incident";
import IncidentSeverity from "Common/Models/DatabaseModels/IncidentSeverity";
import IncidentStateTimeline from "Common/Models/DatabaseModels/IncidentStateTimeline";

File diff suppressed because it is too large Load Diff

View File

@@ -10,7 +10,7 @@ import React, {
useEffect,
useState,
} from "react";
import UptimeEvent from "CommonProject/Utils/Uptime/Event";
import UptimeEvent from "Common/Utils/Uptime/Event";
export type Event = UptimeEvent;

View File

@@ -2,7 +2,7 @@ import CopyTextButton from "../CopyTextButton/CopyTextButton";
import OneUptimeDate from "Common/Types/Date";
import Dictionary from "Common/Types/Dictionary";
import JSONFunctions from "Common/Types/JSONFunctions";
import Log from "Common/AppModels/AnalyticsModels/Log";
import Log from "Common/Models/AnalyticsModels/Log";
import LogSeverity from "Common/Types/Log/LogSeverity";
import TelemetryService from "Common/Models/DatabaseModels/TelemetryService";
import React, { FunctionComponent, ReactElement, useEffect } from "react";

View File

@@ -5,7 +5,7 @@ import FiltersForm from "../Filters/FiltersForm";
import FieldType from "../Types/FieldType";
import LogItem from "./LogItem";
import { PromiseVoidFunction, VoidFunction } from "Common/Types/FunctionTypes";
import Log from "Common/AppModels/AnalyticsModels/Log";
import Log from "Common/Models/AnalyticsModels/Log";
import LogSeverity from "Common/Types/Log/LogSeverity";
import React, { FunctionComponent, ReactElement, Ref } from "react";
import Toggle from "../Toggle/Toggle";

View File

@@ -3,7 +3,7 @@ import ErrorMessage from "../ErrorMessage/ErrorMessage";
import DayUptimeGraph, { BarChartRule, Event } from "../Graphs/DayUptimeGraph";
import UptimeUtil from "./UptimeUtil";
import Color from "Common/Types/Color";
import CommonMonitorEvent from "CommonProject/Utils/Uptime/MonitorEvent";
import CommonMonitorEvent from "Common/Utils/Uptime/MonitorEvent";
import MonitorStatus from "Common/Models/DatabaseModels/MonitorStatus";
import MonitorStatusTimeline from "Common/Models/DatabaseModels/MonitorStatusTimeline";
import StatusPageHistoryChartBarColorRule from "Common/Models/DatabaseModels/StatusPageHistoryChartBarColorRule";

View File

@@ -1,3 +1,3 @@
import UptimeUtil from "CommonProject/Utils/Uptime/UptimeUtil";
import UptimeUtil from "Common/Utils/Uptime/UptimeUtil";
export default UptimeUtil;

View File

@@ -14,7 +14,7 @@ import Query from "CommonUI/src/Utils/BaseDatabase/Query";
import Select from "CommonUI/src/Utils/BaseDatabase/Select";
import ProjectUtil from "CommonUI/src/Utils/Project";
import Realtime from "CommonUI/src/Utils/Realtime";
import Log from "Common/AppModels/AnalyticsModels/Log";
import Log from "Common/Models/AnalyticsModels/Log";
import React, { FunctionComponent, ReactElement, useEffect } from "react";
export interface ComponentProps {

View File

@@ -26,7 +26,7 @@ import AggregatedResult from "Common/Types/BaseDatabase/AggregatedResult";
import API from "CommonUI/src/Utils/API/API";
import { PromiseVoidFunction } from "Common/Types/FunctionTypes";
import ModelAPI from "CommonUI/src/Utils/AnalyticsModelAPI/AnalyticsModelAPI";
import Metric from "Common/AppModels/AnalyticsModels/Metric";
import Metric from "Common/Models/AnalyticsModels/Metric";
import OneUptimeDate from "Common/Types/Date";
import { LIMIT_PER_PROJECT } from "Common/Types/Database/LimitMax";
import ComponentLoader from "CommonUI/src/Components/ComponentLoader/ComponentLoader";

View File

@@ -4,7 +4,7 @@ import ObjectID from "Common/Types/ObjectID";
import AnalyticsModelTable from "CommonUI/src/Components/ModelTable/AnalyticsModelTable";
import FieldType from "CommonUI/src/Components/Types/FieldType";
import Navigation from "CommonUI/src/Utils/Navigation";
import Metric from "Common/AppModels/AnalyticsModels/Metric";
import Metric from "Common/Models/AnalyticsModels/Metric";
import RouteMap, { RouteUtil } from "../../Utils/RouteMap";
import PageMap from "../../Utils/PageMap";
import Route from "Common/Types/API/Route";

View File

@@ -23,7 +23,7 @@ import {
} from "CommonUI/src/Components/Charts/Line/LineChart";
import MonitorMetricsByMinute, {
MonitorMetricsMiscData,
} from "Common/AppModels/AnalyticsModels/MonitorMetricsByMinute";
} from "Common/Models/AnalyticsModels/MonitorMetricsByMinute";
import Probe from "Common/Models/DatabaseModels/Probe";
import React from "react";

View File

@@ -1,7 +1,7 @@
import { Green, Red } from "Common/Types/BrandColors";
import ColorCircle from "CommonUI/src/Components/ColorCircle/ColorCircle";
import Link from "CommonUI/src/Components/Link/Link";
import { SpanStatus } from "Common/AppModels/AnalyticsModels/Span";
import { SpanStatus } from "Common/Models/AnalyticsModels/Span";
import React, { FunctionComponent, ReactElement } from "react";
import RouteMap, { RouteUtil } from "../../Utils/RouteMap";
import PageMap from "../../Utils/PageMap";

View File

@@ -23,11 +23,11 @@ import AnalyticsModelAPI, {
} from "CommonUI/src/Utils/AnalyticsModelAPI/AnalyticsModelAPI";
import Select from "CommonUI/src/Utils/BaseDatabase/Select";
import ProjectUtil from "CommonUI/src/Utils/Project";
import Log from "Common/AppModels/AnalyticsModels/Log";
import Log from "Common/Models/AnalyticsModels/Log";
import Span, {
SpanEvent,
SpanEventType,
} from "Common/AppModels/AnalyticsModels/Span";
} from "Common/Models/AnalyticsModels/Span";
import TelemetryService from "Common/Models/DatabaseModels/TelemetryService";
import React, { FunctionComponent, ReactElement, useEffect } from "react";

View File

@@ -31,7 +31,7 @@ import AnalyticsModelAPI from "CommonUI/src/Utils/AnalyticsModelAPI/AnalyticsMod
import ListResult from "CommonUI/src/Utils/BaseDatabase/ListResult";
import Select from "CommonUI/src/Utils/BaseDatabase/Select";
import ModelAPI from "CommonUI/src/Utils/ModelAPI/ModelAPI";
import Span, { SpanStatus } from "Common/AppModels/AnalyticsModels/Span";
import Span, { SpanStatus } from "Common/Models/AnalyticsModels/Span";
import TelemetryService from "Common/Models/DatabaseModels/TelemetryService";
import React, { Fragment, FunctionComponent, ReactElement } from "react";

View File

@@ -9,7 +9,7 @@ import DropdownUtil from "CommonUI/src/Utils/Dropdown";
import Span, {
SpanKind,
SpanStatus,
} from "Common/AppModels/AnalyticsModels/Span";
} from "Common/Models/AnalyticsModels/Span";
import React, {
Fragment,
FunctionComponent,

View File

@@ -44,7 +44,7 @@ import AnalyticsModelAPI, {
import ModelAPI, { ListResult } from "CommonUI/src/Utils/ModelAPI/ModelAPI";
import Navigation from "CommonUI/src/Utils/Navigation";
import ProjectUtil from "CommonUI/src/Utils/Project";
import MonitorMetricsByMinute from "Common/AppModels/AnalyticsModels/MonitorMetricsByMinute";
import MonitorMetricsByMinute from "Common/Models/AnalyticsModels/MonitorMetricsByMinute";
import Label from "Common/Models/DatabaseModels/Label";
import Monitor from "Common/Models/DatabaseModels/Monitor";
import MonitorProbe, {

View File

@@ -3,7 +3,7 @@ import Color from "Common/Types/Color";
import Span, {
SpanKind,
SpanStatus,
} from "Common/AppModels/AnalyticsModels/Span";
} from "Common/Models/AnalyticsModels/Span";
import TelemetryService from "Common/Models/DatabaseModels/TelemetryService";
export enum IntervalUnit {

View File

@@ -13,7 +13,7 @@ import Express, {
} from "CommonServer/Utils/Express";
import logger from "CommonServer/Utils/Logger";
import Response from "CommonServer/Utils/Response";
import Log from "Common/AppModels/AnalyticsModels/Log";
import Log from "Common/Models/AnalyticsModels/Log";
import LogSeverity from "Common/Types/Log/LogSeverity";
import OTelIngestService from "../Service/OTelIngest";
import ObjectID from "Common/Types/ObjectID";

View File

@@ -24,14 +24,14 @@ import Express, {
} from "CommonServer/Utils/Express";
import logger from "CommonServer/Utils/Logger";
import Response from "CommonServer/Utils/Response";
import Log from "Common/AppModels/AnalyticsModels/Log";
import Log from "Common/Models/AnalyticsModels/Log";
import Metric, {
MetricPointType,
} from "Common/AppModels/AnalyticsModels/Metric";
} from "Common/Models/AnalyticsModels/Metric";
import Span, {
SpanKind,
SpanStatus,
} from "Common/AppModels/AnalyticsModels/Span";
} from "Common/Models/AnalyticsModels/Span";
import protobuf from "protobufjs";
import Dictionary from "Common/Types/Dictionary";
import ObjectID from "Common/Types/ObjectID";

View File

@@ -6,7 +6,7 @@ import ObjectID from "Common/Types/ObjectID";
import GlobalCache from "CommonServer/Infrastructure/GlobalCache";
import Metric, {
AggregationTemporality,
} from "Common/AppModels/AnalyticsModels/Metric";
} from "Common/Models/AnalyticsModels/Metric";
import TelemetryType from "Common/Types/Telemetry/TelemetryType";
import TelemetryAttributeService from "CommonServer/Services/TelemetryAttributeService";
import Dictionary from "Common/Types/Dictionary";