diff --git a/package-lock.json b/package-lock.json index 5e61506ac3..6d53eab3e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,8 +15,8 @@ "@aws-sdk/credential-providers": "3.893.0", "@aws-sdk/lib-storage": "3.893.0", "@aws-sdk/s3-request-presigner": "3.893.0", - "@azure/identity": "4.12.0", - "@azure/monitor-query": "1.3.3", + "@azure/identity": "4.13.0", + "@azure/monitor-query-logs": "1.0.0", "@azure/storage-blob": "12.29.0", "@google-cloud/storage": "7.17.1", "@smithy/node-http-handler": "4.2.1", @@ -1208,6 +1208,23 @@ "node": ">=18.0.0" } }, + "node_modules/@azure-rest/core-client": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@azure-rest/core-client/-/core-client-2.5.1.tgz", + "integrity": "sha512-EHaOXW0RYDKS5CFffnixdyRPak5ytiCtU7uXDcP/uiY+A6jFRwNGzzJBiznkCzvi5EYpY+YWinieqHb0oY916A==", + "license": "MIT", + "dependencies": { + "@azure/abort-controller": "^2.1.2", + "@azure/core-auth": "^1.10.0", + "@azure/core-rest-pipeline": "^1.22.0", + "@azure/core-tracing": "^1.3.0", + "@typespec/ts-http-runtime": "^0.3.0", + "tslib": "^2.6.2" + }, + "engines": { + "node": ">=20.0.0" + } + }, "node_modules/@azure/abort-controller": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz", @@ -1351,9 +1368,9 @@ } }, "node_modules/@azure/identity": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.12.0.tgz", - "integrity": "sha512-6vuh2R3Cte6SD6azNalLCjIDoryGdcvDVEV7IDRPtm5lHX5ffkDlIalaoOp5YJU08e4ipjJENel20kSMDLAcug==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-4.13.0.tgz", + "integrity": "sha512-uWC0fssc+hs1TGGVkkghiaFkkS7NkTxfnCH+Hdg+yTehTpMcehpok4PgUKKdyCH+9ldu6FhiHRv84Ntqj1vVcw==", "license": "MIT", "dependencies": { "@azure/abort-controller": "^2.0.0", @@ -1385,13 +1402,13 @@ "node": ">=20.0.0" } }, - "node_modules/@azure/monitor-query": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@azure/monitor-query/-/monitor-query-1.3.3.tgz", - "integrity": "sha512-wm91Wengw8SGmPbuPrB+Q+ydK7m9yyytoj03Z9/LZT3wQpAm1RizSFonjP7eyL4g4Xwhkp92okylIrmh2lD99A==", - "deprecated": "Deprecated ⚠️: use @azure/monitor-query-logs, @azure/monitor-query-metrics and @azure/arm-monitor.", + "node_modules/@azure/monitor-query-logs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@azure/monitor-query-logs/-/monitor-query-logs-1.0.0.tgz", + "integrity": "sha512-5mZzLGZKAZ1vrVm0le2Jh+5VXu/4U+1tSpmgssdMyYzT+VA9J1EstXpni6q/unsTtkJAdo4jsVpigfr95Sl7hg==", "license": "MIT", "dependencies": { + "@azure-rest/core-client": "^2.5.0", "@azure/core-auth": "^1.9.0", "@azure/core-client": "^1.9.2", "@azure/core-paging": "^1.6.2", diff --git a/package.json b/package.json index 9235940061..44aeec17e1 100644 --- a/package.json +++ b/package.json @@ -77,8 +77,8 @@ "@aws-sdk/credential-providers": "3.893.0", "@aws-sdk/lib-storage": "3.893.0", "@aws-sdk/s3-request-presigner": "3.893.0", - "@azure/identity": "4.12.0", - "@azure/monitor-query": "1.3.3", + "@azure/identity": "4.13.0", + "@azure/monitor-query-logs": "1.0.0", "@azure/storage-blob": "12.29.0", "@google-cloud/storage": "7.17.1", "@smithy/node-http-handler": "4.2.1", diff --git a/src/server/bg_services/replication_log_parser.js b/src/server/bg_services/replication_log_parser.js index 244cb11a4e..08263eb44a 100644 --- a/src/server/bg_services/replication_log_parser.js +++ b/src/server/bg_services/replication_log_parser.js @@ -8,7 +8,7 @@ const pool_server = require('../system_services/pool_server'); const dbg = require('../../util/debug_module')(__filename); const config = require('../../../config'); const moment = require('moment'); -const { LogsQueryClient, LogsQueryResultStatus } = require("@azure/monitor-query"); +const { LogsQueryClient, LogsQueryResultStatus } = require("@azure/monitor-query-logs"); const { ClientSecretCredential } = require("@azure/identity"); const noobaa_s3_client = require('../../sdk/noobaa_s3_client/noobaa_s3_client'); diff --git a/src/server/system_services/account_server.js b/src/server/system_services/account_server.js index 70897fc11b..3750ec576c 100644 --- a/src/server/system_services/account_server.js +++ b/src/server/system_services/account_server.js @@ -19,7 +19,7 @@ const azure_storage = require('../../util/azure_storage_wrap'); const NetStorage = require('../../util/NetStorageKit-Node-master/lib/netstorage'); const usage_aggregator = require('../bg_services/usage_aggregator'); const { OP_NAME_TO_ACTION } = require('../../endpoint/sts/sts_rest'); -const { Durations, LogsQueryClient } = require('@azure/monitor-query'); +const { Durations, LogsQueryClient } = require('@azure/monitor-query-logs'); const { ClientSecretCredential } = require("@azure/identity"); const noobaa_s3_client = require('../../sdk/noobaa_s3_client/noobaa_s3_client'); const account_util = require('./../../util/account_util');