Skip to content

Commit 54ad712

Browse files
mc3784mc3784
authored
microsoft.automanage 2022-05-04 remove overrides (#19573)
* Adds base for updating Microsoft.Automanage from version preview/2021-04-30-preview to version 2022-05-04 * Updates readme * Updates API version in new specs and examples * fix s360 swagger correctness issues * change targetId to be readonly * fix wrong commit * remove patch from configurationProfileVersion * fix api version * remove overrides * remove overrides and add managedBy
1 parent a4d7a85 commit 54ad712

19 files changed

+21
-367
lines changed

‎specification/automanage/resource-manager/Microsoft.Automanage/stable/2022-05-04/automanage.json

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2143,11 +2143,6 @@
21432143
"title": "configuration",
21442144
"$ref": "#/definitions/ConfigurationDictionary",
21452145
"description": "configuration dictionary of the configuration profile."
2146-
},
2147-
"overrides": {
2148-
"title": "overrides",
2149-
"$ref": "#/definitions/Overrides",
2150-
"description": "overrides of the configuration profile."
21512146
}
21522147
}
21532148
},
@@ -2158,14 +2153,6 @@
21582153
"Antimalware/Enable": true
21592154
}
21602155
},
2161-
"Overrides": {
2162-
"description": "The custom overrides for configuration profile",
2163-
"type": "array",
2164-
"items": {
2165-
"type": "object"
2166-
},
2167-
"x-ms-identifiers": []
2168-
},
21692156
"ConfigurationProfileUpdate": {
21702157
"description": "Definition of the configuration profile.",
21712158
"type": "object",
@@ -2204,6 +2191,11 @@
22042191
"$ref": "#/definitions/ConfigurationProfileAssignmentProperties",
22052192
"description": "Properties of the configuration profile assignment."
22062193
},
2194+
"managedBy": {
2195+
"readOnly": true,
2196+
"description": "Azure resource id. Indicates if this resource is managed by another Azure resource.",
2197+
"$ref": "#/definitions/ManagedBy"
2198+
},
22072199
"systemData": {
22082200
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/systemData",
22092201
"readOnly": true,
@@ -2233,20 +2225,9 @@
22332225
"type": "string",
22342226
"readOnly": true,
22352227
"description": "The status of onboarding, which only appears in the response."
2236-
},
2237-
"profileOverrides": {
2238-
"$ref": "#/definitions/ConfigurationProfileAssignmentProfileOverrides",
2239-
"description": "The profileOverrides setting for the configuration profile assignment."
22402228
}
22412229
}
22422230
},
2243-
"ConfigurationProfileAssignmentProfileOverrides": {
2244-
"description": "Data related to configuration profile assignment profile overrides.",
2245-
"type": "object",
2246-
"additionalProperties": {
2247-
"type": "object"
2248-
}
2249-
},
22502231
"UpdateResource": {
22512232
"description": "Represents an update resource",
22522233
"type": "object",
@@ -2433,6 +2414,10 @@
24332414
"description": "Returns the contributor RBAC Role exist or not for the Service Principal Id."
24342415
}
24352416
}
2417+
},
2418+
"ManagedBy": {
2419+
"type": "string",
2420+
"description": "Azure resource id. Indicates if this resource is managed by another Azure resource."
24362421
}
24372422
},
24382423
"parameters": {

‎specification/automanage/resource-manager/Microsoft.Automanage/stable/2022-05-04/examples/createOrUpdateConfigurationProfile.json

Lines changed: 3 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,7 @@
2020
"GuestConfiguration/Enable": true,
2121
"LogAnalytics/Enable": true,
2222
"BootDiagnostics/Enable": true
23-
},
24-
"overrides": [
25-
{
26-
"priority": 100,
27-
"if": {
28-
"field": "$.location",
29-
"equals": "eastus"
30-
},
31-
"then": {
32-
"LogAnalytics/Enable": true,
33-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/eastus",
34-
"LogAnalytics/Reprovision": true
35-
}
36-
},
37-
{
38-
"priority": 200,
39-
"if": {
40-
"field": "$.location",
41-
"equals": "centralcanada"
42-
},
43-
"then": {
44-
"LogAnalytics/Enable": true,
45-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/centralcanada",
46-
"LogAnalytics/Reprovision": true
47-
}
48-
}
49-
]
23+
}
5024
}
5125
}
5226
},
@@ -72,33 +46,7 @@
7246
"GuestConfiguration/Enable": true,
7347
"LogAnalytics/Enable": true,
7448
"BootDiagnostics/Enable": true
75-
},
76-
"overrides": [
77-
{
78-
"priority": 100,
79-
"if": {
80-
"field": "$.location",
81-
"equals": "eastus"
82-
},
83-
"then": {
84-
"LogAnalytics/Enable": true,
85-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/eastus",
86-
"LogAnalytics/Reprovision": true
87-
}
88-
},
89-
{
90-
"priority": 200,
91-
"if": {
92-
"field": "$.location",
93-
"equals": "centralcanada"
94-
},
95-
"then": {
96-
"LogAnalytics/Enable": true,
97-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/centralcanada",
98-
"LogAnalytics/Reprovision": true
99-
}
100-
}
101-
]
49+
}
10250
},
10351
"systemData": {
10452
"createdBy": "[email protected]",
@@ -131,33 +79,7 @@
13179
"GuestConfiguration/Enable": true,
13280
"LogAnalytics/Enable": true,
13381
"BootDiagnostics/Enable": true
134-
},
135-
"overrides": [
136-
{
137-
"priority": 100,
138-
"if": {
139-
"field": "$.location",
140-
"equals": "eastus"
141-
},
142-
"then": {
143-
"LogAnalytics/Enable": true,
144-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/eastus",
145-
"LogAnalytics/Reprovision": true
146-
}
147-
},
148-
{
149-
"priority": 200,
150-
"if": {
151-
"field": "$.location",
152-
"equals": "centralcanada"
153-
},
154-
"then": {
155-
"LogAnalytics/Enable": true,
156-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/centralcanada",
157-
"LogAnalytics/Reprovision": true
158-
}
159-
}
160-
]
82+
}
16183
},
16284
"systemData": {
16385
"createdBy": "[email protected]",

‎specification/automanage/resource-manager/Microsoft.Automanage/stable/2022-05-04/examples/createOrUpdateConfigurationProfileAssignment.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"properties": {
2121
"targetId": "/subscriptions/subscriptionId/resourceGroups/myResourceGroupName/providers/Microsoft.Compute/virtualMachines/myVMName",
2222
"configurationProfile": "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction",
23-
"profileOverrides": null,
2423
"status": null
2524
},
2625
"systemData": {
@@ -41,7 +40,6 @@
4140
"properties": {
4241
"targetId": "/subscriptions/subscriptionId/resourceGroups/myResourceGroupName/providers/Microsoft.Compute/virtualMachines/myVMName",
4342
"configurationProfile": "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction",
44-
"profileOverrides": null,
4543
"status": null
4644
},
4745
"systemData": {

‎specification/automanage/resource-manager/Microsoft.Automanage/stable/2022-05-04/examples/createOrUpdateConfigurationProfileHCIAssignment.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"properties": {
2121
"targetId": "/subscriptions/subscriptionId/resourceGroups/myResourceGroupName/providers/Microsoft.AzureStackHci/clusters/myClusterName",
2222
"configurationProfile": "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction",
23-
"profileOverrides": null,
2423
"status": null
2524
},
2625
"systemData": {
@@ -41,7 +40,6 @@
4140
"properties": {
4241
"targetId": "/subscriptions/subscriptionId/resourceGroups/myResourceGroupName/providers/Microsoft.AzureStackHci/clusters/myClusterName",
4342
"configurationProfile": "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction",
44-
"profileOverrides": null,
4543
"status": null
4644
},
4745
"systemData": {

‎specification/automanage/resource-manager/Microsoft.Automanage/stable/2022-05-04/examples/createOrUpdateConfigurationProfileHCRPAssignment.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"properties": {
2121
"targetId": "/subscriptions/subscriptionId/resourceGroups/myResourceGroupName/providers/Microsoft.HybridCompute/machines/myMachineName",
2222
"configurationProfile": "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction",
23-
"profileOverrides": null,
2423
"status": null
2524
},
2625
"systemData": {
@@ -41,7 +40,6 @@
4140
"properties": {
4241
"targetId": "/subscriptions/subscriptionId/resourceGroups/myResourceGroupName/providers/Microsoft.HybridCompute/machines/myMachineName",
4342
"configurationProfile": "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction",
44-
"profileOverrides": null,
4543
"status": null
4644
},
4745
"systemData": {

‎specification/automanage/resource-manager/Microsoft.Automanage/stable/2022-05-04/examples/createOrUpdateConfigurationProfileVersion.json

Lines changed: 3 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,7 @@
2121
"GuestConfiguration/Enable": true,
2222
"LogAnalytics/Enable": true,
2323
"BootDiagnostics/Enable": true
24-
},
25-
"overrides": [
26-
{
27-
"priority": 100,
28-
"if": {
29-
"field": "$.location",
30-
"equals": "eastus"
31-
},
32-
"then": {
33-
"LogAnalytics/Enable": true,
34-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/eastus",
35-
"LogAnalytics/Reprovision": true
36-
}
37-
},
38-
{
39-
"priority": 200,
40-
"if": {
41-
"field": "$.location",
42-
"equals": "centralcanada"
43-
},
44-
"then": {
45-
"LogAnalytics/Enable": true,
46-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/centralcanada",
47-
"LogAnalytics/Reprovision": true
48-
}
49-
}
50-
]
24+
}
5125
}
5226
}
5327
},
@@ -73,33 +47,7 @@
7347
"GuestConfiguration/Enable": true,
7448
"LogAnalytics/Enable": true,
7549
"BootDiagnostics/Enable": true
76-
},
77-
"overrides": [
78-
{
79-
"priority": 100,
80-
"if": {
81-
"field": "$.location",
82-
"equals": "eastus"
83-
},
84-
"then": {
85-
"LogAnalytics/Enable": true,
86-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/eastus",
87-
"LogAnalytics/Reprovision": true
88-
}
89-
},
90-
{
91-
"priority": 200,
92-
"if": {
93-
"field": "$.location",
94-
"equals": "centralcanada"
95-
},
96-
"then": {
97-
"LogAnalytics/Enable": true,
98-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/centralcanada",
99-
"LogAnalytics/Reprovision": true
100-
}
101-
}
102-
]
50+
}
10351
},
10452
"systemData": {
10553
"createdBy": "[email protected]",
@@ -132,33 +80,7 @@
13280
"GuestConfiguration/Enable": true,
13381
"LogAnalytics/Enable": true,
13482
"BootDiagnostics/Enable": true
135-
},
136-
"overrides": [
137-
{
138-
"priority": 100,
139-
"if": {
140-
"field": "$.location",
141-
"equals": "eastus"
142-
},
143-
"then": {
144-
"LogAnalytics/Enable": true,
145-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/eastus",
146-
"LogAnalytics/Reprovision": true
147-
}
148-
},
149-
{
150-
"priority": 200,
151-
"if": {
152-
"field": "$.location",
153-
"equals": "centralcanada"
154-
},
155-
"then": {
156-
"LogAnalytics/Enable": true,
157-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/centralcanada",
158-
"LogAnalytics/Reprovision": true
159-
}
160-
}
161-
]
83+
}
16284
},
16385
"systemData": {
16486
"createdBy": "[email protected]",

‎specification/automanage/resource-manager/Microsoft.Automanage/stable/2022-05-04/examples/getConfigurationProfile.json

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,7 @@
2727
"GuestConfiguration/Enable": true,
2828
"LogAnalytics/Enable": true,
2929
"BootDiagnostics/Enable": true
30-
},
31-
"overrides": [
32-
{
33-
"priority": 100,
34-
"if": {
35-
"field": "$.location",
36-
"equals": "eastus"
37-
},
38-
"then": {
39-
"LogAnalytics/Enable": true,
40-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/eastus",
41-
"LogAnalytics/Reprovision": true
42-
}
43-
},
44-
{
45-
"priority": 200,
46-
"if": {
47-
"field": "$.location",
48-
"equals": "centralcanada"
49-
},
50-
"then": {
51-
"LogAnalytics/Enable": true,
52-
"LogAnalytics/Workspace": "/subscriptions/abc/resourceGroups/xyz/providers/Microsoft.La/Workspaces/centralcanada",
53-
"LogAnalytics/Reprovision": true
54-
}
55-
}
56-
]
30+
}
5731
},
5832
"systemData": {
5933
"createdBy": "[email protected]",

‎specification/automanage/resource-manager/Microsoft.Automanage/stable/2022-05-04/examples/getConfigurationProfileAssignment.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"properties": {
1717
"targetId": "/subscriptions/subscriptionId/resourceGroups/myResourceGroupName/providers/Microsoft.Compute/virtualMachines/myVMName",
1818
"configurationProfile": "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesDevTest",
19-
"profileOverrides": null,
2019
"status": "Compliant"
2120
},
2221
"systemData": {

‎specification/automanage/resource-manager/Microsoft.Automanage/stable/2022-05-04/examples/getConfigurationProfileHCIAssignment.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"properties": {
1717
"targetId": "/subscriptions/subscriptionId/resourceGroups/myResourceGroupName/Microsoft.AzureStackHci/clusters/machines/myClusterName",
1818
"configurationProfile": "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesDevTest",
19-
"profileOverrides": null,
2019
"status": "Compliant"
2120
},
2221
"systemData": {

‎specification/automanage/resource-manager/Microsoft.Automanage/stable/2022-05-04/examples/getConfigurationProfileHCRPAssignment.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"properties": {
1717
"targetId": "/subscriptions/subscriptionId/resourceGroups/myResourceGroupName/providers/Microsoft.HybridCompute/machines/myMachineName",
1818
"configurationProfile": "/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesDevTest",
19-
"profileOverrides": null,
2019
"status": "Compliant"
2120
},
2221
"systemData": {

0 commit comments

Comments
 (0)