[AutoPR] monitor/resource-manager

lib/services/monitorManagement/lib/models/index.d.ts

@@ -2033,6 +2033,12 @@ export interface MetricAlertCriteria {
  * @member {moment.duration} windowSize the period of time (in ISO 8601
  * duration format) that is used to monitor alert activity based on the
  * threshold.
+ * @member {string} [targetResourceType] the resource type of the target
+ * resource(s) on which the alert is created/updated. Mandatory for
+ * MultipleResourceMultipleMetricCriteria.
+ * @member {string} [targetResourceRegion] the region of the target resource(s)
+ * on which the alert is created/updated. Mandatory for
+ * MultipleResourceMultipleMetricCriteria.
  * @member {object} criteria defines the specific alert criteria information.
  * @member {string} [criteria.odatatype] Polymorphic Discriminator
  * @member {boolean} [autoMitigate] the flag that indicates whether the alert
@@ -2049,6 +2055,8 @@ export interface MetricAlertResource extends Resource {
   scopes?: string[];
   evaluationFrequency: moment.Duration;
   windowSize: moment.Duration;
+  targetResourceType?: string;
+  targetResourceRegion?: string;
   criteria: MetricAlertCriteria;
   autoMitigate?: boolean;
   actions?: MetricAlertAction[];
@@ -2074,6 +2082,12 @@ export interface MetricAlertResource extends Resource {
  * @member {moment.duration} windowSize the period of time (in ISO 8601
  * duration format) that is used to monitor alert activity based on the
  * threshold.
+ * @member {string} [targetResourceType] the resource type of the target
+ * resource(s) on which the alert is created/updated. Mandatory for
+ * MultipleResourceMultipleMetricCriteria.
+ * @member {string} [targetResourceRegion] the region of the target resource(s)
+ * on which the alert is created/updated. Mandatory for
+ * MultipleResourceMultipleMetricCriteria.
  * @member {object} criteria defines the specific alert criteria information.
  * @member {string} [criteria.odatatype] Polymorphic Discriminator
  * @member {boolean} [autoMitigate] the flag that indicates whether the alert
@@ -2091,6 +2105,8 @@ export interface MetricAlertResourcePatch {
   scopes?: string[];
   evaluationFrequency: moment.Duration;
   windowSize: moment.Duration;
+  targetResourceType?: string;
+  targetResourceRegion?: string;
   criteria: MetricAlertCriteria;
   autoMitigate?: boolean;
   actions?: MetricAlertAction[];
@@ -2156,7 +2172,8 @@ export interface MetricAlertStatusCollection {
  * Specifies a metric dimension.
  *
  * @member {string} name Name of the dimension.
- * @member {string} operator the dimension operator.
+ * @member {string} operator the dimension operator. Only 'Include' and
+ * 'Exclude' are supported
  * @member {array} values list of dimension values.
  */
 export interface MetricDimension {
@@ -2165,6 +2182,23 @@ export interface MetricDimension {
   values: string[];
 }
 
+/**
+ * @class
+ * Initializes a new instance of the MultiMetricCriteria class.
+ * @constructor
+ * The types of conditions for a multi resource alert
+ *
+ * @member {string} criterionType Polymorphic Discriminator
+ */
+export interface MultiMetricCriteria {
+  criterionType: string;
+  /**
+   * @property Describes unknown properties. The value of an unknown property
+   * can be of "any" type.
+   */
+  [property: string]: any;
+}
+
 /**
  * @class
  * Initializes a new instance of the MetricCriteria class.
@@ -2180,7 +2214,7 @@ export interface MetricDimension {
  * alert.
  * @member {array} [dimensions] List of dimension conditions.
  */
-export interface MetricCriteria {
+export interface MetricCriteria extends MultiMetricCriteria {
   name: string;
   metricName: string;
   metricNamespace?: string;
@@ -2204,6 +2238,20 @@ export interface MetricAlertSingleResourceMultipleMetricCriteria extends MetricA
   allOf?: MetricCriteria[];
 }
 
+/**
+ * @class
+ * Initializes a new instance of the MetricAlertMultipleResourceMultipleMetricCriteria class.
+ * @constructor
+ * Speficies the metric alert criteria for multiple resource that has multiple
+ * metric criteria.
+ *
+ * @member {array} [allOf] the list of multiple metric criteria for this 'all
+ * of' operation.
+ */
+export interface MetricAlertMultipleResourceMultipleMetricCriteria extends MetricAlertCriteria {
+  allOf?: MultiMetricCriteria[];
+}
+
 /**
  * @class
  * Initializes a new instance of the Source class.

lib/services/monitorManagement/lib/models/index.js

@@ -103,8 +103,10 @@ exports.MetricAlertStatusProperties = require('./metricAlertStatusProperties');
 exports.MetricAlertStatus = require('./metricAlertStatus');
 exports.MetricAlertStatusCollection = require('./metricAlertStatusCollection');
 exports.MetricDimension = require('./metricDimension');
+exports.MultiMetricCriteria = require('./multiMetricCriteria');
 exports.MetricCriteria = require('./metricCriteria');
 exports.MetricAlertSingleResourceMultipleMetricCriteria = require('./metricAlertSingleResourceMultipleMetricCriteria');
+exports.MetricAlertMultipleResourceMultipleMetricCriteria = require('./metricAlertMultipleResourceMultipleMetricCriteria');
 exports.Source = require('./source');
 exports.Schedule = require('./schedule');
 exports.Action = require('./action');
@@ -143,7 +145,10 @@ exports.discriminators = {
   'RuleAction.Microsoft.Azure.Management.Insights.Models.RuleEmailAction' : exports.RuleEmailAction,
   'RuleAction.Microsoft.Azure.Management.Insights.Models.RuleWebhookAction' : exports.RuleWebhookAction,
   'MetricAlertCriteria' : exports.MetricAlertCriteria,
+  'MultiMetricCriteria.StaticThresholdCriterion' : exports.MetricCriteria,
   'MetricAlertCriteria.Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria' : exports.MetricAlertSingleResourceMultipleMetricCriteria,
+  'MultiMetricCriteria' : exports.MultiMetricCriteria,
+  'MetricAlertCriteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria' : exports.MetricAlertMultipleResourceMultipleMetricCriteria,
   'Action' : exports.Action,
   'Action.Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.Microsoft.AppInsights.Nexus.DataContracts.Resources.ScheduledQueryRules.AlertingAction' : exports.AlertingAction,
   'Action.Microsoft.WindowsAzure.Management.Monitoring.Alerts.Models.Microsoft.AppInsights.Nexus.DataContracts.Resources.ScheduledQueryRules.LogToMetricAction' : exports.LogToMetricAction

lib/services/monitorManagement/lib/models/metricAlertMultipleResourceMultipleMetricCriteria.js

@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+const models = require('./index');
+
+/**
+ * Speficies the metric alert criteria for multiple resource that has multiple
+ * metric criteria.
+ *
+ * @extends models['MetricAlertCriteria']
+ */
+class MetricAlertMultipleResourceMultipleMetricCriteria extends models['MetricAlertCriteria'] {
+  /**
+   * Create a MetricAlertMultipleResourceMultipleMetricCriteria.
+   * @member {array} [allOf] the list of multiple metric criteria for this 'all
+   * of' operation.
+   */
+  constructor() {
+    super();
+  }
+
+  /**
+   * Defines the metadata of MetricAlertMultipleResourceMultipleMetricCriteria
+   *
+   * @returns {object} metadata of MetricAlertMultipleResourceMultipleMetricCriteria
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria',
+      type: {
+        name: 'Composite',
+        polymorphicDiscriminator: {
+          serializedName: 'odata.type',
+          clientName: 'odatatype'
+        },
+        uberParent: 'MetricAlertCriteria',
+        className: 'MetricAlertMultipleResourceMultipleMetricCriteria',
+        modelProperties: {
+          odatatype: {
+            required: true,
+            serializedName: 'odata\\.type',
+            isPolymorphicDiscriminator: true,
+            type: {
+              name: 'String'
+            }
+          },
+          allOf: {
+            required: false,
+            serializedName: 'allOf',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'MultiMetricCriteriaElementType',
+                  type: {
+                    name: 'Composite',
+                    additionalProperties: {
+                      type: {
+                        name: 'Dictionary',
+                        value: {
+                            required: false,
+                            serializedName: 'ObjectElementType',
+                            type: {
+                              name: 'Object'
+                            }
+                        }
+                      }
+                    },
+                    polymorphicDiscriminator: {
+                      serializedName: 'criterionType',
+                      clientName: 'criterionType'
+                    },
+                    uberParent: 'MultiMetricCriteria',
+                    className: 'MultiMetricCriteria'
+                  }
+              }
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = MetricAlertMultipleResourceMultipleMetricCriteria;

lib/services/monitorManagement/lib/models/metricAlertResource.js

@@ -32,6 +32,12 @@ class MetricAlertResource extends models['Resource'] {
    * @member {moment.duration} windowSize the period of time (in ISO 8601
    * duration format) that is used to monitor alert activity based on the
    * threshold.
+   * @member {string} [targetResourceType] the resource type of the target
+   * resource(s) on which the alert is created/updated. Mandatory for
+   * MultipleResourceMultipleMetricCriteria.
+   * @member {string} [targetResourceRegion] the region of the target
+   * resource(s) on which the alert is created/updated. Mandatory for
+   * MultipleResourceMultipleMetricCriteria.
    * @member {object} criteria defines the specific alert criteria information.
    * @member {string} [criteria.odatatype] Polymorphic Discriminator
    * @member {boolean} [autoMitigate] the flag that indicates whether the alert
@@ -153,6 +159,20 @@ class MetricAlertResource extends models['Resource'] {
               name: 'TimeSpan'
             }
           },
+          targetResourceType: {
+            required: false,
+            serializedName: 'properties.targetResourceType',
+            type: {
+              name: 'String'
+            }
+          },
+          targetResourceRegion: {
+            required: false,
+            serializedName: 'properties.targetResourceRegion',
+            type: {
+              name: 'String'
+            }
+          },
           criteria: {
             required: true,
             serializedName: 'properties.criteria',

lib/services/monitorManagement/lib/models/metricAlertResourcePatch.js

@@ -30,6 +30,12 @@ class MetricAlertResourcePatch {
    * @member {moment.duration} windowSize the period of time (in ISO 8601
    * duration format) that is used to monitor alert activity based on the
    * threshold.
+   * @member {string} [targetResourceType] the resource type of the target
+   * resource(s) on which the alert is created/updated. Mandatory for
+   * MultipleResourceMultipleMetricCriteria.
+   * @member {string} [targetResourceRegion] the region of the target
+   * resource(s) on which the alert is created/updated. Mandatory for
+   * MultipleResourceMultipleMetricCriteria.
    * @member {object} criteria defines the specific alert criteria information.
    * @member {string} [criteria.odatatype] Polymorphic Discriminator
    * @member {boolean} [autoMitigate] the flag that indicates whether the alert
@@ -119,6 +125,20 @@ class MetricAlertResourcePatch {
               name: 'TimeSpan'
             }
           },
+          targetResourceType: {
+            required: false,
+            serializedName: 'properties.targetResourceType',
+            type: {
+              name: 'String'
+            }
+          },
+          targetResourceRegion: {
+            required: false,
+            serializedName: 'properties.targetResourceRegion',
+            type: {
+              name: 'String'
+            }
+          },
           criteria: {
             required: true,
             serializedName: 'properties.criteria',

lib/services/monitorManagement/lib/models/metricAlertSingleResourceMultipleMetricCriteria.js

@@ -65,6 +65,11 @@ class MetricAlertSingleResourceMultipleMetricCriteria extends models['MetricAler
                   serializedName: 'MetricCriteriaElementType',
                   type: {
                     name: 'Composite',
+                    polymorphicDiscriminator: {
+                      serializedName: 'criterionType',
+                      clientName: 'criterionType'
+                    },
+                    uberParent: 'MultiMetricCriteria',
                     className: 'MetricCriteria'
                   }
               }

lib/services/monitorManagement/lib/models/metricCriteria.js

@@ -10,11 +10,14 @@
 
 'use strict';
 
+const models = require('./index');
+
 /**
  * Criterion to filter metrics.
  *
+ * @extends models['MultiMetricCriteria']
  */
-class MetricCriteria {
+class MetricCriteria extends models['MultiMetricCriteria'] {
   /**
    * Create a MetricCriteria.
    * @member {string} name Name of the criteria.
@@ -27,6 +30,7 @@ class MetricCriteria {
    * @member {array} [dimensions] List of dimension conditions.
    */
   constructor() {
+    super();
   }
 
   /**
@@ -38,11 +42,24 @@ class MetricCriteria {
   mapper() {
     return {
       required: false,
-      serializedName: 'MetricCriteria',
+      serializedName: 'StaticThresholdCriterion',
       type: {
         name: 'Composite',
+        polymorphicDiscriminator: {
+          serializedName: 'criterionType',
+          clientName: 'criterionType'
+        },
+        uberParent: 'MultiMetricCriteria',
         className: 'MetricCriteria',
         modelProperties: {
+          criterionType: {
+            required: true,
+            serializedName: 'criterionType',
+            isPolymorphicDiscriminator: true,
+            type: {
+              name: 'String'
+            }
+          },
           name: {
             required: true,
             serializedName: 'name',

lib/services/monitorManagement/lib/models/metricDimension.js

@@ -18,7 +18,8 @@ class MetricDimension {
   /**
    * Create a MetricDimension.
    * @member {string} name Name of the dimension.
-   * @member {string} operator the dimension operator.
+   * @member {string} operator the dimension operator. Only 'Include' and
+   * 'Exclude' are supported
    * @member {array} values list of dimension values.
    */
   constructor() {