From f9779a7f2e85d5d6d9025cea183386f57e163931 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Fri, 21 Aug 2020 05:58:39 +0000 Subject: [PATCH] Generated from 2c63540054e18b3c77c2533682f1f10493c1b275 fix x-ms-enum issue. --- .../CreateUIDefinition.CommonControl.json | 89 +++++++++ .../deploymentTemplate.json | 3 + schemas/2015-01-01/deploymentTemplate.json | 3 + schemas/2015-05-01/Microsoft.Insights.json | 146 +++++++++++++- .../microsoft.insights.json | 130 +++++++++++++ schemas/2019-04-01/deploymentTemplate.json | 3 + .../Microsoft.AppPlatform.json | 8 +- .../microsoft.insights.json | 181 +++++++++++++++++- 8 files changed, 560 insertions(+), 3 deletions(-) create mode 100644 schemas/2018-06-17-preview/microsoft.insights.json diff --git a/schemas/0.1.2-preview/CreateUIDefinition.CommonControl.json b/schemas/0.1.2-preview/CreateUIDefinition.CommonControl.json index 7b3757dfeb..336fc48442 100644 --- a/schemas/0.1.2-preview/CreateUIDefinition.CommonControl.json +++ b/schemas/0.1.2-preview/CreateUIDefinition.CommonControl.json @@ -40,6 +40,9 @@ }, { "$ref": "#/definitions/Microsoft.Compute.CredentialsCombo-linux" + }, + { + "$ref": "#/definitions/Microsoft.Common.EditableGrid" } ], "definitions": { @@ -885,6 +888,92 @@ "label", "osPlatform" ] + }, + "Microsoft.Common.EditableGrid": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Common.EditableGrid" + ] + }, + "label": { + "type": "string" + }, + "ariaLabel": { + "type": "string" + }, + "constraints": { + "type": "object", + "properties": { + "columns": { + "type": "array", + "items": { + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "header": { + "type": "string" + }, + "width": { + "type": "string" + }, + "element": { + "type": "object" + } + }, + "additionalProperties": false, + "required": [ + "id", + "header", + "element" + ] + }, + "minItems": 1 + }, + "rows": { + "type": "object", + "properties": { + "count": { + "type": "object", + "properties": { + "min": { + "type": "integer" + }, + "max": { + "type": "integer" + } + } + } + } + }, + "width": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "columns" + ] + }, + "visible": { + "type": [ "boolean", "string" ] + } + }, + "additionalProperties": false, + "required": [ + "name", + "type", + "label", + "ariaLabel", + "constraints" + ] } } } \ No newline at end of file diff --git a/schemas/2014-04-01-preview/deploymentTemplate.json b/schemas/2014-04-01-preview/deploymentTemplate.json index a235f01ce8..2cdf17a50e 100644 --- a/schemas/2014-04-01-preview/deploymentTemplate.json +++ b/schemas/2014-04-01-preview/deploymentTemplate.json @@ -619,9 +619,12 @@ { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Sql.json#/resourceDefinitions/servers_elasticPools" }, { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Sql.json#/resourceDefinitions/servers_firewallRules" }, { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/components" }, + { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/workbooks" }, + { "$ref": "https://schema.management.azure.com/schemas/2018-06-17-preview/microsoft.insights.json#/resourceDefinitions/workbooks" }, { "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes" }, { "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes_privateEndpointConnections" }, { "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes_scopedResources" }, + { "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/workbooktemplates" }, { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/webtests" }, { "$ref": "https://schema.management.azure.com/schemas/2015-05-01-preview/Microsoft.Sql.json#/resourceDefinitions/managedInstances" }, { "$ref": "https://schema.management.azure.com/schemas/2015-05-01-preview/Microsoft.Sql.json#/resourceDefinitions/servers" }, diff --git a/schemas/2015-01-01/deploymentTemplate.json b/schemas/2015-01-01/deploymentTemplate.json index baf14f06a3..a3b731fa41 100644 --- a/schemas/2015-01-01/deploymentTemplate.json +++ b/schemas/2015-01-01/deploymentTemplate.json @@ -719,9 +719,12 @@ { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Sql.json#/resourceDefinitions/servers_elasticPools" }, { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Sql.json#/resourceDefinitions/servers_firewallRules" }, { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/components" }, + { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/workbooks" }, + { "$ref": "https://schema.management.azure.com/schemas/2018-06-17-preview/microsoft.insights.json#/resourceDefinitions/workbooks" }, { "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes" }, { "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes_privateEndpointConnections" }, { "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes_scopedResources" }, + { "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/workbooktemplates" }, { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/webtests" }, { "$ref": "https://schema.management.azure.com/schemas/2015-05-01-preview/Microsoft.Sql.json#/resourceDefinitions/managedInstances" }, { "$ref": "https://schema.management.azure.com/schemas/2015-05-01-preview/Microsoft.Sql.json#/resourceDefinitions/servers" }, diff --git a/schemas/2015-05-01/Microsoft.Insights.json b/schemas/2015-05-01/Microsoft.Insights.json index 34dc4e4b79..75edd5d091 100644 --- a/schemas/2015-05-01/Microsoft.Insights.json +++ b/schemas/2015-05-01/Microsoft.Insights.json @@ -139,6 +139,79 @@ "properties" ], "description": "Microsoft.Insights/webtests" + }, + "workbooks": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2015-05-01" + ] + }, + "kind": { + "oneOf": [ + { + "type": "string", + "enum": [ + "user", + "shared" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The kind of workbook. Choices are user and shared." + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "The name of the Application Insights component resource." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/WorkbookProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties that contain a workbook." + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags" + }, + "type": { + "type": "string", + "enum": [ + "microsoft.insights/workbooks" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "microsoft.insights/workbooks" } }, "definitions": { @@ -338,6 +411,77 @@ } }, "description": "An XML configuration specification for a WebTest." + }, + "WorkbookProperties": { + "type": "object", + "properties": { + "category": { + "type": "string", + "description": "Workbook category, as defined by the user at creation time." + }, + "kind": { + "oneOf": [ + { + "type": "string", + "enum": [ + "user", + "shared" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Enum indicating if this workbook definition is owned by a specific user or is shared between all users with access to the Application Insights component." + }, + "name": { + "type": "string", + "description": "The user-defined name of the workbook." + }, + "serializedData": { + "type": "string", + "description": "Configuration of this particular workbook. Configuration data is a string containing valid JSON" + }, + "sourceResourceId": { + "type": "string", + "description": "Optional resourceId for a source resource." + }, + "tags": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A list of 0 or more tags that are associated with this workbook definition" + }, + "userId": { + "type": "string", + "description": "Unique user id of the specific user that owns this workbook." + }, + "version": { + "type": "string", + "description": "This instance's version of the data model. This can change as new features are added that can be marked workbook." + }, + "workbookId": { + "type": "string", + "description": "Internally assigned unique id of the workbook definition." + } + }, + "required": [ + "category", + "kind", + "name", + "serializedData", + "userId", + "workbookId" + ], + "description": "Properties that contain a workbook." } } -} +} \ No newline at end of file diff --git a/schemas/2018-06-17-preview/microsoft.insights.json b/schemas/2018-06-17-preview/microsoft.insights.json new file mode 100644 index 0000000000..582371c466 --- /dev/null +++ b/schemas/2018-06-17-preview/microsoft.insights.json @@ -0,0 +1,130 @@ +{ + "id": "https://schema.management.azure.com/schemas/2018-06-17-preview/microsoft.insights.json#", + "$schema": "http://json-schema.org/draft-04/schema#", + "title": "microsoft.insights", + "description": "microsoft insights Resource Types", + "resourceDefinitions": { + "workbooks": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2018-06-17-preview" + ] + }, + "kind": { + "oneOf": [ + { + "type": "string", + "enum": [ + "user", + "shared" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The kind of workbook. Choices are user and shared." + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "The name of the Application Insights component resource." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/WorkbookProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties that contain a workbook." + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags" + }, + "type": { + "type": "string", + "enum": [ + "microsoft.insights/workbooks" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "microsoft.insights/workbooks" + } + }, + "definitions": { + "WorkbookProperties": { + "type": "object", + "properties": { + "category": { + "type": "string", + "description": "Workbook category, as defined by the user at creation time." + }, + "displayName": { + "type": "string", + "description": "The user-defined name (display name) of the workbook." + }, + "serializedData": { + "type": "string", + "description": "Configuration of this particular workbook. Configuration data is a string containing valid JSON" + }, + "tags": { + "oneOf": [ + { + "type": "array", + "items": { + "type": "string" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "A list of 0 or more tags that are associated with this workbook definition" + }, + "userId": { + "type": "string", + "description": "Unique user id of the specific user that owns this workbook." + }, + "version": { + "type": "string", + "description": "Workbook version" + } + }, + "required": [ + "category", + "displayName", + "serializedData", + "userId" + ], + "description": "Properties that contain a workbook." + } + } +} diff --git a/schemas/2019-04-01/deploymentTemplate.json b/schemas/2019-04-01/deploymentTemplate.json index 195898e904..ac810a4170 100644 --- a/schemas/2019-04-01/deploymentTemplate.json +++ b/schemas/2019-04-01/deploymentTemplate.json @@ -154,9 +154,11 @@ { "$ref": "https://schema.management.azure.com/schemas/2020-06-14/Microsoft.Kusto.json#/resourceDefinitions/clusters_databases_principalassignments" }, { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/alertrules" }, { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/components" }, + { "$ref": "https://schema.management.azure.com/schemas/2018-06-17-preview/microsoft.insights.json#/resourceDefinitions/workbooks" }, { "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes" }, { "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes_privateEndpointConnections" }, { "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes_scopedResources" }, + { "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/workbooktemplates" }, { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/autoscalesettings" }, { "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Insights.json#/resourceDefinitions/webtests" }, { "$ref": "https://schema.management.azure.com/schemas/2015-11-01/Microsoft.Network.json#/resourceDefinitions/trafficManagerProfiles" }, @@ -334,6 +336,7 @@ { "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.Insights.json#/resourceDefinitions/actionGroups" }, { "$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.Insights.json#/resourceDefinitions/activityLogAlerts" }, { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/components" }, + { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/workbooks" }, { "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/webtests" }, { "$ref": "https://schema.management.azure.com/schemas/2017-08-01/Microsoft.Network.json#/resourceDefinitions/publicIPAddresses" }, { "$ref": "https://schema.management.azure.com/schemas/2017-08-01/Microsoft.Network.json#/resourceDefinitions/virtualNetworks" }, diff --git a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json index 944eaf5118..7d55877ade 100644 --- a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json +++ b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json @@ -684,13 +684,18 @@ ], "description": "Required Memory size in GB, basic tier should be in range (1, 2), standard tier should be in range (1, 8)" }, + "netCoreMainEntryPath": { + "type": "string", + "description": "The path to the .NET executable relative to zip root" + }, "runtimeVersion": { "oneOf": [ { "type": "string", "enum": [ "Java_8", - "Java_11" + "Java_11", + "NetCore_31" ] }, { @@ -1181,6 +1186,7 @@ "type": "string", "enum": [ "Jar", + "NetCoreZip", "Source" ] }, diff --git a/schemas/2019-10-17-preview/microsoft.insights.json b/schemas/2019-10-17-preview/microsoft.insights.json index 84bf58ced6..df3aa36f87 100644 --- a/schemas/2019-10-17-preview/microsoft.insights.json +++ b/schemas/2019-10-17-preview/microsoft.insights.json @@ -153,6 +153,65 @@ "type" ], "description": "Microsoft.Insights/privateLinkScopes/scopedResources" + }, + "workbooktemplates": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2019-10-17-preview" + ] + }, + "location": { + "type": "string", + "description": "Resource location" + }, + "name": { + "type": "string", + "description": "The name of the Application Insights component resource." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/WorkbookTemplateProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties that contain a workbook template." + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags" + }, + "type": { + "type": "string", + "enum": [ + "microsoft.insights/workbooktemplates" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "microsoft.insights/workbooktemplates" } }, "definitions": { @@ -304,6 +363,126 @@ } }, "description": "Properties of a private link scoped resource." + }, + "WorkbookTemplateGallery": { + "type": "object", + "properties": { + "category": { + "type": "string", + "description": "Category for the gallery." + }, + "name": { + "type": "string", + "description": "Name of the workbook template in the gallery." + }, + "order": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Order of the template within the gallery." + }, + "resourceType": { + "type": "string", + "description": "Azure resource type supported by the gallery." + }, + "type": { + "type": "string", + "description": "Type of workbook supported by the workbook template." + } + }, + "description": "Gallery information for a workbook template." + }, + "WorkbookTemplateLocalizedGallery": { + "type": "object", + "properties": { + "galleries": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/WorkbookTemplateGallery" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Workbook galleries supported by the template." + }, + "templateData": { + "type": "object", + "properties": {}, + "description": "Valid JSON object containing workbook template payload." + } + }, + "description": "Localized template data and gallery information." + }, + "WorkbookTemplateProperties": { + "type": "object", + "properties": { + "author": { + "type": "string", + "description": "Information about the author of the workbook template." + }, + "galleries": { + "oneOf": [ + { + "type": "array", + "items": { + "$ref": "#/definitions/WorkbookTemplateGallery" + } + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Workbook galleries supported by the template." + }, + "localized": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "array", + "items": { + "$ref": "#/definitions/WorkbookTemplateLocalizedGallery" + } + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Key value pair of localized gallery. Each key is the locale code of languages supported by the Azure portal." + }, + "priority": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Priority of the template. Determines which template to open when a workbook gallery is opened in viewer mode." + }, + "templateData": { + "type": "object", + "properties": {}, + "description": "Valid JSON object containing workbook template payload." + } + }, + "required": [ + "galleries", + "templateData" + ], + "description": "Properties that contain a workbook template." } } -} \ No newline at end of file +}