Merge master into datadog-api-spec/test/oliver/-apps-2099-app-builder…

…-api-documentation
DataDog · Jan 10, 2025 · 53808ac · 53808ac
2 parents 948079d + 987ec86
commit 53808ac
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 24 deletions.
diff --git a/.apigentools-info b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-01-08 14:02:30.066418",
-            "spec_repo_commit": "1920836f"
+            "regenerated": "2025-01-09 22:06:11.503685",
+            "spec_repo_commit": "8d40e082"
         },
         "v2": {
             "apigentools_version": "1.6.6",
-            "regenerated": "2025-01-08 14:02:30.082176",
-            "spec_repo_commit": "1920836f"
+            "regenerated": "2025-01-09 22:06:11.519399",
+            "spec_repo_commit": "8d40e082"
         }
     }
 }
diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
@@ -5957,7 +5957,7 @@ components:
       - name
       type: object
     LogsPipelineList:
-      description: Array of pipeline ID strings.
+      description: Array of all log pipeline objects configured for the organization.
       items:
         $ref: '#/components/schemas/LogsPipeline'
       type: array
@@ -28873,7 +28873,7 @@ paths:
         - metrics_metadata_write
   /api/v1/monitor:
     get:
-      description: Get details about the specified monitor from your organization.
+      description: Get all monitors from your organization.
       operationId: ListMonitors
       parameters:
       - description: 'When specified, shows additional information about the group
@@ -28956,6 +28956,7 @@ paths:
           content:
             application/json:
               schema:
+                description: An array of monitor objects.
                 items:
                   $ref: '#/components/schemas/Monitor'
                 type: array
@@ -28979,7 +28980,7 @@ paths:
         appKeyAuth: []
       - AuthZ:
         - monitors_read
-      summary: Get all monitor details
+      summary: Get all monitors
       tags:
       - Monitors
       x-pagination:
@@ -36665,10 +36666,17 @@ tags:
     end times, prevent all alerting related to specified Datadog tags.'
   name: Downtimes
 - description: 'The Event Management API allows you to programmatically post events
