@oneuptime/common 12.0.13 → 12.0.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Models/DatabaseModels/GlobalOidc.ts +20 -0
- package/Models/DatabaseModels/GlobalSso.ts +20 -0
- package/Models/DatabaseModels/MarketingConversion.ts +19 -9
- package/Models/DatabaseModels/NetworkDeviceLinkRule.ts +46 -0
- package/Models/DatabaseModels/OnCallDutyPolicySchedule.ts +14 -0
- package/Models/DatabaseModels/StatusPage.ts +7 -4
- package/Models/DatabaseModels/UserCall.ts +94 -3
- package/Models/DatabaseModels/UserEmail.ts +94 -3
- package/Models/DatabaseModels/UserIncomingCallNumber.ts +94 -3
- package/Models/DatabaseModels/UserPush.ts +37 -0
- package/Models/DatabaseModels/UserSMS.ts +94 -3
- package/Models/DatabaseModels/UserWhatsApp.ts +93 -2
- package/Server/API/BaseAPI.ts +79 -14
- package/Server/API/StatusPageAPI.ts +29 -4
- package/Server/API/UserCallAPI.ts +53 -45
- package/Server/API/UserEmailAPI.ts +53 -44
- package/Server/API/UserIncomingCallNumberAPI.ts +48 -38
- package/Server/API/UserNotificationMethodAdminAPI.ts +481 -0
- package/Server/API/UserPushAPI.ts +126 -2
- package/Server/API/UserSmsAPI.ts +53 -44
- package/Server/API/UserWhatsAppAPI.ts +53 -50
- package/Server/EnvironmentConfig.ts +7 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787142779538-MigrationName.ts +154 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787156982416-MigrationName.ts +17 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787700000000-FixTotpOtpUrlAlgorithm.ts +45 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787800000000-AddScopeToNetworkDeviceLinkRule.ts +19 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787900000000-AddRestrictToAttachedProjectsToGlobalSso.ts +40 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts +10 -0
- package/Server/Middleware/SlackAuthorization.ts +43 -6
- package/Server/Middleware/UserAuthorization.ts +236 -26
- package/Server/Middleware/VerificationCodeRateLimit.ts +586 -0
- package/Server/Middleware/WhatsAppAuthorization.ts +43 -3
- package/Server/Services/AnalyticsDatabaseService.ts +169 -0
- package/Server/Services/DatabaseService.ts +101 -0
- package/Server/Services/GlobalOidcProjectService.ts +126 -1
- package/Server/Services/GlobalOidcService.ts +132 -0
- package/Server/Services/GlobalSsoProjectService.ts +126 -1
- package/Server/Services/GlobalSsoService.ts +132 -0
- package/Server/Services/LogAggregationService.ts +5 -0
- package/Server/Services/PushNotificationService.ts +127 -12
- package/Server/Services/TeamMemberService.ts +53 -13
- package/Server/Services/UserCallService.ts +55 -24
- package/Server/Services/UserEmailService.ts +83 -17
- package/Server/Services/UserIncomingCallNumberService.ts +49 -85
- package/Server/Services/UserNotificationMethodAdminService.ts +1527 -0
- package/Server/Services/UserNotificationRuleService.ts +26 -0
- package/Server/Services/UserPushService.ts +89 -0
- package/Server/Services/UserSmsService.ts +50 -17
- package/Server/Services/UserWhatsAppService.ts +48 -15
- package/Server/Types/Database/QueryHelper.ts +30 -0
- package/Server/Utils/AnalyticsDatabase/QuerySettingsHelper.ts +59 -0
- package/Server/Utils/ChannelVerification.ts +510 -0
- package/Server/Utils/CronTab.ts +73 -0
- package/Server/Utils/GlobalSsoAuthorization.ts +175 -0
- package/Server/Utils/Marketing/ConversionUploadProvider.ts +35 -5
- package/Server/Utils/Marketing/Providers/GoogleAds.ts +1 -1
- package/Server/Utils/Marketing/Providers/LinkedIn.ts +1 -1
- package/Server/Utils/Marketing/Providers/Meta.ts +1 -1
- package/Server/Utils/Marketing/Providers/MicrosoftAds.ts +1 -1
- package/Server/Utils/Marketing/Providers/Reddit.ts +1 -1
- package/Server/Utils/Monitor/Criteria/APIRequestCriteria.ts +48 -33
- package/Server/Utils/Monitor/Criteria/DnsMonitorCriteria.ts +35 -30
- package/Server/Utils/Monitor/Criteria/DomainMonitorCriteria.ts +33 -28
- package/Server/Utils/Monitor/Criteria/EvaluateOverTime.ts +475 -47
- package/Server/Utils/Monitor/Criteria/ExternalStatusPageMonitorCriteria.ts +35 -30
- package/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts +47 -44
- package/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts +33 -28
- package/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts +69 -40
- package/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.ts +35 -29
- package/Server/Utils/Monitor/MonitorAlert.ts +24 -21
- package/Server/Utils/Monitor/MonitorCriteriaEvaluator.ts +8 -0
- package/Server/Utils/Monitor/MonitorIncident.ts +21 -18
- package/Server/Utils/Monitor/MonitorResource.ts +161 -21
- package/Server/Utils/Monitor/MonitorResourceContext.ts +107 -0
- package/Server/Utils/Monitor/MonitorStepResourceIdentity.ts +442 -0
- package/Server/Utils/Monitor/SeriesResourceLabels.ts +3 -3
- package/Server/Utils/Monitor/SeriesResourceLinker.ts +96 -28
- package/Server/Utils/StatusPageContentSecurityPolicy.ts +56 -0
- package/Server/Utils/StatusPageCustomizationAccess.ts +117 -0
- package/Server/Utils/TotpAuth.ts +137 -9
- package/Server/Utils/UserRegistrationToken.ts +182 -0
- package/Server/Utils/VerificationCode.ts +134 -0
- package/Tests/App/Dashboard/AdminNotificationRulesPage.test.tsx +173 -94
- package/Tests/App/Dashboard/AdminUserNotificationMethodsPage.test.tsx +1151 -0
- package/Tests/App/Dashboard/AdminUserOnCallPages.test.tsx +905 -0
- package/Tests/App/Dashboard/DashboardCommandPalette.test.tsx +338 -0
- package/Tests/App/Dashboard/InvestigationPanel.test.tsx +1 -1
- package/Tests/App/Dashboard/MonitorTypePicker.test.tsx +28 -0
- package/Tests/Models/UserPushCriticalAlertColumn.test.ts +172 -0
- package/Tests/Server/API/BaseAPIGetListParallel.test.ts +519 -0
- package/Tests/Server/API/NotificationChannelVerificationAPI.test.ts +543 -0
- package/Tests/Server/API/StatusPageCustomizationOrigin.test.ts +348 -0
- package/Tests/Server/API/UserIncomingCallNumberApi.test.ts +108 -18
- package/Tests/Server/API/UserNotificationMethodAdminAPI.test.ts +963 -0
- package/Tests/Server/API/UserPushCriticalAlertsApi.test.ts +114 -0
- package/Tests/Server/API/UserSmsApi.test.ts +107 -14
- package/Tests/Server/API/UserTotpAuthAPI.test.ts +427 -0
- package/Tests/Server/Infrastructure/Postgres/FixTotpOtpUrlAlgorithmMigration.test.ts +265 -0
- package/Tests/Server/Infrastructure/Postgres/SchemaMigrationsOrdering.test.ts +227 -0
- package/Tests/Server/Middleware/SlackAuthorization.test.ts +149 -0
- package/Tests/Server/Middleware/UserAuthorization.test.ts +27 -13
- package/Tests/Server/Middleware/UserAuthorizationGlobalSsoGovernance.test.ts +1455 -0
- package/Tests/Server/Middleware/UserAuthorizationSSOProvider.test.ts +91 -2
- package/Tests/Server/Middleware/VerificationCodeRateLimit.test.ts +775 -0
- package/Tests/Server/Middleware/WhatsAppAuthorization.test.ts +233 -0
- package/Tests/Server/Services/AddNetworkDeviceReachabilityColumnsMigration.test.ts +10 -62
- package/Tests/Server/Services/AnalyticsDatabasePaginationStability.test.ts +33 -13
- package/Tests/Server/Services/AnalyticsDatabaseSortKeyBoundary.test.ts +658 -0
- package/Tests/Server/Services/CriticalOnCallAlertDelivery.test.ts +458 -0
- package/Tests/Server/Services/CriticalPushAlertPayload.test.ts +301 -0
- package/Tests/Server/Services/DatabaseServiceAtomicIncrement.test.ts +143 -0
- package/Tests/Server/Services/DeliverNotificationForRuleExtraction.test.ts +1 -0
- package/Tests/Server/Services/DiscoveryScanClaimHookFreeSafety.test.ts +21 -8
- package/Tests/Server/Services/GlobalSsoProviderAuthorization.test.ts +1242 -0
- package/Tests/Server/Services/LogAggregationScanMemory.test.ts +421 -0
- package/Tests/Server/Services/LogAggregationService.test.ts +2 -2
- package/Tests/Server/Services/MonitorResourceProbeAgreementHydration.test.ts +459 -0
- package/Tests/Server/Services/MonitorResourceProbeAgreementReuse.test.ts +10 -0
- package/Tests/Server/Services/NotificationChannelCodeIssuance.test.ts +401 -0
- package/Tests/Server/Services/PushNotificationDeliveryOptions.test.ts +204 -0
- package/Tests/Server/Services/TeamMemberAutoAcceptInvitation.test.ts +21 -1
- package/Tests/Server/Services/TeamMemberInviteRegistrationToken.test.ts +290 -0
- package/Tests/Server/Services/UserNotificationMethodAdminService.test.ts +948 -0
- package/Tests/Server/Services/UserNotificationRuleExecuteItem.test.ts +1 -0
- package/Tests/Server/Services/UserPushCriticalAlertToggle.test.ts +255 -0
- package/Tests/Server/Services/UserTotpAuthEnrolment.test.ts +218 -0
- package/Tests/Server/TestingUtils/AuthenticatorApp.ts +248 -0
- package/Tests/Server/Types/AnalyticsDatabase/AggregateUtilBucketTimestamp.test.ts +416 -0
- package/Tests/Server/Types/Database/Permissions/NotificationChannelVerificationColumns.test.ts +135 -0
- package/Tests/Server/Types/Database/Permissions/OnCallScheduleRelationSelect.test.ts +504 -0
- package/Tests/Server/Types/Database/QueryHelperFindWithSameTextAnyOf.test.ts +91 -0
- package/Tests/Server/Types/Database/QueryHelperManyToManyAndEmptyValues.test.ts +551 -0
- package/Tests/Server/Types/Database/SelectUtil.test.ts +348 -0
- package/Tests/Server/Types/Workflow/Components/JsonToText.test.ts +384 -0
- package/Tests/Server/Types/Workflow/Components/MergeJson.test.ts +403 -0
- package/Tests/Server/Utils/Browser.test.ts +162 -0
- package/Tests/Server/Utils/ChannelVerification.test.ts +689 -0
- package/Tests/Server/Utils/CronTab.test.ts +116 -0
- package/Tests/Server/Utils/Express.test.ts +371 -0
- package/Tests/Server/Utils/GlobalSSOToken.test.ts +581 -0
- package/Tests/Server/Utils/GlobalSsoAuthorization.test.ts +1401 -0
- package/Tests/Server/Utils/Marketing/AdUploadableConversionTypes.test.ts +254 -0
- package/Tests/Server/Utils/Marketing/ConversionUploadProvider.test.ts +1 -1
- package/Tests/Server/Utils/Monitor/Criteria/APIRequestCriteriaEvaluateOverTime.test.ts +508 -0
- package/Tests/Server/Utils/Monitor/Criteria/APIRequestCriteriaPortTimings.test.ts +30 -9
- package/Tests/Server/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.test.ts +707 -0
- package/Tests/Server/Utils/Monitor/Criteria/DnsMonitorCriteria.test.ts +698 -0
- package/Tests/Server/Utils/Monitor/Criteria/EvaluateOverTime.test.ts +987 -0
- package/Tests/Server/Utils/Monitor/Criteria/ExternalStatusPageMonitorCriteria.test.ts +916 -0
- package/Tests/Server/Utils/Monitor/Criteria/IncomingEmailBodyCriteria.test.ts +243 -0
- package/Tests/Server/Utils/Monitor/Criteria/IncomingRequestBodyCriteria.test.ts +278 -0
- package/Tests/Server/Utils/Monitor/Criteria/ProfileMonitorCriteria.test.ts +382 -0
- package/Tests/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.test.ts +1219 -0
- package/Tests/Server/Utils/Monitor/MonitorAlertResourceLinking.test.ts +160 -20
- package/Tests/Server/Utils/Monitor/MonitorDependencySuppressionCreatorSkip.test.ts +13 -8
- package/Tests/Server/Utils/Monitor/MonitorIncidentResourceLinking.test.ts +162 -18
- package/Tests/Server/Utils/Monitor/MonitorResourceContext.test.ts +349 -0
- package/Tests/Server/Utils/Monitor/MonitorResourceIngestedStepSelection.test.ts +86 -0
- package/Tests/Server/Utils/Monitor/MonitorStepResourceIdentity.test.ts +690 -0
- package/Tests/Server/Utils/Monitor/MonitorSummaryPersistence.test.ts +7 -2
- package/Tests/Server/Utils/Monitor/SeriesResourceLinker.test.ts +92 -18
- package/Tests/Server/Utils/PushNotificationUtilCreators.test.ts +267 -0
- package/Tests/Server/Utils/StatusPageContentSecurityPolicy.test.ts +136 -0
- package/Tests/Server/Utils/StatusPageCustomizationAccess.test.ts +223 -0
- package/Tests/Server/Utils/Telemetry/OneuptimeLabel.test.ts +439 -0
- package/Tests/Server/Utils/TotpAuth.test.ts +719 -0
- package/Tests/Server/Utils/UserRegistrationToken.test.ts +322 -0
- package/Tests/Server/Utils/VerificationCode.test.ts +296 -0
- package/Tests/Types/AutoRemediation/AutoRemediationSuggestionStatus.test.ts +192 -0
- package/Tests/Types/Call/CallRequest.test.ts +189 -0
- package/Tests/Types/Dashboard/DashboardSize.test.ts +226 -0
- package/Tests/Types/Incident/IncidentSlaStatus.test.ts +191 -0
- package/Tests/Types/Metrics/MetricDashboardMetricType.test.ts +278 -0
- package/Tests/Types/Metrics/MetricPipelineRuleType.test.ts +517 -0
- package/Tests/Types/Monitor/IncomingMonitorDefaultCriteria.test.ts +470 -0
- package/Tests/Types/Monitor/MonitorCriteriaInstance.test.ts +6 -4
- package/Tests/Types/Monitor/MonitorStepConfigHelpers.test.ts +165 -0
- package/Tests/Types/Monitor/Recommendation/MonitorRecommendationCatalog.test.ts +262 -5
- package/Tests/Types/Monitor/Recommendation/MonitorRecommendationCoverage.test.ts +1 -1
- package/Tests/Types/Monitor/Recommendation/MonitorRecommendationNotificationMode.test.ts +1 -1
- package/Tests/Types/Monitor/ServiceAlertTemplates.test.ts +905 -0
- package/Tests/Types/NetworkDevice/NetworkDeviceLinkRuleScope.test.ts +215 -0
- package/Tests/Types/Service/ServiceLanguage.test.ts +255 -0
- package/Tests/Types/TextRandomGeneration.test.ts +211 -0
- package/Tests/UI/Components/Button.test.tsx +175 -1
- package/Tests/UI/Components/CodeBlockLanguages.test.tsx +236 -0
- package/Tests/UI/Components/CommandPalette/CommandPalette.test.tsx +568 -0
- package/Tests/UI/Components/CommandPalette/CommandPaletteKeyboard.test.tsx +239 -0
- package/Tests/UI/Components/CommandPalette/CommandPaletteProviders.test.tsx +400 -0
- package/Tests/UI/Components/CommandPalette/PaletteFilter.test.ts +234 -0
- package/Tests/UI/Components/CommandPalette/RecentCommands.test.ts +97 -0
- package/Tests/UI/Components/CountModelSideMenuItemGuard.test.tsx +198 -0
- package/Tests/UI/Components/FeedItemSafeMode.test.tsx +1 -1
- package/Tests/UI/Components/Forms/FormSubmitAnalytics.test.tsx +206 -0
- package/Tests/UI/Components/Forms/Utils/FormFieldSchemaTypeUtil.test.ts +267 -0
- package/Tests/UI/Components/List.test.tsx +9 -2
- package/Tests/UI/Components/ListLoadingStates.test.tsx +173 -0
- package/Tests/UI/Components/MarkdownLazy.test.tsx +113 -0
- package/Tests/UI/Components/MarkdownMermaidRetry.test.tsx +110 -0
- package/Tests/UI/Components/ModelTable/useCustomFieldColumns.test.tsx +8 -0
- package/Tests/UI/Components/MonitorTemplateVariables/TemplateVariablesCatalog.test.ts +692 -0
- package/Tests/UI/Components/MoreMenuMotion.test.tsx +118 -0
- package/Tests/UI/Components/NavBarCommandKGating.test.tsx +178 -0
- package/Tests/UI/Components/OrderedStatesList.test.tsx +19 -2
- package/Tests/UI/Components/SideOverMotion.test.tsx +109 -0
- package/Tests/UI/Components/Skeleton.test.tsx +71 -0
- package/Tests/UI/Components/TableLoadingStates.test.tsx +279 -0
- package/Tests/UI/Components/Tabs.test.tsx +24 -0
- package/Tests/UI/Components/Toast.test.tsx +130 -7
- package/Tests/UI/Components/ToastStacking.test.tsx +198 -0
- package/Tests/UI/Utils/AIChatExport/ConversationMarkdown.test.ts +774 -0
- package/Tests/UI/Utils/AIChatExport/MarkdownBlocks.test.ts +791 -0
- package/Tests/UI/Utils/AIChatExport/MarkdownSafety.test.ts +544 -0
- package/Tests/UI/Utils/Dropdown.test.ts +423 -0
- package/Tests/UI/Utils/ModelAPITenantHeader.test.ts +122 -0
- package/Tests/UI/Utils/ModelListCache.test.ts +338 -0
- package/Tests/UI/Utils/ProjectListCacheInvalidation.test.ts +225 -0
- package/Tests/Utils/API.test.ts +16 -2
- package/Tests/Utils/Analytics.test.ts +187 -0
- package/Tests/Utils/Dashboard/Components/DashboardKubernetesResourceListShared.test.ts +347 -0
- package/Tests/Utils/Dashboard/Components/DashboardListSharedArgs.test.ts +259 -0
- package/Tests/Utils/Dashboard/Components/DashboardMonitorListComponent.test.ts +466 -0
- package/Tests/Utils/Monitor/MonitorMetricType.test.ts +80 -0
- package/Tests/Utils/Monitor/NetworkDeviceLinkRuleUtil.test.ts +1291 -0
- package/Tests/Utils/NetworkDiscovery/UnclaimedScanDiagnosis.test.ts +214 -0
- package/Tests/Utils/Rum/UrlScrubberSegments.test.ts +362 -0
- package/Types/Email/EmailTemplateType.ts +1 -0
- package/Types/Marketing/MarketingConversion.ts +12 -0
- package/Types/Monitor/CriteriaFilter.ts +9 -0
- package/Types/Monitor/MonitorCriteriaInstance.ts +41 -20
- package/Types/Monitor/Recommendation/MonitorRecommendationCatalog.ts +131 -8
- package/Types/Monitor/Recommendation/MonitorRecommendationTypes.ts +48 -8
- package/Types/Monitor/ServiceAlertTemplates.ts +1352 -0
- package/Types/NetworkDevice/NetworkDeviceLinkRuleScope.ts +51 -0
- package/Types/Permission.ts +35 -0
- package/Types/PushNotification/AndroidNotificationChannel.ts +26 -0
- package/Types/PushNotification/PushNotificationMessage.ts +15 -0
- package/Types/PushNotification/PushNotificationRequest.ts +8 -16
- package/Types/Service/ServiceLanguage.ts +144 -0
- package/Types/Text.ts +111 -19
- package/UI/Components/Button/Button.tsx +27 -14
- package/UI/Components/CodeBlock/CodeBlock.tsx +54 -7
- package/UI/Components/CodeBlock/LanguageRegistry.ts +103 -0
- package/UI/Components/CommandPalette/CommandPalette.tsx +790 -0
- package/UI/Components/CommandPalette/PaletteFilter.ts +196 -0
- package/UI/Components/CommandPalette/PaletteRow.tsx +173 -0
- package/UI/Components/CommandPalette/RecentCommands.ts +57 -0
- package/UI/Components/CommandPalette/Types.ts +49 -0
- package/UI/Components/CommandPalette/UseProviderSearch.ts +129 -0
- package/UI/Components/Dropdown/Dropdown.tsx +6 -1
- package/UI/Components/Feed/FeedItem.tsx +1 -1
- package/UI/Components/FormModal/BasicFormModal.tsx +12 -0
- package/UI/Components/Forms/BasicForm.tsx +13 -1
- package/UI/Components/Forms/BasicModelForm.tsx +2 -1
- package/UI/Components/Forms/ModelForm.tsx +10 -1
- package/UI/Components/Forms/Utils/FormAnalyticsName.ts +39 -0
- package/UI/Components/List/List.tsx +37 -5
- package/UI/Components/List/ListSkeleton.tsx +54 -0
- package/UI/Components/Markdown.tsx/LazyMarkdownViewer.tsx +6 -1
- package/UI/Components/Markdown.tsx/MarkdownViewer.tsx +71 -26
- package/UI/Components/Modal/Modal.tsx +2 -2
- package/UI/Components/ModelFormModal/ModelFormModal.tsx +6 -1
- package/UI/Components/ModelTable/BaseModelTable.tsx +1 -1
- package/UI/Components/ModelTable/useCustomFieldColumns.ts +11 -5
- package/UI/Components/MoreMenu/MoreMenu.tsx +39 -1
- package/UI/Components/Navbar/NavBar.tsx +14 -1
- package/UI/Components/OrderedStatesList/OrderedStatesList.tsx +50 -5
- package/UI/Components/SideMenu/CountModelSideMenuItem.tsx +40 -1
- package/UI/Components/SideOver/SideOver.tsx +37 -2
- package/UI/Components/Skeleton/Skeleton.tsx +53 -0
- package/UI/Components/Table/Table.tsx +74 -44
- package/UI/Components/Table/TableSkeletonRows.tsx +141 -0
- package/UI/Components/Tabs/Tab.tsx +1 -1
- package/UI/Components/Toast/Toast.tsx +118 -53
- package/UI/Components/Toast/ToastInit.tsx +82 -32
- package/UI/Styles/Theme.css +40 -0
- package/UI/Utils/ModelAPI/ModelAPI.ts +20 -10
- package/UI/Utils/ModelListCache.ts +188 -0
- package/UI/Utils/Project.ts +29 -0
- package/Utils/API.ts +6 -1
- package/Utils/Analytics.ts +55 -2
- package/Utils/Monitor/MonitorMetricType.ts +40 -0
- package/Utils/Monitor/NetworkDeviceLinkRuleUtil.ts +587 -37
- package/Utils/NetworkDiscovery/UnclaimedScanDiagnosis.ts +115 -0
- package/build/dist/Models/DatabaseModels/GlobalOidc.js +21 -0
- package/build/dist/Models/DatabaseModels/GlobalOidc.js.map +1 -1
- package/build/dist/Models/DatabaseModels/GlobalSso.js +21 -0
- package/build/dist/Models/DatabaseModels/GlobalSso.js.map +1 -1
- package/build/dist/Models/DatabaseModels/MarketingConversion.js +20 -10
- package/build/dist/Models/DatabaseModels/MarketingConversion.js.map +1 -1
- package/build/dist/Models/DatabaseModels/NetworkDeviceLinkRule.js +47 -0
- package/build/dist/Models/DatabaseModels/NetworkDeviceLinkRule.js.map +1 -1
- package/build/dist/Models/DatabaseModels/OnCallDutyPolicySchedule.js +14 -0
- package/build/dist/Models/DatabaseModels/OnCallDutyPolicySchedule.js.map +1 -1
- package/build/dist/Models/DatabaseModels/StatusPage.js +4 -4
- package/build/dist/Models/DatabaseModels/StatusPage.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserCall.js +101 -3
- package/build/dist/Models/DatabaseModels/UserCall.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserEmail.js +101 -3
- package/build/dist/Models/DatabaseModels/UserEmail.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserIncomingCallNumber.js +101 -3
- package/build/dist/Models/DatabaseModels/UserIncomingCallNumber.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserPush.js +38 -0
- package/build/dist/Models/DatabaseModels/UserPush.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserSMS.js +101 -3
- package/build/dist/Models/DatabaseModels/UserSMS.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserWhatsApp.js +100 -2
- package/build/dist/Models/DatabaseModels/UserWhatsApp.js.map +1 -1
- package/build/dist/Server/API/BaseAPI.js +69 -13
- package/build/dist/Server/API/BaseAPI.js.map +1 -1
- package/build/dist/Server/API/StatusPageAPI.js +25 -4
- package/build/dist/Server/API/StatusPageAPI.js.map +1 -1
- package/build/dist/Server/API/UserCallAPI.js +42 -38
- package/build/dist/Server/API/UserCallAPI.js.map +1 -1
- package/build/dist/Server/API/UserEmailAPI.js +42 -38
- package/build/dist/Server/API/UserEmailAPI.js.map +1 -1
- package/build/dist/Server/API/UserIncomingCallNumberAPI.js +37 -32
- package/build/dist/Server/API/UserIncomingCallNumberAPI.js.map +1 -1
- package/build/dist/Server/API/UserNotificationMethodAdminAPI.js +341 -0
- package/build/dist/Server/API/UserNotificationMethodAdminAPI.js.map +1 -0
- package/build/dist/Server/API/UserPushAPI.js +95 -2
- package/build/dist/Server/API/UserPushAPI.js.map +1 -1
- package/build/dist/Server/API/UserSmsAPI.js +42 -38
- package/build/dist/Server/API/UserSmsAPI.js.map +1 -1
- package/build/dist/Server/API/UserWhatsAppAPI.js +42 -40
- package/build/dist/Server/API/UserWhatsAppAPI.js.map +1 -1
- package/build/dist/Server/EnvironmentConfig.js +6 -0
- package/build/dist/Server/EnvironmentConfig.js.map +1 -1
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787142779538-MigrationName.js +89 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787142779538-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787156982416-MigrationName.js +12 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787156982416-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787700000000-FixTotpOtpUrlAlgorithm.js +40 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787700000000-FixTotpOtpUrlAlgorithm.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787800000000-AddScopeToNetworkDeviceLinkRule.js +12 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787800000000-AddScopeToNetworkDeviceLinkRule.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787900000000-AddRestrictToAttachedProjectsToGlobalSso.js +29 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787900000000-AddRestrictToAttachedProjectsToGlobalSso.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js +10 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js.map +1 -1
- package/build/dist/Server/Middleware/SlackAuthorization.js +28 -4
- package/build/dist/Server/Middleware/SlackAuthorization.js.map +1 -1
- package/build/dist/Server/Middleware/UserAuthorization.js +197 -22
- package/build/dist/Server/Middleware/UserAuthorization.js.map +1 -1
- package/build/dist/Server/Middleware/VerificationCodeRateLimit.js +393 -0
- package/build/dist/Server/Middleware/VerificationCodeRateLimit.js.map +1 -0
- package/build/dist/Server/Middleware/WhatsAppAuthorization.js +32 -2
- package/build/dist/Server/Middleware/WhatsAppAuthorization.js.map +1 -1
- package/build/dist/Server/Services/AnalyticsDatabaseService.js +136 -0
- package/build/dist/Server/Services/AnalyticsDatabaseService.js.map +1 -1
- package/build/dist/Server/Services/DatabaseService.js +74 -0
- package/build/dist/Server/Services/DatabaseService.js.map +1 -1
- package/build/dist/Server/Services/GlobalOidcProjectService.js +105 -0
- package/build/dist/Server/Services/GlobalOidcProjectService.js.map +1 -1
- package/build/dist/Server/Services/GlobalOidcService.js +127 -0
- package/build/dist/Server/Services/GlobalOidcService.js.map +1 -1
- package/build/dist/Server/Services/GlobalSsoProjectService.js +105 -0
- package/build/dist/Server/Services/GlobalSsoProjectService.js.map +1 -1
- package/build/dist/Server/Services/GlobalSsoService.js +127 -0
- package/build/dist/Server/Services/GlobalSsoService.js.map +1 -1
- package/build/dist/Server/Services/LogAggregationService.js +5 -0
- package/build/dist/Server/Services/LogAggregationService.js.map +1 -1
- package/build/dist/Server/Services/PushNotificationService.js +69 -30
- package/build/dist/Server/Services/PushNotificationService.js.map +1 -1
- package/build/dist/Server/Services/TeamMemberService.js +43 -7
- package/build/dist/Server/Services/TeamMemberService.js.map +1 -1
- package/build/dist/Server/Services/UserCallService.js +54 -22
- package/build/dist/Server/Services/UserCallService.js.map +1 -1
- package/build/dist/Server/Services/UserEmailService.js +78 -17
- package/build/dist/Server/Services/UserEmailService.js.map +1 -1
- package/build/dist/Server/Services/UserIncomingCallNumberService.js +45 -74
- package/build/dist/Server/Services/UserIncomingCallNumberService.js.map +1 -1
- package/build/dist/Server/Services/UserNotificationMethodAdminService.js +1117 -0
- package/build/dist/Server/Services/UserNotificationMethodAdminService.js.map +1 -0
- package/build/dist/Server/Services/UserNotificationRuleService.js +20 -0
- package/build/dist/Server/Services/UserNotificationRuleService.js.map +1 -1
- package/build/dist/Server/Services/UserPushService.js +77 -0
- package/build/dist/Server/Services/UserPushService.js.map +1 -1
- package/build/dist/Server/Services/UserSmsService.js +50 -17
- package/build/dist/Server/Services/UserSmsService.js.map +1 -1
- package/build/dist/Server/Services/UserWhatsAppService.js +48 -15
- package/build/dist/Server/Services/UserWhatsAppService.js.map +1 -1
- package/build/dist/Server/Types/Database/QueryHelper.js +27 -0
- package/build/dist/Server/Types/Database/QueryHelper.js.map +1 -1
- package/build/dist/Server/Utils/AnalyticsDatabase/QuerySettingsHelper.js +46 -0
- package/build/dist/Server/Utils/AnalyticsDatabase/QuerySettingsHelper.js.map +1 -1
- package/build/dist/Server/Utils/ChannelVerification.js +348 -0
- package/build/dist/Server/Utils/ChannelVerification.js.map +1 -0
- package/build/dist/Server/Utils/CronTab.js +66 -0
- package/build/dist/Server/Utils/CronTab.js.map +1 -1
- package/build/dist/Server/Utils/GlobalSsoAuthorization.js +112 -0
- package/build/dist/Server/Utils/GlobalSsoAuthorization.js.map +1 -0
- package/build/dist/Server/Utils/Marketing/ConversionUploadProvider.js +17 -1
- package/build/dist/Server/Utils/Marketing/ConversionUploadProvider.js.map +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/GoogleAds.js +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/GoogleAds.js.map +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/LinkedIn.js +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/LinkedIn.js.map +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/Meta.js +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/Meta.js.map +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/MicrosoftAds.js +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/MicrosoftAds.js.map +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/Reddit.js +1 -1
- package/build/dist/Server/Utils/Marketing/Providers/Reddit.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js +37 -35
- package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/DnsMonitorCriteria.js +21 -25
- package/build/dist/Server/Utils/Monitor/Criteria/DnsMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/DomainMonitorCriteria.js +20 -22
- package/build/dist/Server/Utils/Monitor/Criteria/DomainMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/EvaluateOverTime.js +370 -42
- package/build/dist/Server/Utils/Monitor/Criteria/EvaluateOverTime.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/ExternalStatusPageMonitorCriteria.js +21 -25
- package/build/dist/Server/Utils/Monitor/Criteria/ExternalStatusPageMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js +34 -37
- package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.js +21 -25
- package/build/dist/Server/Utils/Monitor/Criteria/SSLMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.js +64 -52
- package/build/dist/Server/Utils/Monitor/Criteria/ServerMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.js +25 -29
- package/build/dist/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorAlert.js +20 -17
- package/build/dist/Server/Utils/Monitor/MonitorAlert.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorCriteriaEvaluator.js +8 -0
- package/build/dist/Server/Utils/Monitor/MonitorCriteriaEvaluator.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorIncident.js +17 -14
- package/build/dist/Server/Utils/Monitor/MonitorIncident.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorResource.js +123 -23
- package/build/dist/Server/Utils/Monitor/MonitorResource.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorResourceContext.js +95 -0
- package/build/dist/Server/Utils/Monitor/MonitorResourceContext.js.map +1 -0
- package/build/dist/Server/Utils/Monitor/MonitorStepResourceIdentity.js +313 -0
- package/build/dist/Server/Utils/Monitor/MonitorStepResourceIdentity.js.map +1 -0
- package/build/dist/Server/Utils/Monitor/SeriesResourceLabels.js +3 -3
- package/build/dist/Server/Utils/Monitor/SeriesResourceLinker.js +67 -26
- package/build/dist/Server/Utils/Monitor/SeriesResourceLinker.js.map +1 -1
- package/build/dist/Server/Utils/StatusPageContentSecurityPolicy.js +39 -0
- package/build/dist/Server/Utils/StatusPageContentSecurityPolicy.js.map +1 -0
- package/build/dist/Server/Utils/StatusPageCustomizationAccess.js +85 -0
- package/build/dist/Server/Utils/StatusPageCustomizationAccess.js.map +1 -0
- package/build/dist/Server/Utils/TotpAuth.js +127 -8
- package/build/dist/Server/Utils/TotpAuth.js.map +1 -1
- package/build/dist/Server/Utils/UserRegistrationToken.js +170 -0
- package/build/dist/Server/Utils/UserRegistrationToken.js.map +1 -0
- package/build/dist/Server/Utils/VerificationCode.js +120 -0
- package/build/dist/Server/Utils/VerificationCode.js.map +1 -0
- package/build/dist/Types/Email/EmailTemplateType.js +1 -0
- package/build/dist/Types/Email/EmailTemplateType.js.map +1 -1
- package/build/dist/Types/Marketing/MarketingConversion.js +10 -0
- package/build/dist/Types/Marketing/MarketingConversion.js.map +1 -1
- package/build/dist/Types/Monitor/CriteriaFilter.js +1 -0
- package/build/dist/Types/Monitor/CriteriaFilter.js.map +1 -1
- package/build/dist/Types/Monitor/MonitorCriteriaInstance.js +42 -21
- package/build/dist/Types/Monitor/MonitorCriteriaInstance.js.map +1 -1
- package/build/dist/Types/Monitor/Recommendation/MonitorRecommendationCatalog.js +77 -5
- package/build/dist/Types/Monitor/Recommendation/MonitorRecommendationCatalog.js.map +1 -1
- package/build/dist/Types/Monitor/Recommendation/MonitorRecommendationTypes.js +18 -6
- package/build/dist/Types/Monitor/Recommendation/MonitorRecommendationTypes.js.map +1 -1
- package/build/dist/Types/Monitor/ServiceAlertTemplates.js +1028 -0
- package/build/dist/Types/Monitor/ServiceAlertTemplates.js.map +1 -0
- package/build/dist/Types/NetworkDevice/NetworkDeviceLinkRuleScope.js +46 -0
- package/build/dist/Types/NetworkDevice/NetworkDeviceLinkRuleScope.js.map +1 -0
- package/build/dist/Types/Permission.js +33 -0
- package/build/dist/Types/Permission.js.map +1 -1
- package/build/dist/Types/PushNotification/AndroidNotificationChannel.js +27 -0
- package/build/dist/Types/PushNotification/AndroidNotificationChannel.js.map +1 -0
- package/build/dist/Types/Service/ServiceLanguage.js +96 -0
- package/build/dist/Types/Service/ServiceLanguage.js.map +1 -0
- package/build/dist/Types/Text.js +82 -17
- package/build/dist/Types/Text.js.map +1 -1
- package/build/dist/UI/Components/Button/Button.js +22 -14
- package/build/dist/UI/Components/Button/Button.js.map +1 -1
- package/build/dist/UI/Components/CodeBlock/CodeBlock.js +35 -3
- package/build/dist/UI/Components/CodeBlock/CodeBlock.js.map +1 -1
- package/build/dist/UI/Components/CodeBlock/LanguageRegistry.js +57 -0
- package/build/dist/UI/Components/CodeBlock/LanguageRegistry.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/CommandPalette.js +439 -0
- package/build/dist/UI/Components/CommandPalette/CommandPalette.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/PaletteFilter.js +135 -0
- package/build/dist/UI/Components/CommandPalette/PaletteFilter.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/PaletteRow.js +83 -0
- package/build/dist/UI/Components/CommandPalette/PaletteRow.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/RecentCommands.js +47 -0
- package/build/dist/UI/Components/CommandPalette/RecentCommands.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/Types.js +2 -0
- package/build/dist/UI/Components/CommandPalette/Types.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/UseProviderSearch.js +88 -0
- package/build/dist/UI/Components/CommandPalette/UseProviderSearch.js.map +1 -0
- package/build/dist/UI/Components/Dropdown/Dropdown.js +6 -1
- package/build/dist/UI/Components/Dropdown/Dropdown.js.map +1 -1
- package/build/dist/UI/Components/Feed/FeedItem.js +1 -1
- package/build/dist/UI/Components/Feed/FeedItem.js.map +1 -1
- package/build/dist/UI/Components/FormModal/BasicFormModal.js +2 -1
- package/build/dist/UI/Components/FormModal/BasicFormModal.js.map +1 -1
- package/build/dist/UI/Components/Forms/BasicForm.js +10 -1
- package/build/dist/UI/Components/Forms/BasicForm.js.map +1 -1
- package/build/dist/UI/Components/Forms/BasicModelForm.js +2 -1
- package/build/dist/UI/Components/Forms/BasicModelForm.js.map +1 -1
- package/build/dist/UI/Components/Forms/ModelForm.js +4 -1
- package/build/dist/UI/Components/Forms/ModelForm.js.map +1 -1
- package/build/dist/UI/Components/Forms/Utils/FormAnalyticsName.js +33 -0
- package/build/dist/UI/Components/Forms/Utils/FormAnalyticsName.js.map +1 -0
- package/build/dist/UI/Components/List/List.js +19 -5
- package/build/dist/UI/Components/List/List.js.map +1 -1
- package/build/dist/UI/Components/List/ListSkeleton.js +21 -0
- package/build/dist/UI/Components/List/ListSkeleton.js.map +1 -0
- package/build/dist/UI/Components/Markdown.tsx/LazyMarkdownViewer.js.map +1 -1
- package/build/dist/UI/Components/Markdown.tsx/MarkdownViewer.js +52 -25
- package/build/dist/UI/Components/Markdown.tsx/MarkdownViewer.js.map +1 -1
- package/build/dist/UI/Components/Modal/Modal.js +2 -2
- package/build/dist/UI/Components/ModelFormModal/ModelFormModal.js +2 -1
- package/build/dist/UI/Components/ModelFormModal/ModelFormModal.js.map +1 -1
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js +1 -1
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js.map +1 -1
- package/build/dist/UI/Components/ModelTable/useCustomFieldColumns.js +9 -2
- package/build/dist/UI/Components/ModelTable/useCustomFieldColumns.js.map +1 -1
- package/build/dist/UI/Components/MoreMenu/MoreMenu.js +32 -1
- package/build/dist/UI/Components/MoreMenu/MoreMenu.js.map +1 -1
- package/build/dist/UI/Components/Navbar/NavBar.js +5 -1
- package/build/dist/UI/Components/Navbar/NavBar.js.map +1 -1
- package/build/dist/UI/Components/OrderedStatesList/OrderedStatesList.js +29 -5
- package/build/dist/UI/Components/OrderedStatesList/OrderedStatesList.js.map +1 -1
- package/build/dist/UI/Components/SideMenu/CountModelSideMenuItem.js +23 -1
- package/build/dist/UI/Components/SideMenu/CountModelSideMenuItem.js.map +1 -1
- package/build/dist/UI/Components/SideOver/SideOver.js +23 -2
- package/build/dist/UI/Components/SideOver/SideOver.js.map +1 -1
- package/build/dist/UI/Components/Skeleton/Skeleton.js +23 -0
- package/build/dist/UI/Components/Skeleton/Skeleton.js.map +1 -0
- package/build/dist/UI/Components/Table/Table.js +35 -24
- package/build/dist/UI/Components/Table/Table.js.map +1 -1
- package/build/dist/UI/Components/Table/TableSkeletonRows.js +52 -0
- package/build/dist/UI/Components/Table/TableSkeletonRows.js.map +1 -0
- package/build/dist/UI/Components/Tabs/Tab.js +1 -1
- package/build/dist/UI/Components/Tabs/Tab.js.map +1 -1
- package/build/dist/UI/Components/Toast/Toast.js +77 -23
- package/build/dist/UI/Components/Toast/Toast.js.map +1 -1
- package/build/dist/UI/Components/Toast/ToastInit.js +37 -15
- package/build/dist/UI/Components/Toast/ToastInit.js.map +1 -1
- package/build/dist/UI/Utils/ModelAPI/ModelAPI.js +18 -9
- package/build/dist/UI/Utils/ModelAPI/ModelAPI.js.map +1 -1
- package/build/dist/UI/Utils/ModelListCache.js +126 -0
- package/build/dist/UI/Utils/ModelListCache.js.map +1 -0
- package/build/dist/UI/Utils/Project.js +24 -1
- package/build/dist/UI/Utils/Project.js.map +1 -1
- package/build/dist/Utils/API.js +6 -1
- package/build/dist/Utils/API.js.map +1 -1
- package/build/dist/Utils/Analytics.js +50 -2
- package/build/dist/Utils/Analytics.js.map +1 -1
- package/build/dist/Utils/Monitor/MonitorMetricType.js +37 -0
- package/build/dist/Utils/Monitor/MonitorMetricType.js.map +1 -1
- package/build/dist/Utils/Monitor/NetworkDeviceLinkRuleUtil.js +318 -37
- package/build/dist/Utils/Monitor/NetworkDeviceLinkRuleUtil.js.map +1 -1
- package/build/dist/Utils/NetworkDiscovery/UnclaimedScanDiagnosis.js +87 -0
- package/build/dist/Utils/NetworkDiscovery/UnclaimedScanDiagnosis.js.map +1 -0
- package/jest.config.json +1 -1
- package/package.json +2 -3
- package/Server/Utils/Monitor/MonitorClusterContext.ts +0 -182
- package/Tests/__mocks__/otpauth.js +0 -30
- package/build/dist/Server/Utils/Monitor/MonitorClusterContext.js +0 -141
- package/build/dist/Server/Utils/Monitor/MonitorClusterContext.js.map +0 -1
|
@@ -17,35 +17,32 @@ import CaptureSpan from "../../Telemetry/CaptureSpan";
|
|
|
17
17
|
export default class IncomingRequestCriteria {
|
|
18
18
|
static async isMonitorInstanceCriteriaFilterMet(input) {
|
|
19
19
|
// Server Monitoring Checks
|
|
20
|
-
var _a;
|
|
20
|
+
var _a, _b, _c;
|
|
21
21
|
logger.debug("Checking IncomingRequestCriteria for Monitor: " +
|
|
22
22
|
input.dataToProcess.monitorId.toString());
|
|
23
23
|
logger.debug("Data to process: " + JSON.stringify(input.dataToProcess, null, 2));
|
|
24
24
|
logger.debug("Criteria Filter: " + JSON.stringify(input.criteriaFilter, null, 2));
|
|
25
25
|
let value = input.criteriaFilter.value;
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
input.
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
logger.error(err);
|
|
43
|
-
overTimeValue = undefined;
|
|
44
|
-
}
|
|
26
|
+
const overTime = await EvaluateOverTime.getOverTimeValueForCriteriaFilter({
|
|
27
|
+
projectId: input.dataToProcess.projectId,
|
|
28
|
+
monitorId: input.dataToProcess.monitorId,
|
|
29
|
+
criteriaFilter: input.criteriaFilter,
|
|
30
|
+
monitoringInterval: input.monitoringInterval,
|
|
31
|
+
});
|
|
32
|
+
/*
|
|
33
|
+
* The window could not back this over-time filter (nothing recorded yet,
|
|
34
|
+
* or the monitor has not been running long enough to cover it). Return
|
|
35
|
+
* the decision the no-data policy already made instead of falling
|
|
36
|
+
* through to the value that arrived with this one check - that fallback
|
|
37
|
+
* is what let "all values over the last N minutes" fire off a single
|
|
38
|
+
* bad reading.
|
|
39
|
+
*/
|
|
40
|
+
if (overTime.earlyReturn) {
|
|
41
|
+
return overTime.earlyReturn.result;
|
|
45
42
|
}
|
|
43
|
+
const overTimeValue = overTime.value;
|
|
46
44
|
if (input.criteriaFilter.checkOn === CheckOn.IsOnline) {
|
|
47
|
-
const currentIsOnline = overTimeValue
|
|
48
|
-
input.dataToProcess.isOnline;
|
|
45
|
+
const currentIsOnline = (_a = overTimeValue) !== null && _a !== void 0 ? _a : input.dataToProcess.isOnline;
|
|
49
46
|
return CompareCriteria.compareCriteriaBoolean({
|
|
50
47
|
value: currentIsOnline,
|
|
51
48
|
criteriaFilter: input.criteriaFilter,
|
|
@@ -53,8 +50,7 @@ export default class IncomingRequestCriteria {
|
|
|
53
50
|
}
|
|
54
51
|
// timeout.
|
|
55
52
|
if (input.criteriaFilter.checkOn === CheckOn.IsRequestTimeout) {
|
|
56
|
-
const currentIsTimeout = overTimeValue
|
|
57
|
-
input.dataToProcess.isTimeout;
|
|
53
|
+
const currentIsTimeout = (_b = overTimeValue) !== null && _b !== void 0 ? _b : input.dataToProcess.isTimeout;
|
|
58
54
|
return CompareCriteria.compareCriteriaBoolean({
|
|
59
55
|
value: currentIsTimeout,
|
|
60
56
|
criteriaFilter: input.criteriaFilter,
|
|
@@ -66,7 +62,7 @@ export default class IncomingRequestCriteria {
|
|
|
66
62
|
input.dataToProcess.monitorId.toString());
|
|
67
63
|
const lastCheckTime = input.dataToProcess.incomingRequestReceivedAt;
|
|
68
64
|
logger.debug("Last Check Time: " + lastCheckTime);
|
|
69
|
-
const differenceInMinutes = OneUptimeDate.getDifferenceInMinutes(lastCheckTime, ((
|
|
65
|
+
const differenceInMinutes = OneUptimeDate.getDifferenceInMinutes(lastCheckTime, ((_c = input.dataToProcess) === null || _c === void 0 ? void 0 : _c.checkedAt) ||
|
|
70
66
|
OneUptimeDate.getCurrentDate());
|
|
71
67
|
logger.debug("Difference in minutes: " + differenceInMinutes);
|
|
72
68
|
if (!value) {
|
|
@@ -108,26 +104,27 @@ export default class IncomingRequestCriteria {
|
|
|
108
104
|
}
|
|
109
105
|
}
|
|
110
106
|
if (input.criteriaFilter.checkOn === CheckOn.RequestBody) {
|
|
111
|
-
let
|
|
112
|
-
if (
|
|
113
|
-
|
|
114
|
-
}
|
|
115
|
-
if (!responseBody) {
|
|
116
|
-
return null;
|
|
107
|
+
let requestBody = input.dataToProcess.requestBody;
|
|
108
|
+
if (requestBody && typeof requestBody === Typeof.Object) {
|
|
109
|
+
requestBody = JSON.stringify(requestBody);
|
|
117
110
|
}
|
|
111
|
+
/*
|
|
112
|
+
* A request that carried no body is an empty body, not an unknown one.
|
|
113
|
+
* Normalising to "" (the same thing IncomingEmailCriteria does for the
|
|
114
|
+
* email fields) is what lets a "Not Contains" filter match a bodiless
|
|
115
|
+
* heartbeat ping - the default online criteria for this monitor type.
|
|
116
|
+
* "Contains" is unaffected: "" contains nothing.
|
|
117
|
+
*/
|
|
118
|
+
const body = requestBody || "";
|
|
118
119
|
// contains
|
|
119
120
|
if (input.criteriaFilter.filterType === FilterType.Contains) {
|
|
120
|
-
if (value &&
|
|
121
|
-
responseBody &&
|
|
122
|
-
responseBody.includes(value)) {
|
|
121
|
+
if (value && body.includes(value)) {
|
|
123
122
|
return `Request body contains ${value}.`;
|
|
124
123
|
}
|
|
125
124
|
return null;
|
|
126
125
|
}
|
|
127
126
|
if (input.criteriaFilter.filterType === FilterType.NotContains) {
|
|
128
|
-
if (value &&
|
|
129
|
-
responseBody &&
|
|
130
|
-
!responseBody.includes(value)) {
|
|
127
|
+
if (value && !body.includes(value)) {
|
|
131
128
|
return `Request body does not contain ${value}.`;
|
|
132
129
|
}
|
|
133
130
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IncomingRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAE3C,OAAO,aAAa,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EACL,OAAO,EAEP,UAAU,GACX,MAAM,0CAA0C,CAAC;AAElD,OAAO,MAAM,MAAM,0BAA0B,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"IncomingRequestCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,35 +12,32 @@ import OneUptimeDate from "../../../../Types/Date";
|
|
|
12
12
|
import { CheckOn, FilterType, } from "../../../../Types/Monitor/CriteriaFilter";
|
|
13
13
|
import EvaluateOverTime from "./EvaluateOverTime";
|
|
14
14
|
import CaptureSpan from "../../Telemetry/CaptureSpan";
|
|
15
|
-
import logger from "../../Logger";
|
|
16
15
|
export default class ServerMonitorCriteria {
|
|
17
16
|
static async isMonitorInstanceCriteriaFilterMet(input) {
|
|
17
|
+
var _a, _b;
|
|
18
18
|
let threshold = input.criteriaFilter.value;
|
|
19
19
|
const dataToProcess = input.dataToProcess;
|
|
20
20
|
const sslResponse = dataToProcess.sslResponse;
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
input.
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
}
|
|
40
|
-
}
|
|
21
|
+
const overTime = await EvaluateOverTime.getOverTimeValueForCriteriaFilter({
|
|
22
|
+
projectId: input.dataToProcess.projectId,
|
|
23
|
+
monitorId: input.dataToProcess.monitorId,
|
|
24
|
+
criteriaFilter: input.criteriaFilter,
|
|
25
|
+
monitoringInterval: input.monitoringInterval,
|
|
26
|
+
});
|
|
27
|
+
/*
|
|
28
|
+
* The window could not back this over-time filter (nothing recorded yet,
|
|
29
|
+
* or the monitor has not been running long enough to cover it). Return
|
|
30
|
+
* the decision the no-data policy already made instead of falling
|
|
31
|
+
* through to the value that arrived with this one check - that fallback
|
|
32
|
+
* is what let "all values over the last N minutes" fire off a single
|
|
33
|
+
* bad reading.
|
|
34
|
+
*/
|
|
35
|
+
if (overTime.earlyReturn) {
|
|
36
|
+
return overTime.earlyReturn.result;
|
|
37
|
+
}
|
|
38
|
+
const overTimeValue = overTime.value;
|
|
41
39
|
if (input.criteriaFilter.checkOn === CheckOn.IsOnline) {
|
|
42
|
-
const currentIsOnline = overTimeValue
|
|
43
|
-
input.dataToProcess.isOnline;
|
|
40
|
+
const currentIsOnline = (_a = overTimeValue) !== null && _a !== void 0 ? _a : input.dataToProcess.isOnline;
|
|
44
41
|
return CompareCriteria.compareCriteriaBoolean({
|
|
45
42
|
value: currentIsOnline,
|
|
46
43
|
criteriaFilter: input.criteriaFilter,
|
|
@@ -48,8 +45,7 @@ export default class ServerMonitorCriteria {
|
|
|
48
45
|
}
|
|
49
46
|
// timeout.
|
|
50
47
|
if (input.criteriaFilter.checkOn === CheckOn.IsRequestTimeout) {
|
|
51
|
-
const currentIsTimeout = overTimeValue
|
|
52
|
-
input.dataToProcess.isTimeout;
|
|
48
|
+
const currentIsTimeout = (_b = overTimeValue) !== null && _b !== void 0 ? _b : input.dataToProcess.isTimeout;
|
|
53
49
|
return CompareCriteria.compareCriteriaBoolean({
|
|
54
50
|
value: currentIsTimeout,
|
|
55
51
|
criteriaFilter: input.criteriaFilter,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SSLMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,aAAa,MAAM,wBAAwB,CAAC;AACnD,OAAO,EACL,OAAO,EAEP,UAAU,GACX,MAAM,0CAA0C,CAAC;AAGlD,OAAO,
|
|
1
|
+
{"version":3,"file":"SSLMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/SSLMonitorCriteria.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,aAAa,MAAM,wBAAwB,CAAC;AACnD,OAAO,EACL,OAAO,EAEP,UAAU,GACX,MAAM,0CAA0C,CAAC;AAGlD,OAAO,gBAA2C,MAAM,oBAAoB,CAAC;AAC7E,OAAO,WAAW,MAAM,6BAA6B,CAAC;AAEtD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAEpB,AAAb,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,KAUtD;;QACC,IAAI,SAAS,GACX,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC;QAE7B,MAAM,aAAa,GACjB,KAAK,CAAC,aAAqC,CAAC;QAE9C,MAAM,WAAW,GACf,aAAa,CAAC,WAAW,CAAC;QAE5B,MAAM,QAAQ,GACZ,MAAM,gBAAgB,CAAC,iCAAiC,CAAC;YACvD,SAAS,EAAG,KAAK,CAAC,aAAsC,CAAC,SAAS;YAClE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,SAAU;YACzC,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;SAC7C,CAAC,CAAC;QAEL;;;;;;;WAOG;QACH,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC;QACrC,CAAC;QAED,MAAM,aAAa,GAIH,QAAQ,CAAC,KAAK,CAAC;QAE/B,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;YACtD,MAAM,eAAe,GACnB,MAAC,aAAgC,mCAChC,KAAK,CAAC,aAAsC,CAAC,QAAQ,CAAC;YAEzD,OAAO,eAAe,CAAC,sBAAsB,CAAC;gBAC5C,KAAK,EAAE,eAAe;gBACtB,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC,CAAC,CAAC;QACL,CAAC;QAED,WAAW;QACX,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC9D,MAAM,gBAAgB,GACpB,MAAC,aAAgC,mCAChC,KAAK,CAAC,aAAsC,CAAC,SAAS,CAAC;YAE1D,OAAO,eAAe,CAAC,sBAAsB,CAAC;gBAC5C,KAAK,EAAE,gBAAgB;gBACvB,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAChE,MAAM,kBAAkB,GACtB,qBAAqB,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;YAE1D,MAAM,MAAM,GACV,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC;YAEtD,MAAM,OAAO,GACX,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,KAAK,CAAC;YAEvD,IAAI,kBAAkB,IAAI,MAAM,EAAE,CAAC;gBACjC,OAAO,2BAA2B,CAAC;YACrC,CAAC;YAED,IAAI,CAAC,kBAAkB,IAAI,OAAO,EAAE,CAAC;gBACnC,OAAO,qBAAqB,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,uBAAuB,EAAE,CAAC;YACrE,MAAM,YAAY,GAAY,OAAO,CACnC,WAAW,IAAI,WAAW,CAAC,YAAY,CACxC,CAAC;YACF,MAAM,MAAM,GACV,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC;YAEtD,MAAM,OAAO,GACX,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,KAAK,CAAC;YAEvD,IAAI,YAAY,IAAI,MAAM,EAAE,CAAC;gBAC3B,OAAO,iCAAiC,CAAC;YAC3C,CAAC;YAED,IAAI,CAAC,YAAY,IAAI,OAAO,EAAE,CAAC;gBAC7B,OAAO,qCAAqC,CAAC;YAC/C,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,oBAAoB,EAAE,CAAC;YAClE,MAAM,SAAS,GAAY,OAAO,CAChC,WAAW;gBACT,WAAW,CAAC,SAAS;gBACrB,aAAa,CAAC,QAAQ,CACpB,WAAW,CAAC,SAAS,EACrB,aAAa,CAAC,cAAc,EAAE,CAC/B,CACJ,CAAC;YAEF,MAAM,MAAM,GACV,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC;YAEtD,MAAM,OAAO,GACX,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,KAAK,CAAC;YAEvD,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;gBACxB,OAAO,6BAA6B,CAAC;YACvC,CAAC;YAED,IAAI,CAAC,SAAS,IAAI,OAAO,EAAE,CAAC;gBAC1B,OAAO,iCAAiC,CAAC;YAC3C,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,sBAAsB,EAAE,CAAC;YACpE;;;;;;;;;eASG;YACH,MAAM,UAAU,GACd,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;YAE3D,MAAM,MAAM,GACV,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC;YAEtD,MAAM,OAAO,GACX,KAAK,CAAC,cAAc,CAAC,UAAU,KAAK,UAAU,CAAC,KAAK,CAAC;YAEvD,IAAI,UAAU,IAAI,MAAM,EAAE,CAAC;gBACzB,OAAO,qBAAqB,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;YACvE,CAAC;YAED,IAAI,CAAC,UAAU,IAAI,OAAO,EAAE,CAAC;gBAC3B,OAAO,2BAA2B,CAAC;YACrC,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,cAAc,EAAE,CAAC;YAC5D,SAAS,GAAG,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEvD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,SAAS,GAAqB,WAAW,IAAI,WAAW,CAAC,SAAS,CAAC;YACzE,MAAM,KAAK,GACT,SAAS;gBACT,aAAa,CAAC,uBAAuB,CACnC,aAAa,CAAC,cAAc,EAAE,EAC9B,SAAS,CACV,CAAC;YAEJ,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC1C,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,eAAe,CAAC,sBAAsB,CAAC;gBAC5C,KAAK,EAAE,KAAK;gBACZ,SAAS,EAAE,SAAmB;gBAC9B,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,KAAK,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3D,SAAS,GAAG,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAEvD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,SAAS,GAAqB,WAAW,IAAI,WAAW,CAAC,SAAS,CAAC;YACzE,MAAM,IAAI,GACR,SAAS;gBACT,aAAa,CAAC,sBAAsB,CAClC,aAAa,CAAC,cAAc,EAAE,EAC9B,SAAS,CACV,CAAC;YAEJ,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACxC,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,eAAe,CAAC,sBAAsB,CAAC;gBAC5C,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,SAAmB;gBAC9B,cAAc,EAAE,KAAK,CAAC,cAAc;aACrC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;;;;;;OAWG;IACK,MAAM,CAAC,kBAAkB,CAC/B,aAAmC;QAEnC,MAAM,WAAW,GACf,aAAa,CAAC,WAAW,CAAC;QAE5B,IAAI,CAAC,WAAW,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,WAAW,CAAC,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACjD,OAAO,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;QACjD,CAAC;QAED,8DAA8D;QAC9D,OAAO,OAAO,CACZ,WAAW,CAAC,SAAS;YACnB,CAAC,WAAW,CAAC,YAAY;YACzB,aAAa,CAAC,OAAO,CACnB,WAAW,CAAC,SAAS,EACrB,aAAa,CAAC,cAAc,EAAE,CAC/B,CACJ,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACK,MAAM,CAAC,wBAAwB,CACrC,aAAmC;QAEnC,MAAM,WAAW,GACf,aAAa,CAAC,WAAW,CAAC;QAE5B,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5B,OAAO,6EAA6E,CAAC;QACvF,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,+BAA+B,CAAC;QACzC,CAAC;QAED,IAAI,WAAW,CAAC,0BAA0B,EAAE,CAAC;YAC3C,OAAO,iCAAiC,WAAW,CAAC,0BAA0B,EAAE,CAAC;QACnF,CAAC;QAED,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;YAC7B,OAAO,+DAA+D,CAAC;QACzE,CAAC;QAED,IACE,WAAW,CAAC,SAAS;YACrB,aAAa,CAAC,QAAQ,CACpB,WAAW,CAAC,SAAS,EACrB,aAAa,CAAC,cAAc,EAAE,CAC/B,EACD,CAAC;YACD,OAAO,4DAA4D,CAAC;QACtE,CAAC;QAED,OAAO,+BAA+B,CAAC;IACzC,CAAC;CACF;AArSqB;IADnB,WAAW,EAAE;;;;qEAuNb"}
|
|
@@ -16,29 +16,39 @@ import CaptureSpan from "../../Telemetry/CaptureSpan";
|
|
|
16
16
|
export default class ServerMonitorCriteria {
|
|
17
17
|
static async isMonitorInstanceCriteriaFilterMet(input) {
|
|
18
18
|
// Server Monitoring Checks
|
|
19
|
-
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;
|
|
19
|
+
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, _0, _1, _2, _3, _4, _5, _6, _7;
|
|
20
20
|
let threshold = input.criteriaFilter.value;
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
input.
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
21
|
+
const overTime = await EvaluateOverTime.getOverTimeValueForCriteriaFilter({
|
|
22
|
+
projectId: input.dataToProcess.projectId,
|
|
23
|
+
monitorId: input.dataToProcess.monitorId,
|
|
24
|
+
criteriaFilter: input.criteriaFilter,
|
|
25
|
+
/*
|
|
26
|
+
* Only the disk-usage series carries a diskPath attribute, so
|
|
27
|
+
* scoping any other series by it would filter against an attribute
|
|
28
|
+
* no row has - and an empty window now means "cannot judge yet"
|
|
29
|
+
* rather than "compare the live value", which would silence the
|
|
30
|
+
* filter outright.
|
|
31
|
+
*/
|
|
32
|
+
miscData: input.criteriaFilter.checkOn === CheckOn.DiskUsagePercent
|
|
33
|
+
? input.criteriaFilter.serverMonitorOptions
|
|
34
|
+
: undefined,
|
|
35
|
+
monitoringInterval: input.monitoringInterval,
|
|
36
|
+
});
|
|
37
|
+
/*
|
|
38
|
+
* The window could not back this over-time filter, so the no-data policy
|
|
39
|
+
* has already decided it - do not fall through to the value that arrived
|
|
40
|
+
* with this one check.
|
|
41
|
+
*
|
|
42
|
+
* "Is Online" is exempt: for a server monitor the absence of data IS the
|
|
43
|
+
* signal, and the differenceInMinutes check below already implements the
|
|
44
|
+
* "wait this long before calling it offline" behaviour off the agent's
|
|
45
|
+
* last check-in time. Letting it fall through preserves that.
|
|
46
|
+
*/
|
|
47
|
+
if (overTime.earlyReturn &&
|
|
48
|
+
input.criteriaFilter.checkOn !== CheckOn.IsOnline) {
|
|
49
|
+
return overTime.earlyReturn.result;
|
|
41
50
|
}
|
|
51
|
+
const overTimeValue = overTime.value;
|
|
42
52
|
const lastCheckTime = input.dataToProcess
|
|
43
53
|
.requestReceivedAt;
|
|
44
54
|
const timeNow = input.dataToProcess.timeNow ||
|
|
@@ -70,7 +80,7 @@ export default class ServerMonitorCriteria {
|
|
|
70
80
|
};
|
|
71
81
|
if (input.criteriaFilter.checkOn === CheckOn.IsOnline &&
|
|
72
82
|
differenceInMinutes >= offlineIfNotCheckedInMinutes) {
|
|
73
|
-
const currentIsOnline = overTimeValue
|
|
83
|
+
const currentIsOnline = (_a = overTimeValue) !== null && _a !== void 0 ? _a : false; // false because no request receieved in the last 2 minutes
|
|
74
84
|
logger.debug(`Current Is Online: ${currentIsOnline}`);
|
|
75
85
|
const criteria = CompareCriteria.compareCriteriaBoolean({
|
|
76
86
|
value: currentIsOnline,
|
|
@@ -81,7 +91,7 @@ export default class ServerMonitorCriteria {
|
|
|
81
91
|
}
|
|
82
92
|
if (input.criteriaFilter.checkOn === CheckOn.IsOnline &&
|
|
83
93
|
differenceInMinutes < offlineIfNotCheckedInMinutes) {
|
|
84
|
-
const currentIsOnline = overTimeValue
|
|
94
|
+
const currentIsOnline = (_b = overTimeValue) !== null && _b !== void 0 ? _b : true; // true because request receieved in the last 2 minutes
|
|
85
95
|
logger.debug(`Current Is Online: ${currentIsOnline}`);
|
|
86
96
|
const criteria = CompareCriteria.compareCriteriaBoolean({
|
|
87
97
|
value: currentIsOnline,
|
|
@@ -93,10 +103,9 @@ export default class ServerMonitorCriteria {
|
|
|
93
103
|
if (input.criteriaFilter.checkOn === CheckOn.CPUUsagePercent &&
|
|
94
104
|
!input.dataToProcess.onlyCheckRequestReceivedAt) {
|
|
95
105
|
threshold = CompareCriteria.convertToNumber(threshold);
|
|
96
|
-
const currentCpuPercent = overTimeValue
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
0;
|
|
106
|
+
const currentCpuPercent = (_c = overTimeValue) !== null && _c !== void 0 ? _c : (((_d = input.dataToProcess
|
|
107
|
+
.basicInfrastructureMetrics) === null || _d === void 0 ? void 0 : _d.cpuMetrics.percentUsed) ||
|
|
108
|
+
0);
|
|
100
109
|
return CompareCriteria.compareCriteriaNumbers({
|
|
101
110
|
value: currentCpuPercent,
|
|
102
111
|
threshold: threshold,
|
|
@@ -106,10 +115,9 @@ export default class ServerMonitorCriteria {
|
|
|
106
115
|
if (input.criteriaFilter.checkOn === CheckOn.MemoryUsagePercent &&
|
|
107
116
|
!input.dataToProcess.onlyCheckRequestReceivedAt) {
|
|
108
117
|
threshold = CompareCriteria.convertToNumber(threshold);
|
|
109
|
-
const memoryPercent = overTimeValue
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
0;
|
|
118
|
+
const memoryPercent = (_e = overTimeValue) !== null && _e !== void 0 ? _e : (((_f = input.dataToProcess
|
|
119
|
+
.basicInfrastructureMetrics) === null || _f === void 0 ? void 0 : _f.memoryMetrics.percentUsed) ||
|
|
120
|
+
0);
|
|
113
121
|
return CompareCriteria.compareCriteriaNumbers({
|
|
114
122
|
value: memoryPercent,
|
|
115
123
|
threshold: threshold,
|
|
@@ -119,14 +127,20 @@ export default class ServerMonitorCriteria {
|
|
|
119
127
|
if (input.criteriaFilter.checkOn === CheckOn.DiskUsagePercent &&
|
|
120
128
|
!input.dataToProcess.onlyCheckRequestReceivedAt) {
|
|
121
129
|
threshold = CompareCriteria.convertToNumber(threshold);
|
|
122
|
-
const diskPath = ((
|
|
130
|
+
const diskPath = ((_g = input.criteriaFilter.serverMonitorOptions) === null || _g === void 0 ? void 0 : _g.diskPath) || "/";
|
|
123
131
|
const normalizedDiskPath = normalizeDiskPath(diskPath);
|
|
124
|
-
const diskMetric = (
|
|
132
|
+
const diskMetric = (_j = (_h = input.dataToProcess.basicInfrastructureMetrics) === null || _h === void 0 ? void 0 : _h.diskMetrics) === null || _j === void 0 ? void 0 : _j.find((item) => {
|
|
125
133
|
return normalizeDiskPath(item.diskPath) === normalizedDiskPath;
|
|
126
134
|
});
|
|
127
|
-
const diskUsagePercent = (
|
|
135
|
+
const diskUsagePercent = (_l = (_k = diskMetric === null || diskMetric === void 0 ? void 0 : diskMetric.percentUsed) !== null && _k !== void 0 ? _k : diskMetric === null || diskMetric === void 0 ? void 0 : diskMetric.percentFree) !== null && _l !== void 0 ? _l : 0;
|
|
136
|
+
/*
|
|
137
|
+
* Disk usage was the one server metric that computed its over-time
|
|
138
|
+
* window and then threw it away, comparing the reading from this check
|
|
139
|
+
* instead - so "evaluate over time" was a no-op here.
|
|
140
|
+
*/
|
|
141
|
+
const value = (_m = overTimeValue) !== null && _m !== void 0 ? _m : diskUsagePercent;
|
|
128
142
|
return CompareCriteria.compareCriteriaNumbers({
|
|
129
|
-
value:
|
|
143
|
+
value: value,
|
|
130
144
|
threshold: threshold,
|
|
131
145
|
criteriaFilter: input.criteriaFilter,
|
|
132
146
|
});
|
|
@@ -137,8 +151,8 @@ export default class ServerMonitorCriteria {
|
|
|
137
151
|
input.criteriaFilter.checkOn === CheckOn.LoadAverage5Min ||
|
|
138
152
|
input.criteriaFilter.checkOn === CheckOn.LoadAverage15Min)) {
|
|
139
153
|
threshold = CompareCriteria.convertToNumber(threshold);
|
|
140
|
-
const loadMetrics = (
|
|
141
|
-
.basicInfrastructureMetrics) === null ||
|
|
154
|
+
const loadMetrics = (_o = input.dataToProcess
|
|
155
|
+
.basicInfrastructureMetrics) === null || _o === void 0 ? void 0 : _o.loadMetrics;
|
|
142
156
|
let currentLoad = undefined;
|
|
143
157
|
if (input.criteriaFilter.checkOn === CheckOn.LoadAverage1Min) {
|
|
144
158
|
currentLoad = loadMetrics === null || loadMetrics === void 0 ? void 0 : loadMetrics.load1;
|
|
@@ -149,7 +163,7 @@ export default class ServerMonitorCriteria {
|
|
|
149
163
|
else if (input.criteriaFilter.checkOn === CheckOn.LoadAverage15Min) {
|
|
150
164
|
currentLoad = loadMetrics === null || loadMetrics === void 0 ? void 0 : loadMetrics.load15;
|
|
151
165
|
}
|
|
152
|
-
const value = overTimeValue
|
|
166
|
+
const value = (_p = overTimeValue) !== null && _p !== void 0 ? _p : (currentLoad || 0);
|
|
153
167
|
return CompareCriteria.compareCriteriaNumbers({
|
|
154
168
|
value: value,
|
|
155
169
|
threshold: threshold,
|
|
@@ -159,10 +173,9 @@ export default class ServerMonitorCriteria {
|
|
|
159
173
|
if (input.criteriaFilter.checkOn === CheckOn.SwapUsagePercent &&
|
|
160
174
|
!input.dataToProcess.onlyCheckRequestReceivedAt) {
|
|
161
175
|
threshold = CompareCriteria.convertToNumber(threshold);
|
|
162
|
-
const swapPercent = overTimeValue
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
0;
|
|
176
|
+
const swapPercent = (_q = overTimeValue) !== null && _q !== void 0 ? _q : (((_s = (_r = input.dataToProcess
|
|
177
|
+
.basicInfrastructureMetrics) === null || _r === void 0 ? void 0 : _r.memoryMetrics) === null || _s === void 0 ? void 0 : _s.swapPercentUsed) ||
|
|
178
|
+
0);
|
|
166
179
|
return CompareCriteria.compareCriteriaNumbers({
|
|
167
180
|
value: swapPercent,
|
|
168
181
|
threshold: threshold,
|
|
@@ -172,10 +185,9 @@ export default class ServerMonitorCriteria {
|
|
|
172
185
|
if (input.criteriaFilter.checkOn === CheckOn.CPUIoWaitPercent &&
|
|
173
186
|
!input.dataToProcess.onlyCheckRequestReceivedAt) {
|
|
174
187
|
threshold = CompareCriteria.convertToNumber(threshold);
|
|
175
|
-
const ioWaitPercent = overTimeValue
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
0;
|
|
188
|
+
const ioWaitPercent = (_t = overTimeValue) !== null && _t !== void 0 ? _t : (((_v = (_u = input.dataToProcess
|
|
189
|
+
.basicInfrastructureMetrics) === null || _u === void 0 ? void 0 : _u.cpuMetrics) === null || _v === void 0 ? void 0 : _v.timeIoWaitPercent) ||
|
|
190
|
+
0);
|
|
179
191
|
return CompareCriteria.compareCriteriaNumbers({
|
|
180
192
|
value: ioWaitPercent,
|
|
181
193
|
threshold: threshold,
|
|
@@ -190,7 +202,7 @@ export default class ServerMonitorCriteria {
|
|
|
190
202
|
.trim()
|
|
191
203
|
.toLowerCase();
|
|
192
204
|
if (input.criteriaFilter.filterType === FilterType.IsExecuting) {
|
|
193
|
-
const processNames = ((
|
|
205
|
+
const processNames = ((_x = (_w = input.dataToProcess) === null || _w === void 0 ? void 0 : _w.processes) === null || _x === void 0 ? void 0 : _x.map((item) => {
|
|
194
206
|
return item.name.trim().toLowerCase();
|
|
195
207
|
})) || [];
|
|
196
208
|
if (processNames.includes(thresholdProcessName)) {
|
|
@@ -199,7 +211,7 @@ export default class ServerMonitorCriteria {
|
|
|
199
211
|
return null;
|
|
200
212
|
}
|
|
201
213
|
if (input.criteriaFilter.filterType === FilterType.IsNotExecuting) {
|
|
202
|
-
const processNames = ((
|
|
214
|
+
const processNames = ((_z = (_y = input.dataToProcess) === null || _y === void 0 ? void 0 : _y.processes) === null || _z === void 0 ? void 0 : _z.map((item) => {
|
|
203
215
|
return item.name.trim().toLowerCase();
|
|
204
216
|
})) || [];
|
|
205
217
|
if (!processNames.includes(thresholdProcessName)) {
|
|
@@ -216,7 +228,7 @@ export default class ServerMonitorCriteria {
|
|
|
216
228
|
.trim()
|
|
217
229
|
.toLowerCase();
|
|
218
230
|
if (input.criteriaFilter.filterType === FilterType.IsExecuting) {
|
|
219
|
-
const processPIDs = ((
|
|
231
|
+
const processPIDs = ((_1 = (_0 = input.dataToProcess) === null || _0 === void 0 ? void 0 : _0.processes) === null || _1 === void 0 ? void 0 : _1.map((item) => {
|
|
220
232
|
return item.pid.toString().trim().toLowerCase();
|
|
221
233
|
})) || [];
|
|
222
234
|
if (processPIDs.includes(thresholdProcessPID)) {
|
|
@@ -225,7 +237,7 @@ export default class ServerMonitorCriteria {
|
|
|
225
237
|
return null;
|
|
226
238
|
}
|
|
227
239
|
if (input.criteriaFilter.filterType === FilterType.IsNotExecuting) {
|
|
228
|
-
const processPIDs = ((
|
|
240
|
+
const processPIDs = ((_3 = (_2 = input.dataToProcess) === null || _2 === void 0 ? void 0 : _2.processes) === null || _3 === void 0 ? void 0 : _3.map((item) => {
|
|
229
241
|
return item.pid.toString().trim().toLowerCase();
|
|
230
242
|
})) || [];
|
|
231
243
|
if (!processPIDs.includes(thresholdProcessPID)) {
|
|
@@ -243,7 +255,7 @@ export default class ServerMonitorCriteria {
|
|
|
243
255
|
.trim()
|
|
244
256
|
.toLowerCase();
|
|
245
257
|
if (input.criteriaFilter.filterType === FilterType.IsExecuting) {
|
|
246
|
-
const processCommands = ((
|
|
258
|
+
const processCommands = ((_5 = (_4 = input.dataToProcess) === null || _4 === void 0 ? void 0 : _4.processes) === null || _5 === void 0 ? void 0 : _5.map((item) => {
|
|
247
259
|
return item.command.trim().toLowerCase();
|
|
248
260
|
})) || [];
|
|
249
261
|
if (processCommands.includes(thresholdProcessCommand)) {
|
|
@@ -252,7 +264,7 @@ export default class ServerMonitorCriteria {
|
|
|
252
264
|
return null;
|
|
253
265
|
}
|
|
254
266
|
if (input.criteriaFilter.filterType === FilterType.IsNotExecuting) {
|
|
255
|
-
const processCommands = ((
|
|
267
|
+
const processCommands = ((_7 = (_6 = input.dataToProcess) === null || _6 === void 0 ? void 0 : _6.processes) === null || _7 === void 0 ? void 0 : _7.map((item) => {
|
|
256
268
|
return item.command.trim().toLowerCase();
|
|
257
269
|
})) || [];
|
|
258
270
|
if (!processCommands.includes(thresholdProcessCommand)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServerMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,eAAe,MAAM,mBAAmB,CAAC;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"ServerMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/ServerMonitorCriteria.ts"],"names":[],"mappings":"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"}
|