From 90c8a6893bcb8c99e626e0bd802fe6298aab4d67 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Wed, 4 Aug 2021 01:05:00 +0000 Subject: [PATCH] CodeGen from PR 15483 in Azure/azure-rest-api-specs Merge 632c1616594e0b6de7119de5eb1a419886d74080 into 57e30b59a95ea35181d547a97528adbf82360ae7 --- .../src/Generated/ActivityLogsOperations.cs | 2 +- .../Generated/AutoscaleSettingsOperations.cs | 12 ++++---- .../DiagnosticSettingsCategoryOperations.cs | 4 +-- .../Generated/DiagnosticSettingsOperations.cs | 8 ++--- .../Generated/EventCategoriesOperations.cs | 2 +- .../src/Generated/LogProfilesOperations.cs | 10 +++---- .../Models/AutoscaleSettingResource.cs | 12 +++++++- .../Models/AutoscaleSettingResourcePatch.cs | 12 +++++++- .../Generated/Models/MetricStatisticType.cs | 8 ++++- .../src/Generated/Models/MetricTrigger.cs | 15 ++++++++-- .../src/Generated/Models/ScaleAction.cs | 5 ++-- .../src/Generated/Models/ScaleType.cs | 8 ++++- .../src/Generated/Operations.cs | 2 +- .../ScheduledQueryRulesOperations.cs | 12 ++++---- .../src/Generated/SdkInfo_MonitorClient.cs | 29 ++++++------------- .../Generated/TenantActivityLogsOperations.cs | 2 +- 16 files changed, 87 insertions(+), 56 deletions(-) diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/ActivityLogsOperations.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/ActivityLogsOperations.cs index e6b628ea59b63..8e4f078e958a1 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/ActivityLogsOperations.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/ActivityLogsOperations.cs @@ -120,7 +120,7 @@ internal ActivityLogsOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/microsoft.insights/eventtypes/management/values").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Insights/eventtypes/management/values").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); if (odataQuery != null) diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/AutoscaleSettingsOperations.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/AutoscaleSettingsOperations.cs index 119ff02326fce..95b19aa4b48da 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/AutoscaleSettingsOperations.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/AutoscaleSettingsOperations.cs @@ -120,7 +120,7 @@ internal AutoscaleSettingsOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/autoscalesettings").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/autoscalesettings").ToString(); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); @@ -338,7 +338,7 @@ internal AutoscaleSettingsOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/autoscalesettings/{autoscaleSettingName}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/autoscalesettings/{autoscaleSettingName}").ToString(); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{autoscaleSettingName}", System.Uri.EscapeDataString(autoscaleSettingName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); @@ -566,7 +566,7 @@ internal AutoscaleSettingsOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/autoscalesettings/{autoscaleSettingName}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/autoscalesettings/{autoscaleSettingName}").ToString(); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{autoscaleSettingName}", System.Uri.EscapeDataString(autoscaleSettingName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); @@ -755,7 +755,7 @@ internal AutoscaleSettingsOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/autoscalesettings/{autoscaleSettingName}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/autoscalesettings/{autoscaleSettingName}").ToString(); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{autoscaleSettingName}", System.Uri.EscapeDataString(autoscaleSettingName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); @@ -971,7 +971,7 @@ internal AutoscaleSettingsOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/autoscalesettings/{autoscaleSettingName}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/autoscalesettings/{autoscaleSettingName}").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{autoscaleSettingName}", System.Uri.EscapeDataString(autoscaleSettingName)); @@ -1157,7 +1157,7 @@ internal AutoscaleSettingsOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/microsoft.insights/autoscalesettings").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Insights/autoscalesettings").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); if (apiVersion != null) diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/DiagnosticSettingsCategoryOperations.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/DiagnosticSettingsCategoryOperations.cs index c8dde63a448b5..f0b000fd7f877 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/DiagnosticSettingsCategoryOperations.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/DiagnosticSettingsCategoryOperations.cs @@ -113,7 +113,7 @@ internal DiagnosticSettingsCategoryOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{resourceUri}/providers/microsoft.insights/diagnosticSettingsCategories/{name}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{resourceUri}/providers/Microsoft.Insights/diagnosticSettingsCategories/{name}").ToString(); _url = _url.Replace("{resourceUri}", resourceUri); _url = _url.Replace("{name}", System.Uri.EscapeDataString(name)); List _queryParameters = new List(); @@ -296,7 +296,7 @@ internal DiagnosticSettingsCategoryOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{resourceUri}/providers/microsoft.insights/diagnosticSettingsCategories").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{resourceUri}/providers/Microsoft.Insights/diagnosticSettingsCategories").ToString(); _url = _url.Replace("{resourceUri}", resourceUri); List _queryParameters = new List(); if (apiVersion != null) diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/DiagnosticSettingsOperations.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/DiagnosticSettingsOperations.cs index 3adb5da660057..b16ebdf6b4c2b 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/DiagnosticSettingsOperations.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/DiagnosticSettingsOperations.cs @@ -113,7 +113,7 @@ internal DiagnosticSettingsOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{resourceUri}/providers/microsoft.insights/diagnosticSettings/{name}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{resourceUri}/providers/Microsoft.Insights/diagnosticSettings/{name}").ToString(); _url = _url.Replace("{resourceUri}", resourceUri); _url = _url.Replace("{name}", System.Uri.EscapeDataString(name)); List _queryParameters = new List(); @@ -312,7 +312,7 @@ internal DiagnosticSettingsOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{resourceUri}/providers/microsoft.insights/diagnosticSettings/{name}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{resourceUri}/providers/Microsoft.Insights/diagnosticSettings/{name}").ToString(); _url = _url.Replace("{resourceUri}", resourceUri); _url = _url.Replace("{name}", System.Uri.EscapeDataString(name)); List _queryParameters = new List(); @@ -506,7 +506,7 @@ internal DiagnosticSettingsOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{resourceUri}/providers/microsoft.insights/diagnosticSettings/{name}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{resourceUri}/providers/Microsoft.Insights/diagnosticSettings/{name}").ToString(); _url = _url.Replace("{resourceUri}", resourceUri); _url = _url.Replace("{name}", System.Uri.EscapeDataString(name)); List _queryParameters = new List(); @@ -671,7 +671,7 @@ internal DiagnosticSettingsOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{resourceUri}/providers/microsoft.insights/diagnosticSettings").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "{resourceUri}/providers/Microsoft.Insights/diagnosticSettings").ToString(); _url = _url.Replace("{resourceUri}", resourceUri); List _queryParameters = new List(); if (apiVersion != null) diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/EventCategoriesOperations.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/EventCategoriesOperations.cs index d4fa28f572263..e5b727c56c848 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/EventCategoriesOperations.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/EventCategoriesOperations.cs @@ -86,7 +86,7 @@ internal EventCategoriesOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/microsoft.insights/eventcategories").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Insights/eventcategories").ToString(); List _queryParameters = new List(); if (apiVersion != null) { diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/LogProfilesOperations.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/LogProfilesOperations.cs index 476c7c5993e46..a4dab2af3eb2b 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/LogProfilesOperations.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/LogProfilesOperations.cs @@ -106,7 +106,7 @@ internal LogProfilesOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/microsoft.insights/logprofiles/{logProfileName}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Insights/logprofiles/{logProfileName}").ToString(); _url = _url.Replace("{logProfileName}", System.Uri.EscapeDataString(logProfileName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); @@ -280,7 +280,7 @@ internal LogProfilesOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/microsoft.insights/logprofiles/{logProfileName}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Insights/logprofiles/{logProfileName}").ToString(); _url = _url.Replace("{logProfileName}", System.Uri.EscapeDataString(logProfileName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); @@ -479,7 +479,7 @@ internal LogProfilesOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/microsoft.insights/logprofiles/{logProfileName}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Insights/logprofiles/{logProfileName}").ToString(); _url = _url.Replace("{logProfileName}", System.Uri.EscapeDataString(logProfileName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); @@ -686,7 +686,7 @@ internal LogProfilesOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/microsoft.insights/logprofiles/{logProfileName}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Insights/logprofiles/{logProfileName}").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{logProfileName}", System.Uri.EscapeDataString(logProfileName)); List _queryParameters = new List(); @@ -871,7 +871,7 @@ internal LogProfilesOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/microsoft.insights/logprofiles").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Insights/logprofiles").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); if (apiVersion != null) diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/AutoscaleSettingResource.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/AutoscaleSettingResource.cs index cd8ea7d1cd49e..16292838afb65 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/AutoscaleSettingResource.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/AutoscaleSettingResource.cs @@ -62,7 +62,9 @@ public AutoscaleSettingResource() /// autoscale setting. /// the resource identifier of the /// resource that the autoscale setting should be added to. - public AutoscaleSettingResource(string location, IList profiles, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), string kind = default(string), string etag = default(string), IList notifications = default(IList), bool? enabled = default(bool?), string autoscaleSettingResourceName = default(string), string targetResourceUri = default(string)) + /// the location of the resource + /// that the autoscale setting should be added to. + public AutoscaleSettingResource(string location, IList profiles, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), string kind = default(string), string etag = default(string), IList notifications = default(IList), bool? enabled = default(bool?), string autoscaleSettingResourceName = default(string), string targetResourceUri = default(string), string targetResourceLocation = default(string)) : base(location, id, name, type, tags, kind, etag) { Profiles = profiles; @@ -70,6 +72,7 @@ public AutoscaleSettingResource() Enabled = enabled; AutoscaleSettingResourceName = autoscaleSettingResourceName; TargetResourceUri = targetResourceUri; + TargetResourceLocation = targetResourceLocation; CustomInit(); } @@ -112,6 +115,13 @@ public AutoscaleSettingResource() [JsonProperty(PropertyName = "properties.targetResourceUri")] public string TargetResourceUri { get; set; } + /// + /// Gets or sets the location of the resource that the autoscale + /// setting should be added to. + /// + [JsonProperty(PropertyName = "properties.targetResourceLocation")] + public string TargetResourceLocation { get; set; } + /// /// Validate the object. /// diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/AutoscaleSettingResourcePatch.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/AutoscaleSettingResourcePatch.cs index fc9d799fc6cc9..c23a95232d7f8 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/AutoscaleSettingResourcePatch.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/AutoscaleSettingResourcePatch.cs @@ -48,7 +48,9 @@ public AutoscaleSettingResourcePatch() /// the name of the autoscale setting. /// the resource identifier of the /// resource that the autoscale setting should be added to. - public AutoscaleSettingResourcePatch(IList profiles, IDictionary tags = default(IDictionary), IList notifications = default(IList), bool? enabled = default(bool?), string name = default(string), string targetResourceUri = default(string)) + /// the location of the resource + /// that the autoscale setting should be added to. + public AutoscaleSettingResourcePatch(IList profiles, IDictionary tags = default(IDictionary), IList notifications = default(IList), bool? enabled = default(bool?), string name = default(string), string targetResourceUri = default(string), string targetResourceLocation = default(string)) { Tags = tags; Profiles = profiles; @@ -56,6 +58,7 @@ public AutoscaleSettingResourcePatch() Enabled = enabled; Name = name; TargetResourceUri = targetResourceUri; + TargetResourceLocation = targetResourceLocation; CustomInit(); } @@ -104,6 +107,13 @@ public AutoscaleSettingResourcePatch() [JsonProperty(PropertyName = "properties.targetResourceUri")] public string TargetResourceUri { get; set; } + /// + /// Gets or sets the location of the resource that the autoscale + /// setting should be added to. + /// + [JsonProperty(PropertyName = "properties.targetResourceLocation")] + public string TargetResourceLocation { get; set; } + /// /// Validate the object. /// diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/MetricStatisticType.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/MetricStatisticType.cs index a216b1bf4555f..241b24be5fe9c 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/MetricStatisticType.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/MetricStatisticType.cs @@ -28,7 +28,9 @@ public enum MetricStatisticType [EnumMember(Value = "Max")] Max, [EnumMember(Value = "Sum")] - Sum + Sum, + [EnumMember(Value = "Count")] + Count } internal static class MetricStatisticTypeEnumExtension { @@ -49,6 +51,8 @@ internal static string ToSerializedValue(this MetricStatisticType value) return "Max"; case MetricStatisticType.Sum: return "Sum"; + case MetricStatisticType.Count: + return "Count"; } return null; } @@ -65,6 +69,8 @@ internal static string ToSerializedValue(this MetricStatisticType value) return MetricStatisticType.Max; case "Sum": return MetricStatisticType.Sum; + case "Count": + return MetricStatisticType.Count; } return null; } diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/MetricTrigger.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/MetricTrigger.cs index 7191c0df42cd0..dc19e4db4a293 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/MetricTrigger.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/MetricTrigger.cs @@ -42,7 +42,7 @@ public MetricTrigger() /// minute. /// the metric statistic type. How the metrics /// from multiple instances are combined. Possible values include: - /// 'Average', 'Min', 'Max', 'Sum' + /// 'Average', 'Min', 'Max', 'Sum', 'Count' /// the range of time in which instance data /// is collected. This value must be greater than the delay in metric /// collection, which can vary from resource-to-resource. Must be @@ -59,15 +59,18 @@ public MetricTrigger() /// the scale action. /// the namespace of the metric that /// defines what the rule monitors. + /// the location of the resource + /// the rule monitors. /// List of dimension conditions. For example: /// [{"DimensionName":"AppName","Operator":"Equals","Values":["App1"]},{"DimensionName":"Deployment","Operator":"Equals","Values":["default"]}]. /// a value indicating whether metric /// should divide per instance. - public MetricTrigger(string metricName, string metricResourceUri, System.TimeSpan timeGrain, MetricStatisticType statistic, System.TimeSpan timeWindow, TimeAggregationType timeAggregation, ComparisonOperationType operatorProperty, double threshold, string metricNamespace = default(string), IList dimensions = default(IList), bool? dividePerInstance = default(bool?)) + public MetricTrigger(string metricName, string metricResourceUri, System.TimeSpan timeGrain, MetricStatisticType statistic, System.TimeSpan timeWindow, TimeAggregationType timeAggregation, ComparisonOperationType operatorProperty, double threshold, string metricNamespace = default(string), string metricResourceLocation = default(string), IList dimensions = default(IList), bool? dividePerInstance = default(bool?)) { MetricName = metricName; MetricNamespace = metricNamespace; MetricResourceUri = metricResourceUri; + MetricResourceLocation = metricResourceLocation; TimeGrain = timeGrain; Statistic = statistic; TimeWindow = timeWindow; @@ -105,6 +108,12 @@ public MetricTrigger() [JsonProperty(PropertyName = "metricResourceUri")] public string MetricResourceUri { get; set; } + /// + /// Gets or sets the location of the resource the rule monitors. + /// + [JsonProperty(PropertyName = "metricResourceLocation")] + public string MetricResourceLocation { get; set; } + /// /// Gets or sets the granularity of metrics the rule monitors. Must be /// one of the predefined values returned from metric definitions for @@ -116,7 +125,7 @@ public MetricTrigger() /// /// Gets or sets the metric statistic type. How the metrics from /// multiple instances are combined. Possible values include: - /// 'Average', 'Min', 'Max', 'Sum' + /// 'Average', 'Min', 'Max', 'Sum', 'Count' /// [JsonProperty(PropertyName = "statistic")] public MetricStatisticType Statistic { get; set; } diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/ScaleAction.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/ScaleAction.cs index f8e59a53dc7f8..9f23316376c8c 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/ScaleAction.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/ScaleAction.cs @@ -34,7 +34,8 @@ public ScaleAction() /// values include: 'None', 'Increase', 'Decrease' /// the type of action that should occur when the /// scale rule fires. Possible values include: 'ChangeCount', - /// 'PercentChangeCount', 'ExactCount' + /// 'PercentChangeCount', 'ExactCount', + /// 'ServiceAllowedNextValue' /// the amount of time to wait since the last /// scaling action before this action occurs. It must be between 1 week /// and 1 minute in ISO 8601 format. @@ -66,7 +67,7 @@ public ScaleAction() /// /// Gets or sets the type of action that should occur when the scale /// rule fires. Possible values include: 'ChangeCount', - /// 'PercentChangeCount', 'ExactCount' + /// 'PercentChangeCount', 'ExactCount', 'ServiceAllowedNextValue' /// [JsonProperty(PropertyName = "type")] public ScaleType Type { get; set; } diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/ScaleType.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/ScaleType.cs index 14e8b058ef787..de3dbf23de2fc 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/ScaleType.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Models/ScaleType.cs @@ -26,7 +26,9 @@ public enum ScaleType [EnumMember(Value = "PercentChangeCount")] PercentChangeCount, [EnumMember(Value = "ExactCount")] - ExactCount + ExactCount, + [EnumMember(Value = "ServiceAllowedNextValue")] + ServiceAllowedNextValue } internal static class ScaleTypeEnumExtension { @@ -45,6 +47,8 @@ internal static string ToSerializedValue(this ScaleType value) return "PercentChangeCount"; case ScaleType.ExactCount: return "ExactCount"; + case ScaleType.ServiceAllowedNextValue: + return "ServiceAllowedNextValue"; } return null; } @@ -59,6 +63,8 @@ internal static string ToSerializedValue(this ScaleType value) return ScaleType.PercentChangeCount; case "ExactCount": return ScaleType.ExactCount; + case "ServiceAllowedNextValue": + return ScaleType.ServiceAllowedNextValue; } return null; } diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Operations.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Operations.cs index 8e15790a2f9b0..dfccbd1e4bb99 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Operations.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/Operations.cs @@ -84,7 +84,7 @@ internal Operations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/microsoft.insights/operations").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Insights/operations").ToString(); List _queryParameters = new List(); if (apiVersion != null) { diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/ScheduledQueryRulesOperations.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/ScheduledQueryRulesOperations.cs index f25bbc03d6eb7..877e09edeabae 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/ScheduledQueryRulesOperations.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/ScheduledQueryRulesOperations.cs @@ -141,7 +141,7 @@ internal ScheduledQueryRulesOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/scheduledQueryRules/{ruleName}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/scheduledQueryRules/{ruleName}").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{ruleName}", System.Uri.EscapeDataString(ruleName)); @@ -372,7 +372,7 @@ internal ScheduledQueryRulesOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/scheduledQueryRules/{ruleName}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/scheduledQueryRules/{ruleName}").ToString(); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{ruleName}", System.Uri.EscapeDataString(ruleName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); @@ -587,7 +587,7 @@ internal ScheduledQueryRulesOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/scheduledQueryRules/{ruleName}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/scheduledQueryRules/{ruleName}").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{ruleName}", System.Uri.EscapeDataString(ruleName)); @@ -797,7 +797,7 @@ internal ScheduledQueryRulesOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/scheduledQueryRules/{ruleName}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/scheduledQueryRules/{ruleName}").ToString(); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{ruleName}", System.Uri.EscapeDataString(ruleName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); @@ -963,7 +963,7 @@ internal ScheduledQueryRulesOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/microsoft.insights/scheduledQueryRules").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Insights/scheduledQueryRules").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); if (odataQuery != null) @@ -1172,7 +1172,7 @@ internal ScheduledQueryRulesOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/microsoft.insights/scheduledQueryRules").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Insights/scheduledQueryRules").ToString(); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); List _queryParameters = new List(); diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/SdkInfo_MonitorClient.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/SdkInfo_MonitorClient.cs index dac39e984c563..3f28fca0843c2 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/SdkInfo_MonitorClient.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/SdkInfo_MonitorClient.cs @@ -19,47 +19,36 @@ public static IEnumerable> ApiInfo_MonitorClient { return new Tuple[] { + new Tuple("Insights", "ActivityLogs", "2015-04-01"), new Tuple("Insights", "AlertRules", "2016-03-01"), + new Tuple("Insights", "AutoscaleSettings", "2015-04-01"), new Tuple("Insights", "Baselines", "2019-03-01"), new Tuple("Insights", "DataCollectionEndpoints", "2021-04-01"), new Tuple("Insights", "DataCollectionRuleAssociations", "2021-04-01"), new Tuple("Insights", "DataCollectionRules", "2021-04-01"), + new Tuple("Insights", "DiagnosticSettings", "2017-05-01-preview"), + new Tuple("Insights", "DiagnosticSettingsCategory", "2017-05-01-preview"), + new Tuple("Insights", "EventCategories", "2015-04-01"), + new Tuple("Insights", "LogProfiles", "2016-03-01"), new Tuple("Insights", "MetricAlerts", "2018-03-01"), new Tuple("Insights", "MetricAlertsStatus", "2018-03-01"), new Tuple("Insights", "MetricDefinitions", "2018-01-01"), new Tuple("Insights", "Metrics", "2018-01-01"), + new Tuple("Insights", "Operations", "2015-04-01"), new Tuple("Insights", "PrivateEndpointConnections", "2019-10-17-preview"), new Tuple("Insights", "PrivateLinkResources", "2019-10-17-preview"), new Tuple("Insights", "PrivateLinkScopedResources", "2019-10-17-preview"), + new Tuple("Insights", "ScheduledQueryRules", "2018-04-16"), + new Tuple("Insights", "TenantActivityLogs", "2015-04-01"), new Tuple("Insights", "VMInsights", "2018-11-27-preview"), new Tuple("insights", "ActionGroups", "2019-06-01"), new Tuple("insights", "ActivityLogAlerts", "2017-04-01"), - new Tuple("insights", "ActivityLogs", "2015-04-01"), new Tuple("insights", "AlertRuleIncidents", "2016-03-01"), - new Tuple("insights", "AutoscaleSettings", "2015-04-01"), - new Tuple("insights", "DiagnosticSettings", "2017-05-01-preview"), - new Tuple("insights", "DiagnosticSettingsCategory", "2017-05-01-preview"), - new Tuple("insights", "EventCategories", "2015-04-01"), - new Tuple("insights", "LogProfiles", "2016-03-01"), new Tuple("insights", "MetricNamespaces", "2017-12-01-preview"), - new Tuple("insights", "Operations", "2015-04-01"), new Tuple("insights", "PrivateLinkScopeOperationStatus", "2019-10-17-preview"), new Tuple("insights", "PrivateLinkScopes", "2019-10-17-preview"), - new Tuple("insights", "ScheduledQueryRules", "2018-04-16"), - new Tuple("insights", "TenantActivityLogs", "2015-04-01"), }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "v2"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/monitor/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\\Repos\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "08afd3c6a54fe0d6a53f8b9fce2bac633b1ff9a6"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } - diff --git a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/TenantActivityLogsOperations.cs b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/TenantActivityLogsOperations.cs index ed9e35a8f8e10..3f737aaea922e 100644 --- a/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/TenantActivityLogsOperations.cs +++ b/sdk/monitor/Microsoft.Azure.Management.Monitor/src/Generated/TenantActivityLogsOperations.cs @@ -104,7 +104,7 @@ internal TenantActivityLogsOperations(MonitorManagementClient client) } // Construct URL var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/microsoft.insights/eventtypes/management/values").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Insights/eventtypes/management/values").ToString(); List _queryParameters = new List(); if (odataQuery != null) {