Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/github.com/Azure/azure…
Browse files Browse the repository at this point in the history
…-sdk-for-go/sdk/azcore-1.12.0
  • Loading branch information
lawrencegripper authored Jun 10, 2024
2 parents b399e39 + b3d14f8 commit 8aca5e9
Show file tree
Hide file tree
Showing 491 changed files with 164,949 additions and 112,950 deletions.
8,377 changes: 4,371 additions & 4,006 deletions internal/pkg/expanders/swagger-armspecs.generated.go

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions scripts/swagger_update/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
# This allows you to augment the included files for each README.MD for a specific tag
# this is useful when files which are needed are incorrectly left out of the 'input-file'
resource_provider_input_file_additions = {
"compute": {
"package-2024-03-01": ["./Microsoft.Compute/ComputeRP/stable/2023-09-01/virtualMachineScaleSet.json"]
}
# Example:
# "cosmos-db" : {
# "package-2020-04" : ["./Microsoft.DocumentDB/stable/2019-08-01/cosmos-db.json"]
Expand Down
1 change: 1 addition & 0 deletions swagger-specs/ai/data-plane/ImageAnalysis/api-set.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"addition_input_file_paths": [], "input_files": ["stable/2023-10-01/generated.json"], "name": "package-2023-10-01"}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"version": "2023-07-12-preview",
"version": "2024-01-01-preview",
"title": "Azure Alerts Management Service Resource Provider",
"description": "Azure Alerts Management Service provides a single pane of glass of alerts across Azure Monitor."
},
Expand Down Expand Up @@ -1002,6 +1002,28 @@
}
}
},
"correlationDetails": {
"type": "object",
"description": "Correlation details",
"properties": {
"parentAlertId": {
"type": "string",
"description": "Unique Id (GUID) of the alert that this alert was correlated to.",
"readOnly": true
},
"correlationDateTime": {
"description": "The alert's correlation date time in ISO-8601 format.",
"type": "string",
"format": "date-time",
"readOnly": true
},
"alertProcessingRule": {
"type": "string",
"description": "The alert processing rule that was used to correlate this alert. This is an optional field, it will be presented only for a parent alert.",
"readOnly": true
}
}
},
"essentials": {
"type": "object",
"description": "This object contains consistent fields across different monitor services.",
Expand Down Expand Up @@ -1154,6 +1176,19 @@
"description": {
"type": "string",
"description": "Alert description."
},
"hasEnrichments": {
"type": "boolean",
"description": "Will be presented with the value true only if there are enrichments.",
"readOnly": true
},
"isStatefulAlert": {
"type": "boolean",
"description": "True if the alert is stateful, and false if it isn't.",
"readOnly": true
},
"correlationDetails": {
"$ref": "#/definitions/correlationDetails"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"version": "2023-05-01-preview",
"version": "2024-03-01-preview",
"title": "Azure Alerts Management Service Resource Provider",
"description": "APIs for Azure alert processing rules CRUD operations."
},
Expand Down Expand Up @@ -245,6 +245,9 @@
},
"Create or update a rule that adds alerts correlation": {
"$ref": "./examples/AlertProcessingRules_Create_or_update_add_correlation.json"
},
"Create or update a rule that adds alerts correlation with correlation updates": {
"$ref": "./examples/AlertProcessingRules_Create_or_update_add_correlation_with_correlation_updates.json"
}
}
},
Expand Down Expand Up @@ -811,6 +814,9 @@
"name": "NotificationsForCorrelatedAlerts",
"modelAsString": true
}
},
"correlationUpdates": {
"$ref": "#/definitions/CorrelationUpdates"
}
}
},
Expand All @@ -824,6 +830,40 @@
}
}
},
"CorrelationUpdates": {
"type": "object",
"description": "Defines the updates to be applied for correlation.",
"properties": {
"updateType": {
"type": "string",
"description": "The type of update that needs to be performed.",
"default": "timeBased",
"enum": [
"timeBased"
],
"x-ms-enum": {
"name": "UpdateType",
"modelAsString": true
}
},
"updateInterval": {
"type": "string",
"description": "The update interval for notification updates in ISO8601 format."
},
"actionGroups": {
"type": "array",
"description": "The action group ids.",
"items": {
"type": "string"
}
}
},
"required": [
"updateType",
"updateInterval",
"actionGroups"
]
},
"AlertProcessingRulesList": {
"type": "object",
"description": "List of alert processing rules.",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"addition_input_file_paths": [], "input_files": ["Microsoft.AlertsManagement/stable/2023-03-01/PrometheusRuleGroups.json", "Microsoft.AlertsManagement/preview/2023-07-12-preview/AlertsManagement.json", "Microsoft.AlertsManagement/preview/2019-05-05-preview/SmartGroups.json", "Microsoft.AlertsManagement/preview/2023-08-01-preview/AlertRuleRecommendations.json", "Microsoft.AlertsManagement/preview/2023-05-01-preview/AlertProcessingRules.json"], "name": "package-2023-03"}
{"addition_input_file_paths": [], "input_files": ["Microsoft.AlertsManagement/stable/2023-03-01/PrometheusRuleGroups.json", "Microsoft.AlertsManagement/preview/2024-01-01-preview/AlertsManagement.json", "Microsoft.AlertsManagement/preview/2019-05-05-preview/SmartGroups.json", "Microsoft.AlertsManagement/preview/2023-08-01-preview/AlertRuleRecommendations.json", "Microsoft.AlertsManagement/preview/2024-03-01-preview/AlertProcessingRules.json"], "name": "package-2023-03"}
Loading

0 comments on commit 8aca5e9

Please sign in to comment.