-    to the Events Explorer
+    to the Events Explorer and fetch events from the Events Explorer. See the [Event
+    Management page](https://docs.datadoghq.com/service_management/events/) for more
+    information.
 
-    and fetch events from the Events Explorer. See the [Event Management page](https://docs.datadoghq.com/service_management/events/)
-    for more information.'
+
+    **Update to Datadog monitor events `aggregation_key` starting March 1, 2025:**
+    The Datadog monitor events `aggregation_key` is unique to each Monitor ID. Starting
+    March 1st, this key will also include Monitor Group, making it unique per *Monitor
+    ID and Monitor Group*. If you''re using monitor events `aggregation_key` in dashboard
+    queries or the Event API, you must migrate to use `@monitor.id`. Reach out to
+    [support](https://www.datadoghq.com/support/) if you have any question.'
   name: Events
 - description: 'Configure your Datadog-Google Cloud Platform (GCP) integration directly
 

diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml
@@ -48310,10 +48310,17 @@ tags:
     end times, prevent all alerting related to specified Datadog tags.'
   name: Downtimes
 - description: 'The Event Management API allows you to programmatically post events
-    to the Events Explorer
+    to the Events Explorer and fetch events from the Events Explorer. See the [Event
+    Management page](https://docs.datadoghq.com/service_management/events/) for more
+    information.
 
-    and fetch events from the Events Explorer. See the [Event Management page](https://docs.datadoghq.com/service_management/events/)
-    for more information.'
+
+    **Update to Datadog monitor events `aggregation_key` starting March 1, 2025:**
+    The Datadog monitor events `aggregation_key` is unique to each Monitor ID. Starting
+    March 1st, this key will also include Monitor Group, making it unique per *Monitor
+    ID and Monitor Group*. If you''re using monitor events `aggregation_key` in dashboard
+    queries or the Event API, you must migrate to use `@monitor.id`. Reach out to
+    [support](https://www.datadoghq.com/support/) if you have any question.'
   name: Events
 - description: Manage your Datadog Fastly integration accounts and services directly
     through the Datadog API. See the [Fastly integration page](https://docs.datadoghq.com/integrations/fastly/)

diff --git a/api/datadogV1/api_monitors.go b/api/datadogV1/api_monitors.go
@@ -635,8 +635,8 @@ func (r *ListMonitorsOptionalParameters) WithPageSize(pageSize int32) *ListMonit
 	return r
 }
 
-// ListMonitors Get all monitor details.
-// Get details about the specified monitor from your organization.
+// ListMonitors Get all monitors.
+// Get all monitors from your organization.
 func (a *MonitorsApi) ListMonitors(ctx _context.Context, o ...ListMonitorsOptionalParameters) ([]Monitor, *_nethttp.Response, error) {
 	var (
 		localVarHTTPMethod  = _nethttp.MethodGet

diff --git a/examples/v1/monitors/ListMonitors.go b/examples/v1/monitors/ListMonitors.go
@@ -1,4 +1,4 @@
-// Get all monitor details returns "OK" response
+// Get all monitors returns "OK" response
 
 package main
 

diff --git a/...es/v1/monitors/ListMonitors_3448441939.go → ...es/v1/monitors/ListMonitors_2154432960.go b/...es/v1/monitors/ListMonitors_3448441939.go → ...es/v1/monitors/ListMonitors_2154432960.go
@@ -1,4 +1,4 @@
-// Get all monitor details with tags
+// Get all monitors with tags
 
 package main
 

diff --git a/...es/v1/monitors/ListMonitors_2966492814.go → ...les/v1/monitors/ListMonitors_463213563.go b/...es/v1/monitors/ListMonitors_2966492814.go → ...les/v1/monitors/ListMonitors_463213563.go
@@ -1,4 +1,4 @@
-// Get all monitor details returns "OK" response with pagination
+// Get all monitors returns "OK" response with pagination
 
 package main
 

diff --git a/...tails_returns_Bad_Request_response.freeze → ...itors_returns_Bad_Request_response.freeze b/...tails_returns_Bad_Request_response.freeze → ...itors_returns_Bad_Request_response.freeze
diff --git a/...details_returns_Bad_Request_response.yaml → ...onitors_returns_Bad_Request_response.yaml b/...details_returns_Bad_Request_response.yaml → ...onitors_returns_Bad_Request_response.yaml
diff --git a/...eturns_OK_response_with_pagination.freeze → ...eturns_OK_response_with_pagination.freeze b/...eturns_OK_response_with_pagination.freeze → ...eturns_OK_response_with_pagination.freeze
diff --git a/..._returns_OK_response_with_pagination.yaml → ..._returns_OK_response_with_pagination.yaml b/..._returns_OK_response_with_pagination.yaml → ..._returns_OK_response_with_pagination.yaml
diff --git a/tests/scenarios/features/v1/events.feature b/tests/scenarios/features/v1/events.feature
@@ -3,7 +3,14 @@ Feature: Events
   The Event Management API allows you to programmatically post events to the
   Events Explorer and fetch events from the Events Explorer. See the [Event
   Management page](https://docs.datadoghq.com/service_management/events/)
-  for more information.
+  for more information.  **Update to Datadog monitor events
+  `aggregation_key` starting March 1, 2025:** The Datadog monitor events
+  `aggregation_key` is unique to each Monitor ID. Starting March 1st, this
+  key will also include Monitor Group, making it unique per *Monitor ID and
+  Monitor Group*. If you're using monitor events `aggregation_key` in
+  dashboard queries or the Event API, you must migrate to use `@monitor.id`.
+  Reach out to [support](https://www.datadoghq.com/support/) if you have any
+  question.
 
   Background:
     Given a valid "apiKeyAuth" key in the system

diff --git a/tests/scenarios/features/v1/monitors.feature b/tests/scenarios/features/v1/monitors.feature
@@ -227,28 +227,28 @@ Feature: Monitors
     And the response "options.synthetics_check_id" has the same value as "synthetics_api_test.public_id"
 
   @team:DataDog/monitor-app
-  Scenario: Get all monitor details returns "Bad Request" response
+  Scenario: Get all monitors returns "Bad Request" response
     Given new "ListMonitors" request
     And request contains "group_states" parameter with value "notagroupstate"
     When the request is sent
     Then the response status is 400 Bad Request
 
   @integration-only @team:DataDog/monitor-app
-  Scenario: Get all monitor details returns "OK" response
+  Scenario: Get all monitors returns "OK" response
     Given new "ListMonitors" request
     When the request is sent
     Then the response status is 200 OK
 
   @replay-only @skip-validation @team:DataDog/monitor-app @with-pagination
-  Scenario: Get all monitor details returns "OK" response with pagination
+  Scenario: Get all monitors returns "OK" response with pagination
     Given new "ListMonitors" request
     And request contains "page_size" parameter with value 2
     When the request with pagination is sent
     Then the response status is 200 OK
     And the response has 3 items
 
   @skip @team:DataDog/monitor-app
-  Scenario: Get all monitor details with tags
+  Scenario: Get all monitors with tags
     Given there is a valid "monitor" in the system
     And new "ListMonitors" request
     And request contains "tags" parameter with value "test:{{ unique_lower_alnum }}"

diff --git a/tests/scenarios/features/v2/events.feature b/tests/scenarios/features/v2/events.feature
@@ -3,7 +3,14 @@ Feature: Events
   The Event Management API allows you to programmatically post events to the
   Events Explorer and fetch events from the Events Explorer. See the [Event
   Management page](https://docs.datadoghq.com/service_management/events/)
-  for more information.
+  for more information.  **Update to Datadog monitor events
+  `aggregation_key` starting March 1, 2025:** The Datadog monitor events
+  `aggregation_key` is unique to each Monitor ID. Starting March 1st, this
+  key will also include Monitor Group, making it unique per *Monitor ID and
+  Monitor Group*. If you're using monitor events `aggregation_key` in
+  dashboard queries or the Event API, you must migrate to use `@monitor.id`.
+  Reach out to [support](https://www.datadoghq.com/support/) if you have any
+  question.
 
   Background:
     Given a valid "apiKeyAuth" key in the system