Skip to content

Commit 2eaaf1f

Browse files
author
SDKAuto
committed
CodeGen from PR 15507 in Azure/azure-rest-api-specs
[Hub Generated] Review request for Microsoft.Aadiam to add version preview/2017-04-01-preview (#15507) * Adds base for updating Microsoft.Aadiam from version stable/2017-04-01 to version 2017-04-01-preview * Updates readme * Updates API version in new specs and examples * Try to resolve ModelValidation errors * Another try for ModelValidation * Fix model validation * Remove breaking change * Try python fix * Fix python job failure
1 parent 6a51b29 commit 2eaaf1f

File tree

2 files changed

+172
-0
lines changed

2 files changed

+172
-0
lines changed

‎schemas/2017-04-01-preview/Microsoft.Aadiam.json‎

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
{
2+
"id": "https://schema.management.azure.com/schemas/2017-04-01-preview/Microsoft.Aadiam.json#",
3+
"$schema": "http://json-schema.org/draft-04/schema#",
4+
"title": "microsoft.aadiam",
5+
"description": "microsoft aadiam Resource Types",
6+
"resourceDefinitions": {},
7+
"tenant_resourceDefinitions": {
8+
"diagnosticSettings": {
9+
"type": "object",
10+
"properties": {
11+
"apiVersion": {
12+
"type": "string",
13+
"enum": [
14+
"2017-04-01-preview"
15+
]
16+
},
17+
"name": {
18+
"type": "string",
19+
"description": "The name of the diagnostic setting."
20+
},
21+
"properties": {
22+
"oneOf": [
23+
{
24+
"$ref": "#/definitions/DiagnosticSettings"
25+
},
26+
{
27+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
28+
}
29+
],
30+
"description": "The diagnostic settings."
31+
},
32+
"type": {
33+
"type": "string",
34+
"enum": [
35+
"microsoft.aadiam/diagnosticSettings"
36+
]
37+
}
38+
},
39+
"required": [
40+
"apiVersion",
41+
"name",
42+
"properties",
43+
"type"
44+
],
45+
"description": "microsoft.aadiam/diagnosticSettings"
46+
}
47+
},
48+
"definitions": {
49+
"DiagnosticSettings": {
50+
"type": "object",
51+
"properties": {
52+
"eventHubAuthorizationRuleId": {
53+
"type": "string",
54+
"description": "The resource Id for the event hub authorization rule."
55+
},
56+
"eventHubName": {
57+
"type": "string",
58+
"description": "The name of the event hub. If none is specified, the default event hub will be selected."
59+
},
60+
"logs": {
61+
"oneOf": [
62+
{
63+
"type": "array",
64+
"items": {
65+
"$ref": "#/definitions/LogSettings"
66+
}
67+
},
68+
{
69+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
70+
}
71+
],
72+
"description": "The list of logs settings."
73+
},
74+
"serviceBusRuleId": {
75+
"type": "string",
76+
"description": "The service bus rule Id of the diagnostic setting. This is here to maintain backwards compatibility."
77+
},
78+
"storageAccountId": {
79+
"type": "string",
80+
"description": "The resource ID of the storage account to which you would like to send Diagnostic Logs."
81+
},
82+
"workspaceId": {
83+
"type": "string",
84+
"description": "The workspace ID (resource ID of a Log Analytics workspace) for a 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"
85+
}
86+
},
87+
"description": "The diagnostic settings."
88+
},
89+
"LogSettings": {
90+
"type": "object",
91+
"properties": {
92+
"category": {
93+
"oneOf": [
94+
{
95+
"type": "string",
96+
"enum": [
97+
"AuditLogs",
98+
"SignInLogs"
99+
]
100+
},
101+
{
102+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
103+
}
104+
],
105+
"description": "Name of a Diagnostic Log category for a resource type this setting is applied to. To obtain the list of Diagnostic Log categories for a resource, first perform a GET diagnostic settings operation."
106+
},
107+
"enabled": {
108+
"oneOf": [
109+
{
110+
"type": "boolean"
111+
},
112+
{
113+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
114+
}
115+
],
116+
"description": "A value indicating whether this log is enabled."
117+
},
118+
"retentionPolicy": {
119+
"oneOf": [
120+
{
121+
"$ref": "#/definitions/RetentionPolicy"
122+
},
123+
{
124+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
125+
}
126+
],
127+
"description": "Specifies the retention policy for the log."
128+
}
129+
},
130+
"required": [
131+
"enabled"
132+
],
133+
"description": "Part of MultiTenantDiagnosticSettings. Specifies the settings for a particular log."
134+
},
135+
"RetentionPolicy": {
136+
"type": "object",
137+
"properties": {
138+
"days": {
139+
"oneOf": [
140+
{
141+
"type": "integer",
142+
"minimum": 0
143+
},
144+
{
145+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
146+
}
147+
],
148+
"description": "The number of days for the retention in days. A value of 0 will retain the events indefinitely."
149+
},
150+
"enabled": {
151+
"oneOf": [
152+
{
153+
"type": "boolean"
154+
},
155+
{
156+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
157+
}
158+
],
159+
"description": "A value indicating whether the retention policy is enabled."
160+
}
161+
},
162+
"required": [
163+
"days",
164+
"enabled"
165+
],
166+
"description": "Specifies the retention policy for the log."
167+
}
168+
}
169+
}

‎schemas/2019-08-01/tenantDeploymentTemplate.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,9 @@
505505
{
506506
"$ref": "https://schema.management.azure.com/schemas/2017-04-01/Microsoft.Aadiam.json#/tenant_resourceDefinitions/diagnosticSettings"
507507
},
508+
{
509+
"$ref": "https://schema.management.azure.com/schemas/2017-04-01-preview/Microsoft.Aadiam.json#/tenant_resourceDefinitions/diagnosticSettings"
510+
},
508511
{
509512
"$ref": "https://schema.management.azure.com/schemas/2015-07-01/Microsoft.Authorization.Authz.json#/unknown_resourceDefinitions/roleAssignments"
510513
},

0 commit comments

Comments
 (0)