S360 (Azure#14362)

* Add dividePerInstance property to the autoscale metric trigger * Update examples for autoscale to include 'dividePerInstance' * Update examples for correctness * update example for correctness * swagger corrections * remove entry from wrong tag * fix boolean as string validation error * validation fix * added missing lifter changes * add recommended linter suppression
mkarmark · Jul 20, 2021 · d90218d · d90218d
1 parent 581a4af
commit d90218d
Show file tree

Hide file tree

Showing 28 changed files with 2,210 additions and 17 deletions.
diff --git a/...ager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json b/...ager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json
@@ -36,7 +36,7 @@
     }
   },
   "paths": {
-    "/{resourceUri}/providers/microsoft.insights/diagnosticSettingsCategories/{name}": {
+    "/{resourceUri}/providers/Microsoft.Insights/diagnosticSettingsCategories/{name}": {
       "get": {
         "tags": [
           "DiagnosticSettingsCategories"
@@ -75,7 +75,7 @@
         }
       }
     },
-    "/{resourceUri}/providers/microsoft.insights/diagnosticSettingsCategories": {
+    "/{resourceUri}/providers/Microsoft.Insights/diagnosticSettingsCategories": {
       "get": {
         "tags": [
           "DiagnosticSettingsCategories"

diff --git a/...source-manager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettings_API.json b/...source-manager/Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettings_API.json
@@ -36,7 +36,7 @@
     }
   },
   "paths": {
-    "/{resourceUri}/providers/microsoft.insights/diagnosticSettings/{name}": {
+    "/{resourceUri}/providers/Microsoft.Insights/diagnosticSettings/{name}": {
       "get": {
         "tags": [
           "DiagnosticSettings"
@@ -158,7 +158,7 @@
         }
       }
     },
-    "/{resourceUri}/providers/microsoft.insights/diagnosticSettings": {
+    "/{resourceUri}/providers/Microsoft.Insights/diagnosticSettings": {
       "get": {
         "tags": [
           "DiagnosticSettings"

diff --git a/...source-manager/Microsoft.Insights/preview/2021-05-01-preview/diagnosticsSettings_API.json b/...source-manager/Microsoft.Insights/preview/2021-05-01-preview/diagnosticsSettings_API.json
@@ -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.)"

diff --git a/...crosoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateDiagnosticSetting.json b/...crosoft.Insights/preview/2021-05-01-preview/examples/createOrUpdateDiagnosticSetting.json
@@ -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",
@@ -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",

diff --git a/...s/preview/2021-05-01-preview/examples/createOrUpdateManagementGroupDiagnosticSetting.json b/...s/preview/2021-05-01-preview/examples/createOrUpdateManagementGroupDiagnosticSetting.json
@@ -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",
@@ -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",

diff --git a/...ghts/preview/2021-05-01-preview/examples/createOrUpdateSubscriptionDiagnosticSetting.json b/...ghts/preview/2021-05-01-preview/examples/createOrUpdateSubscriptionDiagnosticSetting.json
@@ -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",
@@ -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",

diff --git a/...-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getDiagnosticSetting.json b/...-manager/Microsoft.Insights/preview/2021-05-01-preview/examples/getDiagnosticSetting.json
@@ -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",

diff --git a/...oft.Insights/preview/2021-05-01-preview/examples/getManagementGroupDiagnosticSetting.json b/...oft.Insights/preview/2021-05-01-preview/examples/getManagementGroupDiagnosticSetting.json
@@ -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",

diff --git a/...rosoft.Insights/preview/2021-05-01-preview/examples/getSubscriptionDiagnosticSetting.json b/...rosoft.Insights/preview/2021-05-01-preview/examples/getSubscriptionDiagnosticSetting.json
@@ -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",

diff --git a/...anager/Microsoft.Insights/preview/2021-05-01-preview/examples/listDiagnosticSettings.json b/...anager/Microsoft.Insights/preview/2021-05-01-preview/examples/listDiagnosticSettings.json
@@ -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",

diff --git a/...t.Insights/preview/2021-05-01-preview/examples/listManagementGroupDiagnosticSettings.json b/...t.Insights/preview/2021-05-01-preview/examples/listManagementGroupDiagnosticSettings.json
@@ -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",

diff --git a/...soft.Insights/preview/2021-05-01-preview/examples/listSubscriptionDiagnosticSettings.json b/...soft.Insights/preview/2021-05-01-preview/examples/listSubscriptionDiagnosticSettings.json
@@ -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",

diff --git a/.../Microsoft.Insights/preview/2021-05-01-preview/managementGroupDiagnosticSettings_API.json b/.../Microsoft.Insights/preview/2021-05-01-preview/managementGroupDiagnosticSettings_API.json
@@ -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."

diff --git a/...er/Microsoft.Insights/preview/2021-05-01-preview/subscriptionDiagnosticsSettings_API.json b/...er/Microsoft.Insights/preview/2021-05-01-preview/subscriptionDiagnosticsSettings_API.json
@@ -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."