Skip to content

Commit 4bfe39c

Browse files
Merge master into datadog-api-spec/test/oliver/-apps-2099-app-builder-api-documentation
2 parents 41976c1 + 1147798 commit 4bfe39c

14 files changed

+55
-26
lines changed

.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2025-01-08 14:02:25.736805",
8-
"spec_repo_commit": "1920836f"
7+
"regenerated": "2025-01-09 22:06:06.242932",
8+
"spec_repo_commit": "8d40e082"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2025-01-08 14:02:25.752564",
13-
"spec_repo_commit": "1920836f"
12+
"regenerated": "2025-01-09 22:06:06.258111",
13+
"spec_repo_commit": "8d40e082"
1414
}
1515
}
1616
}

.generator/schemas/v1/openapi.yaml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5957,7 +5957,7 @@ components:
59575957
- name
59585958
type: object
59595959
LogsPipelineList:
5960-
description: Array of pipeline ID strings.
5960+
description: Array of all log pipeline objects configured for the organization.
59615961
items:
59625962
$ref: '#/components/schemas/LogsPipeline'
59635963
type: array
@@ -28873,7 +28873,7 @@ paths:
2887328873
- metrics_metadata_write
2887428874
/api/v1/monitor:
2887528875
get:
28876-
description: Get details about the specified monitor from your organization.
28876+
description: Get all monitors from your organization.
2887728877
operationId: ListMonitors
2887828878
parameters:
2887928879
- description: 'When specified, shows additional information about the group
@@ -28956,6 +28956,7 @@ paths:
2895628956
content:
2895728957
application/json:
2895828958
schema:
28959+
description: An array of monitor objects.
2895928960
items:
2896028961
$ref: '#/components/schemas/Monitor'
2896128962
type: array
@@ -28979,7 +28980,7 @@ paths:
2897928980
appKeyAuth: []
2898028981
- AuthZ:
2898128982
- monitors_read
28982-
summary: Get all monitor details
28983+
summary: Get all monitors
2898328984
tags:
2898428985
- Monitors
2898528986
x-pagination:
@@ -36665,10 +36666,17 @@ tags:
3666536666
end times, prevent all alerting related to specified Datadog tags.'
3666636667
name: Downtimes
3666736668
- description: 'The Event Management API allows you to programmatically post events
36668-
to the Events Explorer
36669+
to the Events Explorer and fetch events from the Events Explorer. See the [Event
36670+
Management page](https://docs.datadoghq.com/service_management/events/) for more
36671+
information.
3666936672

36670-
and fetch events from the Events Explorer. See the [Event Management page](https://docs.datadoghq.com/service_management/events/)
36671-
for more information.'
36673+
36674+
**Update to Datadog monitor events `aggregation_key` starting March 1, 2025:**
36675+
The Datadog monitor events `aggregation_key` is unique to each Monitor ID. Starting
36676+
March 1st, this key will also include Monitor Group, making it unique per *Monitor
36677+
ID and Monitor Group*. If you''re using monitor events `aggregation_key` in dashboard
36678+
queries or the Event API, you must migrate to use `@monitor.id`. Reach out to
36679+
[support](https://www.datadoghq.com/support/) if you have any question.'
3667236680
name: Events
3667336681
- description: 'Configure your Datadog-Google Cloud Platform (GCP) integration directly
3667436682

.generator/schemas/v2/openapi.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48310,10 +48310,17 @@ tags:
4831048310
end times, prevent all alerting related to specified Datadog tags.'
4831148311
name: Downtimes
4831248312
- description: 'The Event Management API allows you to programmatically post events
48313-
to the Events Explorer
48313+
to the Events Explorer and fetch events from the Events Explorer. See the [Event
48314+
Management page](https://docs.datadoghq.com/service_management/events/) for more
48315+
information.
4831448316

48315-
and fetch events from the Events Explorer. See the [Event Management page](https://docs.datadoghq.com/service_management/events/)
48316-
for more information.'
48317+
48318+
**Update to Datadog monitor events `aggregation_key` starting March 1, 2025:**
48319+
The Datadog monitor events `aggregation_key` is unique to each Monitor ID. Starting
48320+
March 1st, this key will also include Monitor Group, making it unique per *Monitor
48321+
ID and Monitor Group*. If you''re using monitor events `aggregation_key` in dashboard
48322+
queries or the Event API, you must migrate to use `@monitor.id`. Reach out to
48323+
[support](https://www.datadoghq.com/support/) if you have any question.'
4831748324
name: Events
4831848325
- description: Manage your Datadog Fastly integration accounts and services directly
4831948326
through the Datadog API. See the [Fastly integration page](https://docs.datadoghq.com/integrations/fastly/)

examples/v1/monitors/ListMonitors.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Get all monitor details returns "OK" response
1+
# Get all monitors returns "OK" response
22

33
require "datadog_api_client"
44
api_instance = DatadogAPIClient::V1::MonitorsAPI.new

examples/v1/monitors/ListMonitors_3448441939.rb renamed to examples/v1/monitors/ListMonitors_2154432960.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Get all monitor details with tags
1+
# Get all monitors with tags
22

33
require "datadog_api_client"
44
api_instance = DatadogAPIClient::V1::MonitorsAPI.new

examples/v1/monitors/ListMonitors_2966492814.rb renamed to examples/v1/monitors/ListMonitors_463213563.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Get all monitor details returns "OK" response with pagination
1+
# Get all monitors returns "OK" response with pagination
22

33
require "datadog_api_client"
44
api_instance = DatadogAPIClient::V1::MonitorsAPI.new

features/v1/events.feature

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@ Feature: Events
33
The Event Management API allows you to programmatically post events to the
44
Events Explorer and fetch events from the Events Explorer. See the [Event
55
Management page](https://docs.datadoghq.com/service_management/events/)
6-
for more information.
6+
for more information. **Update to Datadog monitor events
7+
`aggregation_key` starting March 1, 2025:** The Datadog monitor events
8+
`aggregation_key` is unique to each Monitor ID. Starting March 1st, this
9+
key will also include Monitor Group, making it unique per *Monitor ID and
10+
Monitor Group*. If you're using monitor events `aggregation_key` in
11+
dashboard queries or the Event API, you must migrate to use `@monitor.id`.
12+
Reach out to [support](https://www.datadoghq.com/support/) if you have any
13+
question.
714

815
Background:
916
Given a valid "apiKeyAuth" key in the system

features/v1/monitors.feature

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,28 +227,28 @@ Feature: Monitors
227227
And the response "options.synthetics_check_id" has the same value as "synthetics_api_test.public_id"
228228

229229
@team:DataDog/monitor-app
230-
Scenario: Get all monitor details returns "Bad Request" response
230+
Scenario: Get all monitors returns "Bad Request" response
231231
Given new "ListMonitors" request
232232
And request contains "group_states" parameter with value "notagroupstate"
233233
When the request is sent
234234
Then the response status is 400 Bad Request
235235

236236
@integration-only @team:DataDog/monitor-app
237-
Scenario: Get all monitor details returns "OK" response
237+
Scenario: Get all monitors returns "OK" response
238238
Given new "ListMonitors" request
239239
When the request is sent
240240
Then the response status is 200 OK
241241

242242
@replay-only @skip-validation @team:DataDog/monitor-app @with-pagination
243-
Scenario: Get all monitor details returns "OK" response with pagination
243+
Scenario: Get all monitors returns "OK" response with pagination
244244
Given new "ListMonitors" request
245245
And request contains "page_size" parameter with value 2
246246
When the request with pagination is sent
247247
Then the response status is 200 OK
248248
And the response has 3 items
249249

250250
@skip @team:DataDog/monitor-app
251-
Scenario: Get all monitor details with tags
251+
Scenario: Get all monitors with tags
252252
Given there is a valid "monitor" in the system
253253
And new "ListMonitors" request
254254
And request contains "tags" parameter with value "test:{{ unique_lower_alnum }}"

features/v2/events.feature

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@ Feature: Events
33
The Event Management API allows you to programmatically post events to the
44
Events Explorer and fetch events from the Events Explorer. See the [Event
55
Management page](https://docs.datadoghq.com/service_management/events/)
6-
for more information.
6+
for more information. **Update to Datadog monitor events
7+
`aggregation_key` starting March 1, 2025:** The Datadog monitor events
8+
`aggregation_key` is unique to each Monitor ID. Starting March 1st, this
9+
key will also include Monitor Group, making it unique per *Monitor ID and
10+
Monitor Group*. If you're using monitor events `aggregation_key` in
11+
dashboard queries or the Event API, you must migrate to use `@monitor.id`.
12+
Reach out to [support](https://www.datadoghq.com/support/) if you have any
13+
question.
714

815
Background:
916
Given a valid "apiKeyAuth" key in the system

lib/datadog_api_client/v1/api/monitors_api.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -485,17 +485,17 @@ def get_monitor_with_http_info(monitor_id, opts = {})
485485
return data, status_code, headers
486486
end
487487

488-
# Get all monitor details.
488+
# Get all monitors.
489489
#
490490
# @see #list_monitors_with_http_info
491491
def list_monitors(opts = {})
492492
data, _status_code, _headers = list_monitors_with_http_info(opts)
493493
data
494494
end
495495

496-
# Get all monitor details.
496+
# Get all monitors.
497497
#
498-
# Get details about the specified monitor from your organization.
498+
# Get all monitors from your organization.
499499
#
500500
# @param opts [Hash] the optional parameters
501501
# @option opts [String] :group_states When specified, shows additional information about the group states. Choose one or more from `all`, `alert`, `warn`, and `no data`.
@@ -564,7 +564,7 @@ def list_monitors_with_http_info(opts = {})
564564
return data, status_code, headers
565565
end
566566

567-
# Get all monitor details.
567+
# Get all monitors.
568568
#
569569
# Provide a paginated version of {#list_monitors}, returning all items.
570570
#

0 commit comments

Comments
 (0)