Skip to content
Merged
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
57 changes: 32 additions & 25 deletions packages/@azure/arm-monitor/README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
# Microsoft Azure SDK for isomorphic javascript - MonitorManagementClient
This project provides an isomorphic javascript package for accessing Azure. Right now it supports:
- node.js version 6.x.x or higher
- browser javascript
# Azure MonitorManagementClient SDK for JavaScript
This package contains an isomorphic SDK for MonitorManagementClient.

## How to Install
## Currently supported environments
- Node.js version 6.x.x or higher
- Browser JavaScript

- nodejs
## How to Install
```
npm install @azure/arm-monitor
```
- browser
```html
<script type="text/javascript" src="https://raw.githubusercontent.com/Azure/azure-sdk-for-js/master/lib/services/@azure/arm-monitor/monitorManagementClientBundle.js"></script>
```


## How to use

Expand All @@ -37,29 +34,39 @@ msRestNodeAuth.interactiveLogin().then((creds) => {
});
```

### browser - Authentication, client creation and listByResourceGroup autoscaleSettings as an example written in javascript.
### browser - Authentication, client creation and listByResourceGroup autoscaleSettings as an example written in JavaScript.
See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.

- index.html
```html
<!DOCTYPE html>
<html lang="en">
<head>
<title>@azure/arm-monitor sample</title>
<script type="text/javascript" src="https://raw.githubusercontent.com/Azure/ms-rest-js/master/msRestBundle.js"></script>
<script type="text/javascript" src="https://raw.githubusercontent.com/Azure/ms-rest-js/master/msRestAzureBundle.js"></script>
<script type="text/javascript" src="https://raw.githubusercontent.com/Azure/azure-sdk-for-js/master/lib/services/@azure/arm-monitor/monitorManagementClientBundle.js"></script>
<script type="text/javascript">
<script src="node_modules/ms-rest-js/dist/msRest.browser.js"></script>
<script src="node_modules/ms-rest-azure-js/dist/msRestAzure.js"></script>
<script src="node_modules/ms-rest-browserauth/dist/msAuth.js"></script>
<script src="node_modules/@azure/arm-monitor/dist/arm-monitor.js"></script>
<script>
const subscriptionId = "<Subscription_Id>";
const token = "<access_token>";
const creds = new msRest.TokenCredentials(token);
const client = new MonitorManagementClient(creds, undefined, subscriptionId);
const resourceGroupName = "testresourceGroupName";
client.autoscaleSettings.listByResourceGroup(resourceGroupName).then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
console.log('An error ocurred:');
console.error(err);
const authManager = new msAuth.AuthManager({
clientId: "<client id for your Azure AD app>",
tenant: "<optional tenant for your organization>"
});
authManager.finalizeLogin().then((res) => {
if (!res.isLoggedIn) {
// may cause redirects
authManager.login();
}
const client = new Azure.ArmMonitor.MonitorManagementClient(res.creds, subscriptionId);
const resourceGroupName = "testresourceGroupName";
client.autoscaleSettings.listByResourceGroup(resourceGroupName).then((result) => {
console.log("The result is:");
console.log(result);
}).catch((err) => {
console.log('An error occurred:');
console.error(err);
});
});
</script>
</head>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export {
VoiceReceiver,
LogicAppReceiver,
AzureFunctionReceiver,
ArmRoleReceiver,
ErrorResponse,
ActionGroupPatchBody,
ActionGroupList,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export {
VoiceReceiver,
LogicAppReceiver,
AzureFunctionReceiver,
ArmRoleReceiver,
MetricAlertResource,
MetricAlertCriteria,
MetricAlertAction,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export {
VoiceReceiver,
LogicAppReceiver,
AzureFunctionReceiver,
ArmRoleReceiver,
ActivityLogAlertResource,
ActivityLogAlertAllOfCondition,
ActivityLogAlertLeafCondition,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export {
VoiceReceiver,
LogicAppReceiver,
AzureFunctionReceiver,
ArmRoleReceiver,
ActivityLogAlertResource,
ActivityLogAlertAllOfCondition,
ActivityLogAlertLeafCondition,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export {
VoiceReceiver,
LogicAppReceiver,
AzureFunctionReceiver,
ArmRoleReceiver,
ActivityLogAlertResource,
ActivityLogAlertAllOfCondition,
ActivityLogAlertLeafCondition,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export {
VoiceReceiver,
LogicAppReceiver,
AzureFunctionReceiver,
ArmRoleReceiver,
ActivityLogAlertResource,
ActivityLogAlertAllOfCondition,
ActivityLogAlertLeafCondition,
Expand Down
24 changes: 24 additions & 0 deletions packages/@azure/arm-monitor/lib/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1555,6 +1555,24 @@ export interface AzureFunctionReceiver {
httpTriggerUrl: string;
}

/**
* @interface
* An interface representing ArmRoleReceiver.
* An arm role receiver.
*
*/
export interface ArmRoleReceiver {
/**
* @member {string} name The name of the arm role receiver. Names must be
* unique across all receivers within an action group.
*/
name: string;
/**
* @member {string} roleId The arm role id.
*/
roleId: string;
}

/**
* @interface
* An interface representing ActionGroupResource.
Expand Down Expand Up @@ -1619,6 +1637,12 @@ export interface ActionGroupResource extends Resource {
* azure function receivers that are part of this action group.
*/
azureFunctionReceivers?: AzureFunctionReceiver[];
/**
* @member {ArmRoleReceiver[]} [armRoleReceivers] The list of ARM role
* receivers that are part of this action group. Roles are Azure RBAC roles
* and only built-in roles are supported.
*/
armRoleReceivers?: ArmRoleReceiver[];
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export {
VoiceReceiver,
LogicAppReceiver,
AzureFunctionReceiver,
ArmRoleReceiver,
ActivityLogAlertResource,
ActivityLogAlertAllOfCondition,
ActivityLogAlertLeafCondition,
Expand Down
36 changes: 36 additions & 0 deletions packages/@azure/arm-monitor/lib/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2021,6 +2021,30 @@ export const AzureFunctionReceiver: msRest.CompositeMapper = {
}
};

export const ArmRoleReceiver: msRest.CompositeMapper = {
serializedName: "ArmRoleReceiver",
type: {
name: "Composite",
className: "ArmRoleReceiver",
modelProperties: {
name: {
required: true,
serializedName: "name",
type: {
name: "String"
}
},
roleId: {
required: true,
serializedName: "roleId",
type: {
name: "String"
}
}
}
}
};

export const ActionGroupResource: msRest.CompositeMapper = {
serializedName: "ActionGroupResource",
type: {
Expand Down Expand Up @@ -2153,6 +2177,18 @@ export const ActionGroupResource: msRest.CompositeMapper = {
}
}
}
},
armRoleReceivers: {
serializedName: "properties.armRoleReceivers",
type: {
name: "Sequence",
element: {
type: {
name: "Composite",
className: "ArmRoleReceiver"
}
}
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export {
VoiceReceiver,
LogicAppReceiver,
AzureFunctionReceiver,
ArmRoleReceiver,
ActivityLogAlertResource,
ActivityLogAlertAllOfCondition,
ActivityLogAlertLeafCondition,
Expand Down
16 changes: 14 additions & 2 deletions packages/@azure/arm-monitor/lib/models/parameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export const apiVersion3: msRest.OperationQueryParameter = {
required: true,
isConstant: true,
serializedName: "api-version",
defaultValue: '2018-03-01',
defaultValue: '2018-09-01',
type: {
name: "String"
}
Expand Down Expand Up @@ -142,13 +142,25 @@ export const apiVersion7: msRest.OperationQueryParameter = {
required: true,
isConstant: true,
serializedName: "api-version",
defaultValue: '2018-04-16',
defaultValue: '2018-03-01',
type: {
name: "String"
}
}
};
export const apiVersion8: msRest.OperationQueryParameter = {
parameterPath: "apiVersion",
mapper: {
required: true,
isConstant: true,
serializedName: "api-version",
defaultValue: '2018-04-16',
type: {
name: "String"
}
}
};
export const apiVersion9: msRest.OperationQueryParameter = {
parameterPath: "apiVersion",
mapper: {
required: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export {
VoiceReceiver,
LogicAppReceiver,
AzureFunctionReceiver,
ArmRoleReceiver,
ActivityLogAlertResource,
ActivityLogAlertAllOfCondition,
ActivityLogAlertLeafCondition,
Expand Down
12 changes: 6 additions & 6 deletions packages/@azure/arm-monitor/lib/operations/metricAlerts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ const listBySubscriptionOperationSpec: msRest.OperationSpec = {
Parameters.subscriptionId
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion7
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -248,7 +248,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = {
Parameters.resourceGroupName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion7
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -273,7 +273,7 @@ const getOperationSpec: msRest.OperationSpec = {
Parameters.ruleName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion7
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -298,7 +298,7 @@ const createOrUpdateOperationSpec: msRest.OperationSpec = {
Parameters.ruleName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion7
],
headerParameters: [
Parameters.acceptLanguage
Expand Down Expand Up @@ -330,7 +330,7 @@ const updateOperationSpec: msRest.OperationSpec = {
Parameters.ruleName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion7
],
headerParameters: [
Parameters.acceptLanguage
Expand Down Expand Up @@ -362,7 +362,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = {
Parameters.ruleName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion7
],
headerParameters: [
Parameters.acceptLanguage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const listOperationSpec: msRest.OperationSpec = {
Parameters.ruleName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion7
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -132,7 +132,7 @@ const listByNameOperationSpec: msRest.OperationSpec = {
Parameters.statusName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion7
],
headerParameters: [
Parameters.acceptLanguage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const listOperationSpec: msRest.OperationSpec = {
Parameters.resourceUri
],
queryParameters: [
Parameters.apiVersion8,
Parameters.apiVersion9,
Parameters.startTime
],
headerParameters: [
Expand Down
Loading