Skip to content

S360 #14362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akning-ms merged 14 commits into from
Jul 5, 2021
Merged

S360 #14362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8f35018
Add dividePerInstance property to the autoscale metric trigger
LeoVannelli Apr 15, 2021
897525f
Update examples for autoscale to include 'dividePerInstance'
LeoVannelli Apr 16, 2021
01a28b8
Update examples for correctness
LeoVannelli Apr 19, 2021
adb5d8e
update example for correctness
LeoVannelli Apr 19, 2021
8a0b264
swagger corrections
LeoVannelli May 10, 2021
14191f6
remove entry from wrong tag
LeoVannelli May 10, 2021
571079c
fix boolean as string validation error
LeoVannelli May 10, 2021
a3cd7d5
validation fix
LeoVannelli May 11, 2021
05301fc
Merge branch 'Azure:master' into master
LeoVannelli Jun 4, 2021
882c209
Merge branch 'Azure:master' into master
LeoVannelli Jun 21, 2021
29731d2
added missing lifter changes
LeoVannelli Jun 22, 2021
4381586
Merge pull request #1 from LeoVannelli/lifter
LeoVannelli Jun 22, 2021
7a50018
Merge branch 'master' into s360
LeoVannelli Jun 22, 2021
4f20aba
add recommended linter suppression
LeoVannelli Jun 30, 2021
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
4 changes: 2 additions & 2 deletions ...ager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
}
},
"paths": {
"/{resourceUri}/providers/microsoft.insights/diagnosticSettingsCategories/{name}": {
"/{resourceUri}/providers/Microsoft.Insights/diagnosticSettingsCategories/{name}": {
"get": {
"tags": [
"DiagnosticSettingsCategories"
Expand Down Expand Up @@ -75,7 +75,7 @@
}
}
},
"/{resourceUri}/providers/microsoft.insights/diagnosticSettingsCategories": {
"/{resourceUri}/providers/Microsoft.Insights/diagnosticSettingsCategories": {
"get": {
"tags": [
"DiagnosticSettingsCategories"
Expand Down
4 changes: 2 additions & 2 deletions ...source-manager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettings_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
}
},
"paths": {
"/{resourceUri}/providers/microsoft.insights/diagnosticSettings/{name}": {
"/{resourceUri}/providers/Microsoft.Insights/diagnosticSettings/{name}": {
"get": {
"tags": [
"DiagnosticSettings"
Expand Down Expand Up @@ -158,7 +158,7 @@
}
}
},
"/{resourceUri}/providers/microsoft.insights/diagnosticSettings": {
"/{resourceUri}/providers/Microsoft.Insights/diagnosticSettings": {
"get": {
"tags": [
"DiagnosticSettings"
Expand Down
4 changes: 4 additions & 0 deletions ...source-manager/Microsoft.Insights/preview/2021-05-01-preview/diagnosticsSettings_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,10 @@
"type": "string",
"description": "The full ARM resource ID of the Log Analytics workspace to which you would like to send Diagnostic Logs. Example: /subscriptions/4b9e8510-67ab-4e9a-95a9-e2f1e570ea9c/resourceGroups/insights-integration/providers/Microsoft.OperationalInsights/workspaces/viruela2"
},
"marketplacePartnerId": {
"type": "string",
"description": "The full ARM resource ID of the Marketplace resource to which you would like to send Diagnostic Logs."
},
"logAnalyticsDestinationType": {
"type": "string",
"description": "A string indicating whether the export to Log Analytics should use the default destination type, i.e. AzureDiagnostics, or use a destination type constructed as follows: <normalized service identity>_<normalized category name>. Possible values are: Dedicated and null (null is default.)"
Expand Down
2 changes: 2 additions & 0 deletions ...crosoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateDiagnosticSetting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"workspaceId": "",
"eventHubAuthorizationRuleId": "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule",
"eventHubName": "myeventhub",
"marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1",
"metrics": [
{
"category": "WorkflowMetrics",
Expand Down Expand Up @@ -45,6 +46,7 @@
"workspaceId": "",
"eventHubAuthorizationRuleId": "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule",
"eventHubName": "myeventhub",
"marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1",
"metrics": [
{
"category": "WorkflowMetrics",
Expand Down
2 changes: 2 additions & 0 deletions ...s/preview/2021-05-01-preview/examples/createOrUpdateManagementGroupDiagnosticSetting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"workspaceId": "/subscriptions/9cf7cc0a-0ba1-4624-bc82-97e1ee25dc45/resourceGroups/mgTest/providers/Microsoft.OperationalInsights/workspaces/mgTestWorkspace",
"eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule",
"eventHubName": "myeventhub",
"marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1",
"logs": [
{
"categoryGroup": "allLogs",
Expand All @@ -29,6 +30,7 @@
"storageAccountId": "/subscriptions/bfaef57f-297e-4210-bfe5-27c18cc671f7/resourceGroups/FuncAppRunners/providers/Microsoft.Storage/storageAccounts/testpersonalb6a5",
"workspaceId": "/subscriptions/9cf7cc0a-0ba1-4624-bc82-97e1ee25dc45/resourceGroups/mgTest/providers/Microsoft.OperationalInsights/workspaces/mgTestWorkspace",
"eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule",
"marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1",
"logs": [
{
"categoryGroup": "allLogs",
Expand Down
2 changes: 2 additions & 0 deletions ...ghts/preview/2021-05-01-preview/examples/createOrUpdateSubscriptionDiagnosticSetting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"workspaceId": "",
"eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule",
"eventHubName": "myeventhub",
"marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1",
"logs": [
{
"categoryGroup": "allLogs",
Expand All @@ -29,6 +30,7 @@
"storageAccountId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1",
"workspaceId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/Microsoft.OperationalInsights/workspaces/test1",
"eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule",
"marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1",
"logs": [
{
"categoryGroup": "allLogs",
Expand Down
1 change: 1 addition & 0 deletions ...-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getDiagnosticSetting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"storageAccountId": "/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1",
"workspaceId": "",
"eventHubAuthorizationRuleId": "/subscriptions/1a66ce04-b633-4a0b-b2bc-a912ec8986a6/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule",
"marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1",
"metrics": [
{
"category": "WorkflowMetrics",
Expand Down
1 change: 1 addition & 0 deletions ...oft.Insights/preview/2021-05-01-preview/examples/getManagementGroupDiagnosticSetting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"storageAccountId": "/subscriptions/bfaef57f-297e-4210-bfe5-27c18cc671f7/resourceGroups/FuncAppRunners/providers/Microsoft.Storage/storageAccounts/testpersonalb6a5",
"workspaceId": "/subscriptions/9cf7cc0a-0ba1-4624-bc82-97e1ee25dc45/resourceGroups/mgTest/providers/Microsoft.OperationalInsights/workspaces/mgTestWorkspace",
"eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule",
"marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1",
"logs": [
{
"categoryGroup": "allLogs",
Expand Down
1 change: 1 addition & 0 deletions ...rosoft.Insights/preview/2021-05-01-preview/examples/getSubscriptionDiagnosticSetting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"storageAccountId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1",
"workspaceId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/Microsoft.OperationalInsights/workspaces/test1",
"eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule",
"marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1",
"logs": [
{
"categoryGroup": "allLogs",
Expand Down
1 change: 1 addition & 0 deletions ...anager/Microsoft.Insights/preview/2021-05-01-preview/examples/listDiagnosticSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"storageAccountId": "/subscriptions/df602c9c-7aa0-407d-a6fb-eb20c8bd1192/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1",
"eventHubAuthorizationRuleId": "/subscriptions/b67f7fec-69fc-4974-9099-a26bd6ffeda3/resourceGroups/andy1101/providers/Microsoft.EventHub/namespaces/andy1101/authorizationrules/RootManageSharedAccessKey",
"workspaceId": "",
"marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1",
"metrics": [
{
"category": "WorkflowMetrics",
Expand Down
1 change: 1 addition & 0 deletions ...t.Insights/preview/2021-05-01-preview/examples/listManagementGroupDiagnosticSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"storageAccountId": "/subscriptions/bfaef57f-297e-4210-bfe5-27c18cc671f7/resourceGroups/FuncAppRunners/providers/Microsoft.Storage/storageAccounts/testpersonalb6a5",
"workspaceId": "/subscriptions/9cf7cc0a-0ba1-4624-bc82-97e1ee25dc45/resourceGroups/mgTest/providers/Microsoft.OperationalInsights/workspaces/mgTestWorkspace",
"eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/montest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule",
"marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1",
"logs": [
{
"categoryGroup": "allLogs",
Expand Down
1 change: 1 addition & 0 deletions ...soft.Insights/preview/2021-05-01-preview/examples/listSubscriptionDiagnosticSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"storageAccountId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/Microsoft.Storage/storageAccounts/appteststorage1",
"workspaceId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/Microsoft.OperationalInsights/workspaces/test1",
"eventHubAuthorizationRuleId": "/subscriptions/fb9f25f9-5785-4510-a38f-a62f188eb9f8/resourceGroups/apptest/providers/microsoft.eventhub/namespaces/mynamespace/eventhubs/myeventhub/authorizationrules/myrule",
"marketplacePartnerId": "/subscriptions/abcdeabc-1234-1234-ab12-123a1234567a/resourceGroups/test-rg/providers/Microsoft.Datadog/monitors/dd1",
"logs": [
{
"categoryGroup": "allLogs",
Expand Down
4 changes: 4 additions & 0 deletions .../Microsoft.Insights/preview/2021-05-01-preview/managementGroupDiagnosticSettings_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,10 @@
"workspaceId": {
"type": "string",
"description": "The full ARM resource ID of the Log Analytics workspace to which you would like to send Diagnostic Logs. Example: /subscriptions/4b9e8510-67ab-4e9a-95a9-e2f1e570ea9c/resourceGroups/insights-integration/providers/Microsoft.OperationalInsights/workspaces/viruela2"
},
"marketplacePartnerId": {
"type": "string",
"description": "The full ARM resource ID of the Marketplace resource to which you would like to send Diagnostic Logs."
}
},
"description": "The management group diagnostic settings."
Expand Down
4 changes: 4 additions & 0 deletions ...er/Microsoft.Insights/preview/2021-05-01-preview/subscriptionDiagnosticsSettings_API.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,10 @@
"workspaceId": {
"type": "string",
"description": "The full ARM resource ID of the Log Analytics workspace to which you would like to send Diagnostic Logs. Example: /subscriptions/4b9e8510-67ab-4e9a-95a9-e2f1e570ea9c/resourceGroups/insights-integration/providers/Microsoft.OperationalInsights/workspaces/viruela2"
},
"marketplacePartnerId": {
"type": "string",
"description": "The full ARM resource ID of the Marketplace resource to which you would like to send Diagnostic Logs."
}
},
"description": "The subscription diagnostic settings."
Expand Down
Loading