Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,19 @@ import {
getPreviousAlertHistories,
processAlert,
} from '@/tasks/checkAlerts';
import { AlertDetails, AlertTaskType, loadProvider } from '@/tasks/providers';
import {
AlertDetails,
AlertTaskType,
loadProvider,
} from '@/tasks/checkAlerts/providers';
import {
AlertMessageTemplateDefaultView,
buildAlertMessageTemplateHdxLink,
buildAlertMessageTemplateTitle,
getDefaultExternalAction,
renderAlertTemplate,
translateExternalActionsToInternal,
} from '@/tasks/template';
} from '@/tasks/checkAlerts/template';
import * as slack from '@/utils/slack';

// Create provider instance for tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,19 @@ import { ObjectId } from '@/models';
import { AlertSource, AlertThresholdType, IAlert } from '@/models/alert';
import { ISource } from '@/models/source';
import { IWebhook } from '@/models/webhook';
import CheckAlertTask from '@/tasks/checkAlerts';
import * as checkAlerts from '@/tasks/checkAlerts';
import CheckAlertTask from '@/tasks/checkAlerts';
import {
AlertDetails,
AlertProvider,
AlertTaskType,
loadProvider,
} from '@/tasks/providers';

import { CheckAlertsTaskArgs } from '../types';
} from '@/tasks/checkAlerts/providers';
import { CheckAlertsTaskArgs } from '@/tasks/types';

jest.mock('@/tasks/providers', () => {
jest.mock('@/tasks/checkAlerts/providers', () => {
return {
...jest.requireActual('@/tasks/providers'),
...jest.requireActual('@/tasks/checkAlerts/providers'),
loadProvider: jest.fn(),
};
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ import { SavedSearch } from '@/models/savedSearch';
import { Source } from '@/models/source';
import Webhook from '@/models/webhook';
import { processAlert } from '@/tasks/checkAlerts';
import { AlertDetails, AlertTaskType, loadProvider } from '@/tasks/providers';
import {
AlertDetails,
AlertTaskType,
loadProvider,
} from '@/tasks/checkAlerts/providers';
import * as slack from '@/utils/slack';

describe('Single Invocation Alert Test', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,18 @@ import {
AlertTask,
AlertTaskType,
loadProvider,
} from '@/tasks/providers';
} from '@/tasks/checkAlerts/providers';
import {
AlertMessageTemplateDefaultView,
buildAlertMessageTemplateTitle,
handleSendGenericWebhook,
renderAlertTemplate,
} from '@/tasks/template';
} from '@/tasks/checkAlerts/template';
import { tasksTracer } from '@/tasks/tracer';
import { CheckAlertsTaskArgs, HdxTask } from '@/tasks/types';
import { roundDownToXMinutes, unflattenObject } from '@/tasks/util';
import logger from '@/utils/logger';

import { tasksTracer } from './tracer';

export const doesExceedThreshold = (
thresholdType: AlertThresholdType,
threshold: number,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
AlertProvider,
AlertTaskType,
loadProvider,
} from '@/tasks/providers/index';
} from '@/tasks/checkAlerts/providers';

const MOCK_SAVED_SEARCH: any = {
id: 'fake-saved-search-id',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,12 @@ import {
type AlertProvider,
type AlertTask,
AlertTaskType,
} from '@/tasks/providers';
} from '@/tasks/checkAlerts/providers';
import { MappedOmit } from '@/tasks/types';
import { convertMsToGranularityString } from '@/utils/common';
import logger from '@/utils/logger';

import {
AggregatedAlertHistory,
getPreviousAlertHistories,
} from '../checkAlerts';
import { MappedOmit } from '../types';
import { AggregatedAlertHistory, getPreviousAlertHistories } from '..';

type PartialAlertDetails = MappedOmit<AlertDetails, 'previous'>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ import { IDashboard } from '@/models/dashboard';
import { ISavedSearch } from '@/models/savedSearch';
import { ISource } from '@/models/source';
import { IWebhook } from '@/models/webhook';
import DefaultAlertProvider from '@/tasks/providers/default';
import DefaultAlertProvider from '@/tasks/checkAlerts/providers/default';
import logger from '@/utils/logger';

import { AggregatedAlertHistory } from '../checkAlerts';
import { CheckAlertsTaskArgs } from '../types';
import { AggregatedAlertHistory } from '..';

export enum AlertTaskType {
SAVED_SEARCH,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ import { ISavedSearch } from '@/models/savedSearch';
import { ISource } from '@/models/source';
import { IWebhook } from '@/models/webhook';
import { doesExceedThreshold } from '@/tasks/checkAlerts';
import { AlertProvider, PopulatedAlertChannel } from '@/tasks/providers';
import {
AlertProvider,
PopulatedAlertChannel,
} from '@/tasks/checkAlerts/providers';
import { escapeJsonString, unflattenObject } from '@/tasks/util';
import { truncateString } from '@/utils/common';
import logger from '@/utils/logger';
Expand Down
Loading