Update from master

sdk/monitor/arm-monitor/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Microsoft
+Copyright (c) 2020 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

sdk/monitor/arm-monitor/README.md

@@ -98,4 +98,4 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
 
 - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
 
-![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fsdk%2Fmonitor%2Farm-monitor%2FREADME.png)
+![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js/sdk/monitor/arm-monitor/README.png)

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

@@ -86,5 +86,6 @@ export {
   VoiceReceiver,
   WebhookNotification,
   WebhookReceiver,
+  WebtestLocationAvailabilityCriteria,
   WorkspaceInfo
 } from "../models/mappers";

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

@@ -85,5 +85,6 @@ export {
   VoiceReceiver,
   WebhookNotification,
   WebhookReceiver,
+  WebtestLocationAvailabilityCriteria,
   WorkspaceInfo
 } from "../models/mappers";

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

@@ -86,5 +86,6 @@ export {
   VoiceReceiver,
   WebhookNotification,
   WebhookReceiver,
+  WebtestLocationAvailabilityCriteria,
   WorkspaceInfo
 } from "../models/mappers";

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

@@ -85,5 +85,6 @@ export {
   VoiceReceiver,
   WebhookNotification,
   WebhookReceiver,
+  WebtestLocationAvailabilityCriteria,
   WorkspaceInfo
 } from "../models/mappers";

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

@@ -84,5 +84,6 @@ export {
   VoiceReceiver,
   WebhookNotification,
   WebhookReceiver,
+  WebtestLocationAvailabilityCriteria,
   WorkspaceInfo
 } from "../models/mappers";

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

@@ -84,5 +84,6 @@ export {
   VoiceReceiver,
   WebhookNotification,
   WebhookReceiver,
+  WebtestLocationAvailabilityCriteria,
   WorkspaceInfo
 } from "../models/mappers";

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

@@ -2113,13 +2113,13 @@ export interface MetricAlertAction {
   /**
    * The properties of a webhook object.
    */
-  webhookProperties?: { [propertyName: string]: string };
+  webHookProperties?: { [propertyName: string]: string };
 }
 
 /**
  * Contains the possible cases for MetricAlertCriteria.
  */
-export type MetricAlertCriteriaUnion = MetricAlertCriteria | MetricAlertSingleResourceMultipleMetricCriteria | MetricAlertMultipleResourceMultipleMetricCriteria;
+export type MetricAlertCriteriaUnion = MetricAlertCriteria | MetricAlertSingleResourceMultipleMetricCriteria | WebtestLocationAvailabilityCriteria | MetricAlertMultipleResourceMultipleMetricCriteria;
 
 /**
  * The rule criteria that defines the conditions of the alert rule.
@@ -2179,7 +2179,7 @@ export interface MetricAlertResource extends Resource {
    */
   criteria: MetricAlertCriteriaUnion;
   /**
-   * the flag that indicates whether the alert should be auto resolved or not.
+   * the flag that indicates whether the alert should be auto resolved or not. The default is true.
    */
   autoMitigate?: boolean;
   /**
@@ -2242,7 +2242,7 @@ export interface MetricAlertResourcePatch {
    */
   criteria: MetricAlertCriteriaUnion;
   /**
-   * the flag that indicates whether the alert should be auto resolved or not.
+   * the flag that indicates whether the alert should be auto resolved or not. The default is true.
    */
   autoMitigate?: boolean;
   /**
@@ -2375,9 +2375,10 @@ export interface MetricCriteria {
    */
   dimensions?: MetricDimension[];
   /**
-   * the criteria operator.
+   * the criteria operator. Possible values include: 'Equals', 'NotEquals', 'GreaterThan',
+   * 'GreaterThanOrEqual', 'LessThan', 'LessThanOrEqual'
    */
-  operator: any;
+  operator: Operator;
   /**
    * the criteria threshold value that activates the alert.
    */
@@ -2398,6 +2399,28 @@ export interface MetricAlertSingleResourceMultipleMetricCriteria {
   allOf?: MetricCriteria[];
 }
 
+/**
+ * Specifies the metric alert rule criteria for a web test resource.
+ */
+export interface WebtestLocationAvailabilityCriteria {
+  /**
+   * Polymorphic Discriminator
+   */
+  odatatype: "Microsoft.Azure.Monitor.WebtestLocationAvailabilityCriteria";
+  /**
+   * The Application Insights web test Id.
+   */
+  webTestId: string;
+  /**
+   * The Application Insights resource Id.
+   */
+  componentId: string;
+  /**
+   * The number of failed locations.
+   */
+  failedLocationCount: number;
+}
+
 /**
  * Specifies a metric dimension.
  */
