Skip to content
This repository was archived by the owner on May 5, 2023. It is now read-only.

[AutoPR] monitor/resource-manager #3640

Merged
4 commits merged into from
Sep 19, 2018
Merged

[AutoPR] monitor/resource-manager #3640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6491ab
[AutoPR monitor/resource-manager] Add missing enum for aggregation ty…
AutorestCI Sep 19, 2018
496d549
Merge branch 'master' into restapi_auto_monitor/resource-manager
Sep 19, 2018
e571238
Regenerate azure-arm-monitor
Sep 19, 2018
a84b998
Update azure-arm-monitor to 4.1.1
Sep 19, 2018
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
5 changes: 3 additions & 2 deletions lib/services/monitorManagement/lib/models/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ export interface ScaleCapacity {
* hours and 5 minutes.
* @member {string} timeAggregation time aggregation type. How the data that is
* collected should be combined over time. The default value is Average.
* Possible values include: 'Average', 'Minimum', 'Maximum', 'Total', 'Count'
* Possible values include: 'Average', 'Minimum', 'Maximum', 'Total', 'Count',
* 'Last'
* @member {string} operator the operator that is used to compare the metric
* data and the threshold. Possible values include: 'Equals', 'NotEquals',
* 'GreaterThan', 'GreaterThanOrEqual', 'LessThan', 'LessThanOrEqual'
Expand Down Expand Up @@ -147,7 +148,7 @@ export interface ScaleAction {
* @member {string} [metricTrigger.timeAggregation] time aggregation type. How
* the data that is collected should be combined over time. The default value
* is Average. Possible values include: 'Average', 'Minimum', 'Maximum',
* 'Total', 'Count'
* 'Total', 'Count', 'Last'
* @member {string} [metricTrigger.operator] the operator that is used to
* compare the metric data and the threshold. Possible values include:
* 'Equals', 'NotEquals', 'GreaterThan', 'GreaterThanOrEqual', 'LessThan',
Expand Down
5 changes: 3 additions & 2 deletions lib/services/monitorManagement/lib/models/metricTrigger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ class MetricTrigger {
* hours and 5 minutes.
* @member {string} timeAggregation time aggregation type. How the data that
* is collected should be combined over time. The default value is Average.
* Possible values include: 'Average', 'Minimum', 'Maximum', 'Total', 'Count'
* Possible values include: 'Average', 'Minimum', 'Maximum', 'Total',
* 'Count', 'Last'
* @member {string} operator the operator that is used to compare the metric
* data and the threshold. Possible values include: 'Equals', 'NotEquals',
* 'GreaterThan', 'GreaterThanOrEqual', 'LessThan', 'LessThanOrEqual'
Expand Down Expand Up @@ -98,7 +99,7 @@ class MetricTrigger {
serializedName: 'timeAggregation',
type: {
name: 'Enum',
allowedValues: [ 'Average', 'Minimum', 'Maximum', 'Total', 'Count' ]
allowedValues: [ 'Average', 'Minimum', 'Maximum', 'Total', 'Count', 'Last' ]
}
},
operator: {
Expand Down
2 changes: 1 addition & 1 deletion lib/services/monitorManagement/lib/models/scaleRule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ScaleRule {
* @member {string} [metricTrigger.timeAggregation] time aggregation type.
* How the data that is collected should be combined over time. The default
* value is Average. Possible values include: 'Average', 'Minimum',
* 'Maximum', 'Total', 'Count'
* 'Maximum', 'Total', 'Count', 'Last'
* @member {string} [metricTrigger.operator] the operator that is used to
* compare the metric data and the threshold. Possible values include:
* 'Equals', 'NotEquals', 'GreaterThan', 'GreaterThanOrEqual', 'LessThan',
Expand Down
2 changes: 1 addition & 1 deletion lib/services/monitorManagement/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "azure-arm-monitor",
"author": "Microsoft Corporation",
"description": "MonitorManagementClient Library with typescript type definitions for node",
"version": "4.1.0",
"version": "4.1.1",
"dependencies": {
"ms-rest": "^2.3.3",
"ms-rest-azure": "^2.5.5"
Expand Down