Skip to content

Commit 41b0462

Browse files
thomasp98296Thomas Pham
authored and
aviyerMSFT
committed
[Hub Generated] Publish private branch 'main' (Azure#22718)
* Task 17011766: Tenant level AG API review with ARM. * Add definitions for tenant action group CRUD operation APIs * Fix validation errors * Validation error fix * Address PR comments * Add newest actiongroup version to default. Fix code formats * Address PR comment (rename definitions where conficts happenned) * Revert the name change back to "actionGroup" * Resolve conflict * Merge conflict --------- Co-authored-by: Thomas Pham <[email protected]>
1 parent 1e690f9 commit 41b0462

File tree

7 files changed

+1111
-1
lines changed

7 files changed

+1111
-1
lines changed

‎specification/monitor/resource-manager/Microsoft.Insights/preview/2023-03-01-preview/examples/createOrUpdateTenantActionGroup.json

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
{
2+
"parameters": {
3+
"managementGroupId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
4+
"tenantActionGroupName": "testTenantActionGroup",
5+
"api-version": "2023-03-01-preview",
6+
"x-ms-client-tenant-id": "72f988bf-86f1-41af-91ab-2d7cd011db47",
7+
"actionGroup": {
8+
"location": "Global",
9+
"tags": {},
10+
"properties": {
11+
"groupShortName": "sample",
12+
"enabled": true,
13+
"emailReceivers": [
14+
{
15+
"name": "John Doe's email",
16+
"emailAddress": "[email protected]",
17+
"useCommonAlertSchema": false
18+
},
19+
{
20+
"name": "Jane Smith's email",
21+
"emailAddress": "[email protected]",
22+
"useCommonAlertSchema": true
23+
}
24+
],
25+
"smsReceivers": [
26+
{
27+
"name": "John Doe's mobile",
28+
"countryCode": "1",
29+
"phoneNumber": "2062022299"
30+
},
31+
{
32+
"name": "Jane Smith's mobile",
33+
"countryCode": "1",
34+
"phoneNumber": "0987654321"
35+
}
36+
],
37+
"webhookReceivers": [
38+
{
39+
"name": "Sample webhook 1",
40+
"serviceUri": "http://www.example.com/webhook1",
41+
"useCommonAlertSchema": true
42+
},
43+
{
44+
"name": "Sample webhook 2",
45+
"serviceUri": "http://www.example.com/webhook2",
46+
"useCommonAlertSchema": true,
47+
"useAadAuth": true,
48+
"objectId": "d3bb868c-fe44-452c-aa26-769a6538c808",
49+
"identifierUri": "http://someidentifier/d7811ba3-7996-4a93-99b6-6b2f3f355f8a",
50+
"tenantId": "68a4459a-ccb8-493c-b9da-dd30457d1b84"
51+
}
52+
],
53+
"azureAppPushReceivers": [
54+
{
55+
"name": "Sample azureAppPush",
56+
"emailAddress": "[email protected]"
57+
}
58+
],
59+
"voiceReceivers": [
60+
{
61+
"name": "Sample voice",
62+
"countryCode": "1",
63+
"phoneNumber": "2062022299"
64+
}
65+
]
66+
}
67+
}
68+
},
69+
"responses": {
70+
"200": {
71+
"headers": {},
72+
"body": {
73+
"id": "/providers/Microsoft.Management/managementGroups/72f988bf-86f1-41af-91ab-2d7cd011db47/providers/Microsoft.Insights/tenantActionGroups/testTenantActionGroup",
74+
"type": "Microsoft.Insights/TenantActionGroups",
75+
"name": "testTenantActionGroup",
76+
"location": "Global",
77+
"tags": {},
78+
"properties": {
79+
"groupShortName": "sample",
80+
"enabled": true,
81+
"emailReceivers": [
82+
{
83+
"name": "John Doe's email",
84+
"emailAddress": "[email protected]",
85+
"status": "Enabled",
86+
"useCommonAlertSchema": false
87+
},
88+
{
89+
"name": "Jane Smith's email",
90+
"emailAddress": "[email protected]",
91+
"status": "Enabled",
92+
"useCommonAlertSchema": true
93+
}
94+
],
95+
"smsReceivers": [
96+
{
97+
"name": "John Doe's mobile",
98+
"countryCode": "1",
99+
"phoneNumber": "2062022299",
100+
"status": "Enabled"
101+
},
102+
{
103+
"name": "Jane Smith's mobile",
104+
"countryCode": "1",
105+
"phoneNumber": "0987654321",
106+
"status": "Enabled"
107+
}
108+
],
109+
"webhookReceivers": [
110+
{
111+
"name": "Sample webhook 1",
112+
"serviceUri": "http://www.example.com/webhook1",
113+
"useCommonAlertSchema": true
114+
},
115+
{
116+
"name": "Sample webhook 2",
117+
"serviceUri": "http://www.example.com/webhook2",
118+
"useCommonAlertSchema": true,
119+
"useAadAuth": true,
120+
"objectId": "d3bb868c-fe44-452c-aa26-769a6538c808",
121+
"identifierUri": "http://someidentifier/d7811ba3-7996-4a93-99b6-6b2f3f355f8a",
122+
"tenantId": "68a4459a-ccb8-493c-b9da-dd30457d1b84"
123+
}
124+
],
125+
"voiceReceivers": [
126+
{
127+
"name": "Sample voice",
128+
"countryCode": "1",
129+
"phoneNumber": "2062022299"
130+
}
131+
]
132+
}
133+
}
134+
},
135+
"201": {
136+
"headers": {},
137+
"body": {
138+
"id": "/providers/Microsoft.Management/managementGroups/72f988bf-86f1-41af-91ab-2d7cd011db47/providers/Microsoft.Insights/tenantActionGroups/testTenantActionGroup",
139+
"type": "Microsoft.Insights/TenantActionGroups",
140+
"name": "testTenantActionGroup",
141+
"location": "Global",
142+
"tags": {},
143+
"properties": {
144+
"groupShortName": "sample",
145+
"enabled": true,
146+
"emailReceivers": [
147+
{
148+
"name": "John Doe's email",
149+
"emailAddress": "[email protected]",
150+
"status": "Enabled",
151+
"useCommonAlertSchema": false
152+
},
153+
{
154+
"name": "Jane Smith's email",
155+
"emailAddress": "[email protected]",
156+
"status": "Enabled",
157+
"useCommonAlertSchema": true
158+
}
159+
],
160+
"smsReceivers": [
161+
{
162+
"name": "John Doe's mobile",
163+
"countryCode": "1",
164+
"phoneNumber": "2062022299",
165+
"status": "Enabled"
166+
},
167+
{
168+
"name": "Jane Smith's mobile",
169+
"countryCode": "1",
170+
"phoneNumber": "0987654321",
171+
"status": "Enabled"
172+
}
173+
],
174+
"webhookReceivers": [
175+
{
176+
"name": "Sample webhook 1",
177+
"serviceUri": "http://www.example.com/webhook1",
178+
"useCommonAlertSchema": true
179+
},
180+
{
181+
"name": "Sample webhook 2",
182+
"serviceUri": "http://www.example.com/webhook2",
183+
"useCommonAlertSchema": true,
184+
"useAadAuth": true,
185+
"objectId": "d3bb868c-fe44-452c-aa26-769a6538c808",
186+
"identifierUri": "http://someidentifier/d7811ba3-7996-4a93-99b6-6b2f3f355f8a",
187+
"tenantId": "68a4459a-ccb8-493c-b9da-dd30457d1b84"
188+
}
189+
],
190+
"voiceReceivers": [
191+
{
192+
"name": "Sample voice",
193+
"countryCode": "1",
194+
"phoneNumber": "2062022299"
195+
}
196+
]
197+
}
198+
}
199+
}
200+
}
201+
}

‎specification/monitor/resource-manager/Microsoft.Insights/preview/2023-03-01-preview/examples/deleteTenantActionGroup.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"parameters": {
3+
"managementGroupId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
4+
"tenantActionGroupName": "testTenantActionGroup",
5+
"api-version": "2023-03-01-preview",
6+
"x-ms-client-tenant-id": "72f988bf-86f1-41af-91ab-2d7cd011db47"
7+
},
8+
"responses": {
9+
"200": {},
10+
"204": {}
11+
}
12+
}

