Skip to content

Commit

Permalink
Nithin/action group webhooks with azure active directory integration (A…
Browse files Browse the repository at this point in the history
…zure#6218)

* updating the swagger doc for action webhook recivers with azure active directory integration

* 1)fixed the api version 2)updated with emoty array when no recievers are in the response

* fixing the read me with references to 2019-06-01 version
  • Loading branch information
nithinpnp authored and shahabhijeet committed Jun 18, 2019
1 parent c7fa3ca commit 94ba84b
Show file tree
Hide file tree
Showing 9 changed files with 1,574 additions and 1 deletion.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"parameters": {
"subscriptionId": "187f412d-1758-44d9-b052-169e2564721d",
"resourceGroupName": "Default-NotificationRules",
"actionGroupName": "SampleActionGroup",
"api-version": "2019-06-01"
},
"responses": {
"200": {
"headers": {},
"body": null
},
"204": {
"headers": {},
"body": null
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"parameters": {
"subscriptionId": "187f412d-1758-44d9-b052-169e2564721d",
"resourceGroupName": "Default-NotificationRules",
"actionGroupName": "SampleActionGroup",
"api-version": "2019-06-01",
"enableRequest": {
"receiverName": "John Doe's mobile"
}
},
"responses": {
"200": {
"headers": {},
"body": null
},
"409": {
"headers": {},
"body": null
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"parameters": {
"subscriptionId": "187f412d-1758-44d9-b052-169e2564721d",
"resourceGroupName": "Default-NotificationRules",
"actionGroupName": "SampleActionGroup",
"api-version": "2019-06-01"
},
"responses": {
"200": {
"headers": {},
"body": {
"id": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-NotificationRules/providers/microsoft.insights/actionGroups/SampleActionGroup",
"type": "Microsoft.Insights/ActionGroups",
"name": "SampleActionGroup",
"location": "Global",
"tags": {},
"properties": {
"groupShortName": "sample",
"enabled": true,
"emailReceivers": [
{
"name": "John Doe's email",
"emailAddress": "[email protected]",
"status": "Enabled",
"useCommonAlertSchema": true
},
{
"name": "Jane Smith's email",
"emailAddress": "[email protected]",
"status": "Disabled",
"useCommonAlertSchema": true
}
],
"smsReceivers": [
{
"name": "John Doe's mobile",
"countryCode": "1",
"phoneNumber": "1234567890",
"status": "Disabled"
},
{
"name": "Jane Smith's mobile",
"countryCode": "1",
"phoneNumber": "0987654321",
"status": "Enabled"
}
],
"webhookReceivers": [
{
"name": "Sample webhook",
"serviceUri": "http://www.example.com/webhook",
"useCommonAlertSchema": false
},
{
"name": "Sample webhook 2",
"serviceUri": "http://www.example.com/webhook2",
"useCommonAlertSchema": true,
"useAadAuth": true,
"objectId": "d3bb868c-fe44-452c-aa26-769a6538c808",
"identifierUri": "http://someidentifier/d7811ba3-7996-4a93-99b6-6b2f3f355f8a",
"tenantId": "68a4459a-ccb8-493c-b9da-dd30457d1b84"
}
],
"itsmReceivers":[],
"azureAppPushReceivers":[],
"automationRunbookReceivers":[],
"voiceReceivers":[],
"logicAppReceivers":[],
"azureFunctionReceivers":[],
"armRoleReceivers":[]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
{
"parameters": {
"subscriptionId": "187f412d-1758-44d9-b052-169e2564721d",
"resourceGroupName": "Default-NotificationRules",
"api-version": "2019-06-01"
},
"responses": {
"200": {
"headers": {},
"body": {
"value": [
{
"id": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-NotificationRules/providers/microsoft.insights/actionGroups/SampleActionGroup",
"type": "Microsoft.Insights/ActionGroups",
"name": "SampleActionGroup",
"location": "Global",
"tags": {},
"properties": {
"groupShortName": "sample",
"enabled": true,
"emailReceivers": [
{
"name": "John Doe's email",
"emailAddress": "[email protected]",
"status": "Enabled",
"useCommonAlertSchema": true
},
{
"name": "Jane Smith's email",
"emailAddress": "[email protected]",
"status": "Disabled",
"useCommonAlertSchema": true
}
],
"smsReceivers": [
{
"name": "John Doe's mobile",
"countryCode": "1",
"phoneNumber": "1234567890",
"status": "Disabled"
},
{
"name": "Jane Smith's mobile",
"countryCode": "1",
"phoneNumber": "0987654321",
"status": "Enabled"
}
],
"webhookReceivers": [
{
"name": "Sample webhook",
"serviceUri": "http://www.example.com/webhook",
"useCommonAlertSchema": false
},
{
"name": "Sample webhook 2",
"serviceUri": "http://www.example.com/webhook2",
"useCommonAlertSchema": true,
"useAadAuth": true,
"objectId": "d3bb868c-fe44-452c-aa26-769a6538c808",
"identifierUri": "http://someidentifier/d7811ba3-7996-4a93-99b6-6b2f3f355f8a",
"tenantId": "68a4459a-ccb8-493c-b9da-dd30457d1b84"
}
],
"itsmReceivers":[],
"azureAppPushReceivers":[],
"automationRunbookReceivers":[],
"voiceReceivers":[],
"logicAppReceivers":[],
"azureFunctionReceivers":[],
"armRoleReceivers":[]
}
},
{
"id": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-NotificationRules/providers/microsoft.insights/actionGroups/SampleActionGroup2",
"type": "Microsoft.Insights/ActionGroups",
"name": "SampleActionGroup2",
"location": "Global",
"tags": {},
"properties": {
"groupShortName": "sample2",
"enabled": false,
"emailReceivers": [
{
"name": "John Doe's email",
"emailAddress": "[email protected]",
"status": "Enabled",
"useCommonAlertSchema": true
}
],
"smsReceivers": [
{
"name": "Jane Smith's mobile",
"countryCode": "1",
"phoneNumber": "0987654321",
"status": "Enabled"
}
],
"webhookReceivers": [],
"itsmReceivers":[],
"azureAppPushReceivers":[],
"automationRunbookReceivers":[],
"voiceReceivers":[],
"logicAppReceivers":[],
"azureFunctionReceivers":[],
"armRoleReceivers":[]
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"parameters": {
"subscriptionId": "187f412d-1758-44d9-b052-169e2564721d",
"resourceGroupName": "Default-NotificationRules",
"actionGroupName": "SampleActionGroup",
"api-version": "2019-06-01",
"actionGroupPatch": {
"tags": { "key1": "value1", "key2": "value2" },
"properties": {
"enabled": false
}
}
},
"responses": {
"200": {
"headers": { },
"body": {
"id": "/subscriptions/187f412d-1758-44d9-b052-169e2564721d/resourceGroups/Default-NotificationRules/providers/microsoft.insights/actionGroups/SampleActionGroup",
"type": "Microsoft.Insights/ActionGroups",
"name": "SampleActionGroup",
"location": "Global",
"tags": { "key1": "value1", "key2": "value2" },
"properties": {
"groupShortName": "sample",
"enabled": true,
"emailReceivers": [
{
"name": "John Doe's email",
"emailAddress": "[email protected]",
"status": "Enabled",
"useCommonAlertSchema": true
},
{
"name": "Jane Smith's email",
"emailAddress": "[email protected]",
"status": "Enabled",
"useCommonAlertSchema": true
}
],
"smsReceivers":[
{
"name": "John Doe's mobile",
"countryCode": "1",
"phoneNumber": "1234567890",
"status": "Enabled"
},
{
"name": "Jane Smith's mobile",
"countryCode": "1",
"phoneNumber": "0987654321",
"status": "Enabled"
}
],
"webhookReceivers":[
{
"name": "Sample webhook",
"serviceUri": "http://www.example.com/webhook",
"useCommonAlertSchema": false
},
{
"name": "Sample webhook 2",
"serviceUri": "http://www.example.com/webhook2",
"useCommonAlertSchema": true,
"useAadAuth": true,
"objectId": "d3bb868c-fe44-452c-aa26-769a6538c808",
"identifierUri": "http://someidentifier/d7811ba3-7996-4a93-99b6-6b2f3f355f8a",
"tenantId": "68a4459a-ccb8-493c-b9da-dd30457d1b84"
}
],
"itsmReceivers":[],
"azureAppPushReceivers":[],
"automationRunbookReceivers":[],
"voiceReceivers":[],
"logicAppReceivers":[],
"azureFunctionReceivers":[],
"armRoleReceivers":[]
}
}
}
}
}
10 changes: 10 additions & 0 deletions specification/monitor/resource-manager/readme.go.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ batch:
- tag: package-2018-09
- tag: package-2018-11-preview
- tag: package-2019-03
- tag: package-2019-06
```
### Tag: package-2017-09 and go
Expand Down Expand Up @@ -64,3 +65,12 @@ Please also specify `--go-sdk-folder=<path to the root directory of your azure-s
``` yaml $(tag) == 'package-2019-03' && $(go)
output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2019-03-01/$(namespace)
```

### Tag: package-2019-06 and go

These settings apply only when `--tag=package-2019-06 --go` is specified on the command line.
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.

``` yaml $(tag) == 'package-2019-06' && $(go)
output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2019-06-01/$(namespace)
```
33 changes: 32 additions & 1 deletion specification/monitor/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,40 @@ These are the global settings for the MonitorClient API.
title: MonitorClient
description: Monitor Management Client
openapi-type: arm
tag: package-2019-03
tag: package-2019-06
```
### Tag: package-2019-06
These settings apply only when `--tag=package-2019-06` is specified on the command line.

```yaml $(tag) == 'package-2019-06'
input-file:
- Microsoft.Insights/stable/2015-04-01/autoscale_API.json
- Microsoft.Insights/stable/2015-04-01/operations_API.json
- Microsoft.Insights/stable/2016-03-01/alertRulesIncidents_API.json
- Microsoft.Insights/stable/2016-03-01/alertRules_API.json
- Microsoft.Insights/stable/2016-03-01/logProfiles_API.json
- Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettings_API.json
- Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json
- Microsoft.Insights/stable/2019-06-01/actionGroups_API.json
- Microsoft.Insights/stable/2017-04-01/activityLogAlerts_API.json
- Microsoft.Insights/stable/2015-04-01/activityLogs_API.json
- Microsoft.Insights/stable/2015-04-01/eventCategories_API.json
- Microsoft.Insights/stable/2015-04-01/tenantActivityLogs_API.json
- Microsoft.Insights/stable/2018-01-01/metricDefinitions_API.json
- Microsoft.Insights/stable/2018-01-01/metrics_API.json
- Microsoft.Insights/preview/2017-11-01-preview/baseline_API.json
- Microsoft.Insights/preview/2017-11-01-preview/calculateBaseline_API.json
- Microsoft.Insights/stable/2019-03-01/metricBaselines_API.json
- Microsoft.Insights/stable/2018-03-01/metricAlert_API.json
- Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json
- Microsoft.Insights/preview/2017-12-01-preview/metricNamespaces_API.json
- Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json
```


### Tag: package-2019-03

These settings apply only when `--tag=package-2019-03` is specified on the command line.
Expand Down

0 comments on commit 94ba84b

Please sign in to comment.