Skip to content

Commit

Permalink
Adding API-Version input to the deployment gate (#12841)
Browse files Browse the repository at this point in the history
* Adding API-Version input to the deployment gate

* Update task.json

* Deprecating V0

* Update task.json

* Update task.loc.json

* build
  • Loading branch information
thesattiraju authored Jul 8, 2020
1 parent 02d1b50 commit 97d4f5f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"loc.friendlyName": "Query Classic Azure Monitor alerts",
"loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=870240)",
"loc.helpMarkDown": "[Learn more about this task](https://go.microsoft.com/fwlink/?linkid=870240)",
"loc.description": "Observe the configured classic Azure Monitor rules for active alerts",
"loc.instanceNameFormat": "Query Azure Monitor alerts",
"loc.input.label.connectedServiceNameARM": "Azure subscription",
Expand Down
3 changes: 2 additions & 1 deletion Tasks/AzureMonitorV0/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"helpUrl": "https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/azure-monitor",
"helpMarkDown": "[Learn more about this task](https://go.microsoft.com/fwlink/?linkid=870240)",
"category": "Utility",
"deprecated": true,
"visibility": [
"Build",
"Release"
Expand Down Expand Up @@ -115,4 +116,4 @@
}
}
}
}
}
1 change: 1 addition & 0 deletions Tasks/AzureMonitorV0/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"helpUrl": "https://docs.microsoft.com/azure/devops/pipelines/tasks/utility/azure-monitor",
"helpMarkDown": "ms-resource:loc.helpMarkDown",
"category": "Utility",
"deprecated": true,
"visibility": [
"Build",
"Release"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
"loc.input.help.alertState": "Filter by state of the alert instance. Default value is to select all.",
"loc.input.label.monitorCondition": "Monitor condition",
"loc.input.help.monitorCondition": "Monitor condition represents whether the underlying conditions have crossed the defined alert rule thresholds."
}
}
8 changes: 4 additions & 4 deletions Tasks/AzureMonitorV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
],
"version": {
"Major": 1,
"Minor": 157,
"Patch": 2
"Minor": 173,
"Patch": 0
},
"instanceNameFormat": "Query Azure Monitor alerts",
"groups": [
Expand Down Expand Up @@ -195,7 +195,7 @@
"HttpRequest": {
"Execute": {
"EndpointId": "$(connectedServiceNameARM)",
"EndpointUrl": "$(endpoint.url)/subscriptions/{{subscriptionId}}/providers/Microsoft.AlertsManagement/alerts?api-version=2018-05-05{{#if ResourceGroupName}}&targetResourceGroup=$(ResourceGroupName){{/if}}{{#if monitorCondition}}&monitorCondition=$(monitorCondition){{#if timeRange}}&timeRange=$(timeRange){{/if}}{{#if alertState}}&alertState=$(alertState){{/if}}{{#if severity}}&severity=$(severity){{/if}}{{#equals '$(filterType)' 'resource' 1}}{{#if resource}}&targetResource=/subscriptions/{{subscriptionId}}/resourcegroups/{{ResourceGroupName}}/providers/{{resource}}{{/if}}{{/equals}}{{#equals '$(filterType)' 'alertrule' 1}}{{#if alertRule}}&alertRule=/subscriptions/{{subscriptionId}}/resourceGroups/{{ResourceGroupName}}/providers/microsoft.insights/{{alertRule}}{{/if}}{{/equals}}",
"EndpointUrl": "$(endpoint.url)/subscriptions/{{subscriptionId}}/providers/Microsoft.AlertsManagement/alerts?api-version=2019-03-01{{#if ResourceGroupName}}&targetResourceGroup=$(ResourceGroupName){{/if}}{{#if monitorCondition}}&monitorCondition=$(monitorCondition){{#if timeRange}}&timeRange=$(timeRange){{/if}}{{#if alertState}}&alertState=$(alertState){{/if}}{{#if severity}}&severity=$(severity){{/if}}{{#equals '$(filterType)' 'resource' 1}}{{#if resource}}&targetResource=/subscriptions/{{subscriptionId}}/resourcegroups/{{ResourceGroupName}}/providers/{{resource}}{{/if}}{{/equals}}{{#equals '$(filterType)' 'alertrule' 1}}{{#if alertRule}}&alertRule=/subscriptions/{{subscriptionId}}/resourceGroups/{{ResourceGroupName}}/providers/microsoft.insights/{{alertRule}}{{/if}}{{/equals}}",
"Method": "GET",
"Body": "",
"Headers": "",
Expand All @@ -204,4 +204,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions Tasks/AzureMonitorV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
],
"version": {
"Major": 1,
"Minor": 157,
"Patch": 2
"Minor": 173,
"Patch": 0
},
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
"groups": [
Expand Down Expand Up @@ -195,7 +195,7 @@
"HttpRequest": {
"Execute": {
"EndpointId": "$(connectedServiceNameARM)",
"EndpointUrl": "$(endpoint.url)/subscriptions/{{subscriptionId}}/providers/Microsoft.AlertsManagement/alerts?api-version=2018-05-05{{#if ResourceGroupName}}&targetResourceGroup=$(ResourceGroupName){{/if}}{{#if monitorCondition}}&monitorCondition=$(monitorCondition){{#if timeRange}}&timeRange=$(timeRange){{/if}}{{#if alertState}}&alertState=$(alertState){{/if}}{{#if severity}}&severity=$(severity){{/if}}{{#equals '$(filterType)' 'resource' 1}}{{#if resource}}&targetResource=/subscriptions/{{subscriptionId}}/resourcegroups/{{ResourceGroupName}}/providers/{{resource}}{{/if}}{{/equals}}{{#equals '$(filterType)' 'alertrule' 1}}{{#if alertRule}}&alertRule=/subscriptions/{{subscriptionId}}/resourceGroups/{{ResourceGroupName}}/providers/microsoft.insights/{{alertRule}}{{/if}}{{/equals}}",
"EndpointUrl": "$(endpoint.url)/subscriptions/{{subscriptionId}}/providers/Microsoft.AlertsManagement/alerts?api-version=2019-03-01{{#if ResourceGroupName}}&targetResourceGroup=$(ResourceGroupName){{/if}}{{#if monitorCondition}}&monitorCondition=$(monitorCondition){{#if timeRange}}&timeRange=$(timeRange){{/if}}{{#if alertState}}&alertState=$(alertState){{/if}}{{#if severity}}&severity=$(severity){{/if}}{{#equals '$(filterType)' 'resource' 1}}{{#if resource}}&targetResource=/subscriptions/{{subscriptionId}}/resourcegroups/{{ResourceGroupName}}/providers/{{resource}}{{/if}}{{/equals}}{{#equals '$(filterType)' 'alertrule' 1}}{{#if alertRule}}&alertRule=/subscriptions/{{subscriptionId}}/resourceGroups/{{ResourceGroupName}}/providers/microsoft.insights/{{alertRule}}{{/if}}{{/equals}}",
"Method": "GET",
"Body": "",
"Headers": "",
Expand Down

0 comments on commit 97d4f5f

Please sign in to comment.