‎specification/monitor/resource-manager/Microsoft.Insights/preview/2023-03-01-preview/examples/getTenantActionGroup.json

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{
2+
"parameters": {
3+
"managementGroupId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
4+
"tenantActionGroupName": "testTenantActionGroup",
5+
"api-version": "2023-03-01-preview",
6+
"x-ms-client-tenant-id": "72f988bf-86f1-41af-91ab-2d7cd011db47"
7+
},
8+
"responses": {
9+
"200": {
10+
"headers": {},
11+
"body": {
12+
"id": "/providers/Microsoft.Management/managementGroups/72f988bf-86f1-41af-91ab-2d7cd011db47/providers/Microsoft.Insights/tenantActionGroups/testTenantActionGroup",
13+
"type": "Microsoft.Insights/TenantActionGroups",
14+
"name": "testTenantActionGroup",
15+
"location": "Global",
16+
"tags": {},
17+
"properties": {
18+
"groupShortName": "sample",
19+
"enabled": true,
20+
"emailReceivers": [
21+
{
22+
"name": "John Doe's email",
23+
"emailAddress": "[email protected]",
24+
"status": "Enabled",
25+
"useCommonAlertSchema": false
26+
},
27+
{
28+
"name": "Jane Smith's email",
29+
"emailAddress": "[email protected]",
30+
"status": "Enabled",
31+
"useCommonAlertSchema": true
32+
}
33+
],
34+
"smsReceivers": [
35+
{
36+
"name": "John Doe's mobile",
37+
"countryCode": "1",
38+
"phoneNumber": "2062022299",
39+
"status": "Enabled"
40+
},
41+
{
42+
"name": "Jane Smith's mobile",
43+
"countryCode": "1",
44+
"phoneNumber": "0987654321",
45+
"status": "Enabled"
46+
}
47+
],
48+
"webhookReceivers": [
49+
{
50+
"name": "Sample webhook 1",
51+
"serviceUri": "http://www.example.com/webhook1",
52+
"useCommonAlertSchema": true
53+
},
54+
{
55+
"name": "Sample webhook 2",
56+
"serviceUri": "http://www.example.com/webhook2",
57+
"useCommonAlertSchema": true,
58+
"useAadAuth": true,
59+
"objectId": "d3bb868c-fe44-452c-aa26-769a6538c808",
60+
"identifierUri": "http://someidentifier/d7811ba3-7996-4a93-99b6-6b2f3f355f8a",
61+
"tenantId": "68a4459a-ccb8-493c-b9da-dd30457d1b84"
62+
}
63+
],
64+
"voiceReceivers": [
65+
{
66+
"name": "Sample voice",
67+
"countryCode": "1",
68+
"phoneNumber": "2062022299"
69+
}
70+
]
71+
}
72+
}
73+
}
74+
}
75+
}

