From 71f334ca0727d9672265f537f47947c9342ceb65 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 27 Apr 2021 03:30:10 +0000 Subject: [PATCH] CodeGen from PR 13815 in Azure/azure-rest-api-specs Merge e58dce71a692f6d0c23acaee4fd1d41922717809 into 4e6a4ff608dde7a2312d13ce0d939e2126aa86e1 --- .../Microsoft.Insights.Application.json | 84 +++++++++++++++++-- .../Microsoft.Insights.Application.json | 22 +++++ .../Microsoft.Insights.Application.json | 78 ++++++++--------- 3 files changed, 137 insertions(+), 47 deletions(-) diff --git a/schemas/2015-05-01/Microsoft.Insights.Application.json b/schemas/2015-05-01/Microsoft.Insights.Application.json index 15d255c334..f6ca5b64a4 100644 --- a/schemas/2015-05-01/Microsoft.Insights.Application.json +++ b/schemas/2015-05-01/Microsoft.Insights.Application.json @@ -1,8 +1,8 @@ { "id": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.Application.json#", "$schema": "http://json-schema.org/draft-04/schema#", - "title": "microsoft.insights", - "description": "microsoft insights Resource Types", + "title": "Microsoft.Insights", + "description": "Microsoft Insights Resource Types", "resourceDefinitions": { "components": { "type": "object", @@ -40,12 +40,6 @@ "type": "array", "items": { "oneOf": [ - { - "$ref": "#/definitions/components_analyticsItems_childResource" - }, - { - "$ref": "#/definitions/components_myanalyticsItems_childResource" - }, { "$ref": "#/definitions/components_Annotations_childResource" }, @@ -60,6 +54,12 @@ }, { "$ref": "#/definitions/components_favorites_childResource" + }, + { + "$ref": "#/definitions/components_analyticsItems_childResource" + }, + { + "$ref": "#/definitions/components_myanalyticsItems_childResource" } ] } @@ -154,6 +154,23 @@ ], "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component." }, + "Type": { + "oneOf": [ + { + "type": "string", + "enum": [ + "query", + "function", + "folder", + "recent" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Enum indicating the type of the Analytics item." + }, "type": { "type": "string", "enum": [ @@ -435,6 +452,23 @@ ], "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component." }, + "Type": { + "oneOf": [ + { + "type": "string", + "enum": [ + "query", + "function", + "folder", + "recent" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Enum indicating the type of the Analytics item." + }, "type": { "type": "string", "enum": [ @@ -1053,6 +1087,23 @@ ], "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component." }, + "Type": { + "oneOf": [ + { + "type": "string", + "enum": [ + "query", + "function", + "folder", + "recent" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Enum indicating the type of the Analytics item." + }, "type": { "type": "string", "enum": [ @@ -1378,6 +1429,23 @@ ], "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component." }, + "Type": { + "oneOf": [ + { + "type": "string", + "enum": [ + "query", + "function", + "folder", + "recent" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Enum indicating the type of the Analytics item." + }, "type": { "type": "string", "enum": [ diff --git a/schemas/2020-02-02-preview/Microsoft.Insights.Application.json b/schemas/2020-02-02-preview/Microsoft.Insights.Application.json index 2fd06cfffb..0a39b8f407 100644 --- a/schemas/2020-02-02-preview/Microsoft.Insights.Application.json +++ b/schemas/2020-02-02-preview/Microsoft.Insights.Application.json @@ -103,6 +103,17 @@ ], "description": "Disable IP masking." }, + "DisableLocalAuth": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Disable Non-AAD based Auth." + }, "Flow_Type": { "oneOf": [ { @@ -117,6 +128,17 @@ ], "description": "Used by the Application Insights system to determine what kind of flow this component was created by. This is to be set to 'Bluefield' when creating/updating a component via the REST API." }, + "ForceCustomerStorageForProfiler": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Force users to create their own storage account for profiler and debugger." + }, "HockeyAppId": { "type": "string", "description": "The unique application ID created when a new application is added to HockeyApp, used for communications with HockeyApp." diff --git a/schemas/2020-10-20/Microsoft.Insights.Application.json b/schemas/2020-10-20/Microsoft.Insights.Application.json index 8747c3e633..292a082af6 100644 --- a/schemas/2020-10-20/Microsoft.Insights.Application.json +++ b/schemas/2020-10-20/Microsoft.Insights.Application.json @@ -35,7 +35,7 @@ "identity": { "oneOf": [ { - "$ref": "#/definitions/ManagedIdentity" + "$ref": "#/definitions/MyWorkbookManagedIdentity" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -138,7 +138,7 @@ "identity": { "oneOf": [ { - "$ref": "#/definitions/ManagedIdentityModel" + "$ref": "#/definitions/WorkbookManagedIdentity" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -212,7 +212,7 @@ } }, "definitions": { - "ManagedIdentity": { + "MyWorkbookManagedIdentity": { "type": "object", "properties": { "type": { @@ -233,39 +233,7 @@ "userAssignedIdentities": { "oneOf": [ { - "$ref": "#/definitions/UserAssignedIdentities" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Customer Managed Identity" - } - }, - "description": "Customer Managed Identity" - }, - "ManagedIdentityModel": { - "type": "object", - "properties": { - "type": { - "oneOf": [ - { - "type": "string", - "enum": [ - "UserAssigned", - "None" - ] - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The identity type." - }, - "userAssignedIdentities": { - "oneOf": [ - { - "$ref": "#/definitions/UserAssignedIdentitiesModel" + "$ref": "#/definitions/MyWorkbookUserAssignedIdentities" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -325,14 +293,41 @@ ], "description": "Properties that contain a private workbook." }, - "UserAssignedIdentities": { + "MyWorkbookUserAssignedIdentities": { "type": "object", "properties": {}, "description": "Customer Managed Identity" }, - "UserAssignedIdentitiesModel": { + "WorkbookManagedIdentity": { "type": "object", - "properties": {}, + "properties": { + "type": { + "oneOf": [ + { + "type": "string", + "enum": [ + "UserAssigned", + "None" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The identity type." + }, + "userAssignedIdentities": { + "oneOf": [ + { + "$ref": "#/definitions/WorkbookUserAssignedIdentities" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Customer Managed Identity" + } + }, "description": "Customer Managed Identity" }, "WorkbookProperties": { @@ -383,6 +378,11 @@ "serializedData" ], "description": "Properties that contain a workbook." + }, + "WorkbookUserAssignedIdentities": { + "type": "object", + "properties": {}, + "description": "Customer Managed Identity" } } } \ No newline at end of file