@@ -2476,14 +2499,15 @@ export interface DynamicMetricCriteria {
    */
   dimensions?: MetricDimension[];
   /**
-   * The operator used to compare the metric value against the threshold.
+   * The operator used to compare the metric value against the threshold. Possible values include:
+   * 'GreaterThan', 'LessThan', 'GreaterOrLessThan'
    */
-  operator: any;
+  operator: DynamicThresholdOperator;
   /**
    * The extent of deviation required to trigger an alert. This will affect how tight the threshold
-   * is to the metric series pattern.
+   * is to the metric series pattern. Possible values include: 'Low', 'Medium', 'High'
    */
-  alertSensitivity: any;
+  alertSensitivity: DynamicThresholdSensitivity;
   /**
    * The minimum number of violations required within the selected lookback time window required to
    * raise an alert.
@@ -3331,6 +3355,31 @@ export type Sensitivity = 'Low' | 'Medium' | 'High';
  */
 export type BaselineSensitivity = 'Low' | 'Medium' | 'High';
 
+/**
+ * Defines values for Operator.
+ * Possible values include: 'Equals', 'NotEquals', 'GreaterThan', 'GreaterThanOrEqual', 'LessThan',
+ * 'LessThanOrEqual'
+ * @readonly
+ * @enum {string}
+ */
+export type Operator = 'Equals' | 'NotEquals' | 'GreaterThan' | 'GreaterThanOrEqual' | 'LessThan' | 'LessThanOrEqual';
+
+/**
+ * Defines values for DynamicThresholdOperator.
+ * Possible values include: 'GreaterThan', 'LessThan', 'GreaterOrLessThan'
+ * @readonly
+ * @enum {string}
+ */
+export type DynamicThresholdOperator = 'GreaterThan' | 'LessThan' | 'GreaterOrLessThan';
+
+/**
+ * Defines values for DynamicThresholdSensitivity.
+ * Possible values include: 'Low', 'Medium', 'High'
+ * @readonly
+ * @enum {string}
+ */
+export type DynamicThresholdSensitivity = 'Low' | 'Medium' | 'High';
+
 /**
  * Defines values for Enabled.
  * Possible values include: 'true', 'false'

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

@@ -86,5 +86,6 @@ export {
   VoiceReceiver,
   WebhookNotification,
   WebhookReceiver,
+  WebtestLocationAvailabilityCriteria,
   WorkspaceInfo
 } from "../models/mappers";

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

@@ -3591,8 +3591,8 @@ export const MetricAlertAction: msRest.CompositeMapper = {
           name: "String"
         }
       },
-      webhookProperties: {
-        serializedName: "webhookProperties",
+      webHookProperties: {
+        serializedName: "webHookProperties",
         type: {
           name: "Dictionary",
           value: {
@@ -4026,7 +4026,7 @@ export const MetricCriteria: msRest.CompositeMapper = {
         required: true,
         serializedName: "operator",
         type: {
-          name: "Object"
+          name: "String"
         }
       },
       threshold: {
@@ -4068,6 +4068,41 @@ export const MetricAlertSingleResourceMultipleMetricCriteria: msRest.CompositeMa
   }
 };
 
+export const WebtestLocationAvailabilityCriteria: msRest.CompositeMapper = {
+  serializedName: "Microsoft.Azure.Monitor.WebtestLocationAvailabilityCriteria",
+  type: {
+    name: "Composite",
+    polymorphicDiscriminator: MetricAlertCriteria.type.polymorphicDiscriminator,
+    uberParent: "MetricAlertCriteria",
+    className: "WebtestLocationAvailabilityCriteria",
+    modelProperties: {
+      ...MetricAlertCriteria.type.modelProperties,
+      webTestId: {
+        required: true,
+        serializedName: "webTestId",
+        type: {
+          name: "String"
+        }
+      },
+      componentId: {
+        required: true,
+        serializedName: "componentId",
+        type: {
+          name: "String"
+        }
+      },
+      failedLocationCount: {
+        required: true,
+        serializedName: "failedLocationCount",
+        type: {
+          name: "Number"
+        }
+      }
+    },
+    additionalProperties: MetricAlertCriteria.type.additionalProperties
+  }
+};
+
 export const MetricDimension: msRest.CompositeMapper = {
   serializedName: "MetricDimension",
   type: {
@@ -4172,14 +4207,14 @@ export const DynamicMetricCriteria: msRest.CompositeMapper = {
         required: true,
         serializedName: "operator",
         type: {
-          name: "Object"
+          name: "String"
         }
       },
       alertSensitivity: {
         required: true,
         serializedName: "alertSensitivity",
         type: {
-          name: "Object"
+          name: "String"
         }
       },
       failingPeriods: {
@@ -5140,6 +5175,7 @@ export const discriminators = {
   'MetricAlertCriteria' : MetricAlertCriteria,
   'MultiMetricCriteria.StaticThresholdCriterion' : MetricCriteria,
   'MetricAlertCriteria.Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria' : MetricAlertSingleResourceMultipleMetricCriteria,
+  'MetricAlertCriteria.Microsoft.Azure.Monitor.WebtestLocationAvailabilityCriteria' : WebtestLocationAvailabilityCriteria,
   'MultiMetricCriteria' : MultiMetricCriteria,
   'MetricAlertCriteria.Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria' : MetricAlertMultipleResourceMultipleMetricCriteria,
   'MultiMetricCriteria.DynamicThresholdCriterion' : DynamicMetricCriteria,

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

@@ -86,5 +86,6 @@ export {
   VoiceReceiver,
   WebhookNotification,
   WebhookReceiver,
+  WebtestLocationAvailabilityCriteria,
   WorkspaceInfo
 } from "../models/mappers";

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

@@ -85,5 +85,6 @@ export {
   VoiceReceiver,
   WebhookNotification,
   WebhookReceiver,
+  WebtestLocationAvailabilityCriteria,
   WorkspaceInfo
 } from "../models/mappers";

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

@@ -84,5 +84,6 @@ export {
   VoiceReceiver,
   WebhookNotification,
   WebhookReceiver,
+  WebtestLocationAvailabilityCriteria,
   WorkspaceInfo
 } from "../models/mappers";

sdk/monitor/arm-monitor/src/monitorManagementClientContext.ts

@@ -13,7 +13,7 @@ import * as msRest from "@azure/ms-rest-js";
 import * as msRestAzure from "@azure/ms-rest-azure-js";
 
 const packageName = "@azure/arm-monitor";
-const packageVersion = "5.4.0";
+const packageVersion = "6.0.0";
 
 export class MonitorManagementClientContext extends msRestAzure.AzureServiceClient {
   credentials: msRest.ServiceClientCredentials;

sdk/monitor/arm-monitor/src/operations/alertRules.ts

@@ -27,7 +27,7 @@ export class AlertRules {
   }
 
   /**
-   * Creates or updates an alert rule.
+   * Creates or updates a classic metric alert rule.
    * @param resourceGroupName The name of the resource group.
    * @param ruleName The name of the rule.
    * @param parameters The parameters of the rule to create or update.
@@ -63,7 +63,7 @@ export class AlertRules {
   }
 
   /**
-   * Deletes an alert rule
+   * Deletes a classic metric alert rule
    * @param resourceGroupName The name of the resource group.
    * @param ruleName The name of the rule.
    * @param [options] The optional parameters
@@ -95,7 +95,7 @@ export class AlertRules {
   }
 
   /**
-   * Gets an alert rule
+   * Gets a classic metric alert rule
    * @param resourceGroupName The name of the resource group.
    * @param ruleName The name of the rule.
    * @param [options] The optional parameters
@@ -127,7 +127,8 @@ export class AlertRules {
   }
 
   /**
-   * Updates an existing AlertRuleResource. To update other fields use the CreateOrUpdate method.
+   * Updates an existing classic metric AlertRuleResource. To update other fields use the
+   * CreateOrUpdate method.
    * @param resourceGroupName The name of the resource group.
    * @param ruleName The name of the rule.
    * @param alertRulesResource Parameters supplied to the operation.
@@ -163,7 +164,7 @@ export class AlertRules {
   }
 
   /**
-   * List the alert rules within a resource group.
+   * List the classic metric alert rules within a resource group.
    * @param resourceGroupName The name of the resource group.
    * @param [options] The optional parameters
    * @returns Promise<Models.AlertRulesListByResourceGroupResponse>
@@ -191,7 +192,7 @@ export class AlertRules {
   }
 
   /**
-   * List the alert rules within a subscription.
+   * List the classic metric alert rules within a subscription.
    * @param [options] The optional parameters
    * @returns Promise<Models.AlertRulesListBySubscriptionResponse>
    */