‎specification/monitor/resource-manager/Microsoft.Insights/preview/2023-03-01-preview/examples/listTenantActionGroups.json

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
{
2+
"parameters": {
3+
"managementGroupId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
4+
"api-version": "2023-03-01-preview",
5+
"x-ms-client-tenant-id": "72f988bf-86f1-41af-91ab-2d7cd011db47"
6+
},
7+
"responses": {
8+
"200": {
9+
"headers": {},
10+
"body": {
11+
"value": [
12+
{
13+
"id": "/providers/Microsoft.Management/managementGroups/72f988bf-86f1-41af-91ab-2d7cd011db47/providers/Microsoft.Insights/tenantActionGroups/testTenantActionGroup",
14+
"type": "Microsoft.Insights/TenantActionGroups",
15+
"name": "testTenantActionGroup",
16+
"location": "Global",
17+
"tags": {},
18+
"properties": {
19+
"groupShortName": "sample",
20+
"enabled": true,
21+
"emailReceivers": [
22+
{
23+
"name": "John Doe's email",
24+
"emailAddress": "[email protected]",
25+
"status": "Enabled",
26+
"useCommonAlertSchema": false
27+
},
28+
{
29+
"name": "Jane Smith's email",
30+
"emailAddress": "[email protected]",
31+
"status": "Enabled",
32+
"useCommonAlertSchema": true
33+
}
34+
],
35+
"smsReceivers": [
36+
{
37+
"name": "John Doe's mobile",
38+
"countryCode": "1",
39+
"phoneNumber": "2062022299",
40+
"status": "Enabled"
41+
},
42+
{
43+
"name": "Jane Smith's mobile",
44+
"countryCode": "1",
45+
"phoneNumber": "0987654321",
46+
"status": "Enabled"
47+
}
48+
],
49+
"webhookReceivers": [
50+
{
51+
"name": "Sample webhook 1",
52+
"serviceUri": "http://www.example.com/webhook1",
53+
"useCommonAlertSchema": true
54+
},
55+
{
56+
"name": "Sample webhook 2",
57+
"serviceUri": "http://www.example.com/webhook2",
58+
"useCommonAlertSchema": true,
59+
"useAadAuth": true,
60+
"objectId": "d3bb868c-fe44-452c-aa26-769a6538c808",
61+
"identifierUri": "http://someidentifier/d7811ba3-7996-4a93-99b6-6b2f3f355f8a",
62+
"tenantId": "68a4459a-ccb8-493c-b9da-dd30457d1b84"
63+
}
64+
],
65+
"voiceReceivers": [
66+
{
67+
"name": "Sample voice",
68+
"countryCode": "1",
69+
"phoneNumber": "2062022299"
70+
}
71+
]
72+
}
73+
}
74+
]
75+
}
76+
}
77+
}
78+
}

0 commit comments

Comments
 (0)