Skip to content

Commit 109a287

Browse files
author
SDKAuto
committed
CodeGen from PR 15084 in Azure/azure-rest-api-specs
Merge 0b338bc590ac6e6cc1549cfbb7ff8978bd53eec8 into 0ea99445abcb5b6b77133272069a7dbd4db0d568
1 parent 9a47f3d commit 109a287

File tree

68 files changed

+10003
-2028
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+10003
-2028
lines changed

sdk/monitor/arm-monitor/LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2019 Microsoft
3+
Copyright (c) 2021 Microsoft
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

sdk/monitor/arm-monitor/README.md

Lines changed: 57 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,99 @@
11
## Azure MonitorManagementClient SDK for JavaScript
22

3-
This package contains an isomorphic SDK for MonitorManagementClient.
3+
This package contains an isomorphic SDK (runs both in node.js and in browsers) for MonitorManagementClient.
44

55
### Currently supported environments
66

7-
- Node.js version 6.x.x or higher
8-
- Browser JavaScript
7+
- [LTS versions of Node.js](https://nodejs.org/about/releases/)
8+
- Latest versions of Safari, Chrome, Edge and Firefox.
99

10-
### How to Install
10+
### Prerequisites
1111

12+
You must have an [Azure subscription](https://azure.microsoft.com/free/).
13+
14+
### How to install
15+
16+
To use this SDK in your project, you will need to install two packages.
17+
- `@azure/arm-monitor` that contains the client.
18+
- `@azure/identity` that provides different mechanisms for the client to authenticate your requests using Azure Active Directory.
19+
20+
Install both packages using the below command:
1221
```bash
13-
npm install @azure/arm-monitor
22+
npm install --save @azure/arm-monitor @azure/identity
1423
```
24+
> **Note**: You may have used either `@azure/ms-rest-nodeauth` or `@azure/ms-rest-browserauth` in the past. These packages are in maintenance mode receiving critical bug fixes, but no new features.
25+
If you are on a [Node.js that has LTS status](https://nodejs.org/about/releases/), or are writing a client side browser application, we strongly encourage you to upgrade to `@azure/identity` which uses the latest versions of Azure Active Directory and MSAL APIs and provides more authentication options.
1526

1627
### How to use
1728

18-
#### nodejs - Authentication, client creation and listByResourceGroup autoscaleSettings as an example written in TypeScript.
29+
- If you are writing a client side browser application,
30+
- Follow the instructions in the section on Authenticating client side browser applications in [Azure Identity examples](https://aka.ms/azsdk/js/identity/examples) to register your application in the Microsoft identity platform and set the right permissions.
31+
- Copy the client ID and tenant ID from the Overview section of your app registration in Azure portal and use it in the browser sample below.
32+
- If you are writing a server side application,
33+
- [Select a credential from `@azure/identity` based on the authentication method of your choice](https://aka.ms/azsdk/js/identity/examples)
34+
- Complete the set up steps required by the credential if any.
35+
- Use the credential you picked in the place of `DefaultAzureCredential` in the Node.js sample below.
1936

20-
##### Install @azure/ms-rest-nodeauth
21-
22-
- Please install minimum version of `"@azure/ms-rest-nodeauth": "^3.0.0"`.
23-
```bash
24-
npm install @azure/ms-rest-nodeauth@"^3.0.0"
25-
```
37+
In the below samples, we pass the credential and the Azure subscription id to instantiate the client.
38+
Once the client is created, explore the operations on it either in your favorite editor or in our [API reference documentation](https://docs.microsoft.com/javascript/api) to get started.
39+
#### nodejs - Authentication, client creation, and listByResourceGroup autoscaleSettings as an example written in JavaScript.
2640

2741
##### Sample code
2842

29-
```typescript
30-
import * as msRest from "@azure/ms-rest-js";
31-
import * as msRestAzure from "@azure/ms-rest-azure-js";
32-
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
33-
import { MonitorManagementClient, MonitorManagementModels, MonitorManagementMappers } from "@azure/arm-monitor";
43+
```javascript
44+
const { DefaultAzureCredential } = require("@azure/identity");
45+
const { MonitorManagementClient } = require("@azure/arm-monitor");
3446
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
3547

36-
msRestNodeAuth.interactiveLogin().then((creds) => {
37-
const client = new MonitorManagementClient(creds, subscriptionId);
38-
const resourceGroupName = "testresourceGroupName";
39-
client.autoscaleSettings.listByResourceGroup(resourceGroupName).then((result) => {
40-
console.log("The result is:");
41-
console.log(result);
42-
});
48+
// Use `DefaultAzureCredential` or any other credential of your choice based on https://aka.ms/azsdk/js/identity/examples
49+
// Please note that you can also use credentials from the `@azure/ms-rest-nodeauth` package instead.
50+
const creds = new DefaultAzureCredential();
51+
const client = new MonitorManagementClient(creds, subscriptionId);
52+
const resourceGroupName = "testresourceGroupName";
53+
client.autoscaleSettings.listByResourceGroup(resourceGroupName).then((result) => {
54+
console.log("The result is:");
55+
console.log(result);
4356
}).catch((err) => {
57+
console.log("An error occurred:");
4458
console.error(err);
4559
});
4660
```
4761

48-
#### browser - Authentication, client creation and listByResourceGroup autoscaleSettings as an example written in JavaScript.
62+
#### browser - Authentication, client creation, and listByResourceGroup autoscaleSettings as an example written in JavaScript.
4963

50-
##### Install @azure/ms-rest-browserauth
51-
52-
```bash
53-
npm install @azure/ms-rest-browserauth
54-
```
64+
In browser applications, we recommend using the `InteractiveBrowserCredential` that interactively authenticates using the default system browser.
65+
- See [Single-page application: App registration guide](https://docs.microsoft.com/azure/active-directory/develop/scenario-spa-app-registration) to configure your app registration for the browser.
66+
- Note down the client Id from the previous step and use it in the browser sample below.
5567

5668
##### Sample code
5769

58-
See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.
59-
6070
- index.html
71+
6172
```html
6273
<!DOCTYPE html>
6374
<html lang="en">
6475
<head>
6576
<title>@azure/arm-monitor sample</title>
66-
<script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
6777
<script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
68-
<script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
78+
<script src="node_modules/@azure/identity/dist/index.js"></script>
6979
<script src="node_modules/@azure/arm-monitor/dist/arm-monitor.js"></script>
7080
<script type="text/javascript">
7181
const subscriptionId = "<Subscription_Id>";
72-
const authManager = new msAuth.AuthManager({
82+
// Create credentials using the `@azure/identity` package.
83+
// Please note that you can also use credentials from the `@azure/ms-rest-browserauth` package instead.
84+
const credential = new InteractiveBrowserCredential(
85+
{
7386
clientId: "<client id for your Azure AD app>",
7487
tenant: "<optional tenant for your organization>"
7588
});
76-
authManager.finalizeLogin().then((res) => {
77-
if (!res.isLoggedIn) {
78-
// may cause redirects
79-
authManager.login();
80-
}
81-
const client = new Azure.ArmMonitor.MonitorManagementClient(res.creds, subscriptionId);
82-
const resourceGroupName = "testresourceGroupName";
83-
client.autoscaleSettings.listByResourceGroup(resourceGroupName).then((result) => {
84-
console.log("The result is:");
85-
console.log(result);
86-
}).catch((err) => {
87-
console.log("An error occurred:");
88-
console.error(err);
89-
});
89+
const client = new Azure.ArmMonitor.MonitorManagementClient(creds, subscriptionId);
90+
const resourceGroupName = "testresourceGroupName";
91+
client.autoscaleSettings.listByResourceGroup(resourceGroupName).then((result) => {
92+
console.log("The result is:");
93+
console.log(result);
94+
}).catch((err) => {
95+
console.log("An error occurred:");
96+
console.error(err);
9097
});
9198
</script>
9299
</head>
@@ -98,4 +105,4 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
98105

99106
- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
100107

101-
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2Fmonitor%2Farm-monitor%2FREADME.png)
108+
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/monitor/arm-monitor/README.png)

sdk/monitor/arm-monitor/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
"description": "MonitorManagementClient Library with typescript type definitions for node.js and browser.",
55
"version": "6.0.0",
66
"dependencies": {
7-
"@azure/ms-rest-azure-js": "^2.0.1",
8-
"@azure/ms-rest-js": "^2.0.4",
7+
"@azure/ms-rest-azure-js": "^2.1.0",
8+
"@azure/ms-rest-js": "^2.2.0",
9+
"@azure/core-auth": "^1.1.4",
910
"tslib": "^1.10.0"
1011
},
1112
"keywords": [
@@ -20,13 +21,13 @@
2021
"module": "./esm/monitorManagementClient.js",
2122
"types": "./esm/monitorManagementClient.d.ts",
2223
"devDependencies": {
23-
"typescript": "^3.5.3",
24+
"typescript": "^3.6.0",
2425
"rollup": "^1.18.0",
2526
"rollup-plugin-node-resolve": "^5.2.0",
2627
"rollup-plugin-sourcemaps": "^0.4.2",
2728
"uglify-js": "^3.6.0"
2829
},
29-
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/monitor/arm-monitor",
30+
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/monitor/arm-monitor",
3031
"repository": {
3132
"type": "git",
3233
"url": "https://github.com/Azure/azure-sdk-for-js.git"

sdk/monitor/arm-monitor/rollup.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ const config = {
2121
"@azure/ms-rest-azure-js": "msRestAzure"
2222
},
2323
banner: `/*
24-
* Copyright (c) Microsoft Corporation. All rights reserved.
25-
* Licensed under the MIT License. See License.txt in the project root for license information.
24+
* Copyright (c) Microsoft Corporation.
25+
* Licensed under the MIT License.
2626
*
2727
* Code generated by Microsoft (R) AutoRest Code Generator.
2828
* Changes may cause incorrect behavior and will be lost if the code is regenerated.

sdk/monitor/arm-monitor/src/models/actionGroupsMappers.ts

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (c) Microsoft Corporation. All rights reserved.
3-
* Licensed under the MIT License. See License.txt in the project root for license information.
2+
* Copyright (c) Microsoft Corporation.
3+
* Licensed under the MIT License.
44
*
55
* Code generated by Microsoft (R) AutoRest Code Generator.
66
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
@@ -27,9 +27,28 @@ export {
2727
AzNsActionGroup,
2828
AzureAppPushReceiver,
2929
AzureFunctionReceiver,
30+
AzureMonitorMetricsDestination,
31+
AzureMonitorPrivateLinkScope,
32+
AzureResource,
3033
BaseResource,
34+
ConfigurationAccessEndpointSpec,
3135
Criteria,
36+
DataCollectionEndpointConfigurationAccess,
37+
DataCollectionEndpointLogsIngestion,
38+
DataCollectionEndpointNetworkAcls,
39+
DataCollectionEndpointResource,
40+
DataCollectionEndpointResourceSystemData,
41+
DataCollectionRuleAssociationProxyOnlyResource,
42+
DataCollectionRuleAssociationProxyOnlyResourceSystemData,
43+
DataCollectionRuleDataSources,
44+
DataCollectionRuleDestinations,
45+
DataCollectionRuleResource,
46+
DataCollectionRuleResourceSystemData,
3247
DataContainer,
48+
DataFlow,
49+
DataSourcesSpec,
50+
DestinationsSpec,
51+
DestinationsSpecAzureMonitorMetrics,
3352
DiagnosticSettingsCategoryResource,
3453
DiagnosticSettingsResource,
3554
Dimension,
@@ -38,14 +57,19 @@ export {
3857
EmailNotification,
3958
EmailReceiver,
4059
EnableRequest,
60+
ErrorAdditionalInfo,
4161
ErrorResponse,
62+
ErrorResponseCommon,
63+
ExtensionDataSource,
4264
ItsmReceiver,
4365
LocationThresholdRuleCondition,
66+
LogAnalyticsDestination,
4467
LogicAppReceiver,
4568
LogMetricTrigger,
4669
LogProfileResource,
4770
LogSearchRuleResource,
4871
LogSettings,
72+
LogsIngestionEndpointSpec,
4973
LogToMetricAction,
5074
ManagementEventAggregationCondition,
5175
ManagementEventRuleCondition,
@@ -59,6 +83,13 @@ export {
5983
MetricSettings,
6084
MetricTrigger,
6185
MultiMetricCriteria,
86+
NetworkRuleSet,
87+
PerfCounterDataSource,
88+
PrivateEndpointConnection,
89+
PrivateEndpointProperty,
90+
PrivateLinkResource,
91+
PrivateLinkScopesResource,
92+
PrivateLinkServiceConnectionStateProperty,
6293
ProxyOnlyResource,
6394
ProxyResource,
6495
Recurrence,
@@ -76,15 +107,21 @@ export {
76107
ScaleAction,
77108
ScaleCapacity,
78109
ScaleRule,
110+
ScaleRuleMetricDimension,
79111
Schedule,
112+
ScopedResource,
80113
SmsReceiver,
81114
Source,
115+
SyslogDataSource,
116+
SystemData,
82117
ThresholdRuleCondition,
83118
TimeWindow,
84119
TriggerCondition,
85120
VMInsightsOnboardingStatus,
86121
VoiceReceiver,
87122
WebhookNotification,
88123
WebhookReceiver,
124+
WebtestLocationAvailabilityCriteria,
125+
WindowsEventLogDataSource,
89126
WorkspaceInfo
90127
} from "../models/mappers";

sdk/monitor/arm-monitor/src/models/activityLogAlertsMappers.ts

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
* Copyright (c) Microsoft Corporation. All rights reserved.
3-
* Licensed under the MIT License. See License.txt in the project root for license information.
2+
* Copyright (c) Microsoft Corporation.
3+
* Licensed under the MIT License.
44
*
55
* Code generated by Microsoft (R) AutoRest Code Generator.
66
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
@@ -27,24 +27,48 @@ export {
2727
AzNsActionGroup,
2828
AzureAppPushReceiver,
2929
AzureFunctionReceiver,
30+
AzureMonitorMetricsDestination,
31+
AzureMonitorPrivateLinkScope,
32+
AzureResource,
3033
BaseResource,
34+
ConfigurationAccessEndpointSpec,
3135
Criteria,
36+
DataCollectionEndpointConfigurationAccess,
37+
DataCollectionEndpointLogsIngestion,
38+
DataCollectionEndpointNetworkAcls,
39+
DataCollectionEndpointResource,
40+
DataCollectionEndpointResourceSystemData,
41+
DataCollectionRuleAssociationProxyOnlyResource,
42+
DataCollectionRuleAssociationProxyOnlyResourceSystemData,
43+
DataCollectionRuleDataSources,
44+
DataCollectionRuleDestinations,
45+
DataCollectionRuleResource,
46+
DataCollectionRuleResourceSystemData,
3247
DataContainer,
48+
DataFlow,
49+
DataSourcesSpec,
50+
DestinationsSpec,
51+
DestinationsSpecAzureMonitorMetrics,
3352
DiagnosticSettingsCategoryResource,
3453
DiagnosticSettingsResource,
3554
Dimension,
3655
DynamicMetricCriteria,
3756
DynamicThresholdFailingPeriods,
3857
EmailNotification,
3958
EmailReceiver,
59+
ErrorAdditionalInfo,
4060
ErrorResponse,
61+
ErrorResponseCommon,
62+
ExtensionDataSource,
4163
ItsmReceiver,
4264
LocationThresholdRuleCondition,
65+
LogAnalyticsDestination,
4366
LogicAppReceiver,
4467
LogMetricTrigger,
4568
LogProfileResource,
4669
LogSearchRuleResource,
4770
LogSettings,
71+
LogsIngestionEndpointSpec,
4872
LogToMetricAction,
4973
ManagementEventAggregationCondition,
5074
ManagementEventRuleCondition,
@@ -58,6 +82,13 @@ export {
5882
MetricSettings,
5983
MetricTrigger,
6084
MultiMetricCriteria,
85+
NetworkRuleSet,
86+
PerfCounterDataSource,
87+
PrivateEndpointConnection,
88+
PrivateEndpointProperty,
89+
PrivateLinkResource,
90+
PrivateLinkScopesResource,
91+
PrivateLinkServiceConnectionStateProperty,
6192
ProxyOnlyResource,
6293
ProxyResource,
6394
Recurrence,
@@ -75,15 +106,21 @@ export {
75106
ScaleAction,
76107
ScaleCapacity,
77108
ScaleRule,
109+
ScaleRuleMetricDimension,
78110
Schedule,
111+
ScopedResource,
79112
SmsReceiver,
80113
Source,
114+
SyslogDataSource,
115+
SystemData,
81116
ThresholdRuleCondition,
82117
TimeWindow,
83118
TriggerCondition,
84119
VMInsightsOnboardingStatus,
85120
VoiceReceiver,
86121
WebhookNotification,
87122
WebhookReceiver,
123+
WebtestLocationAvailabilityCriteria,
124+
WindowsEventLogDataSource,
88125
WorkspaceInfo
89126
} from "../models/mappers";

0 commit comments

Comments
 (0)