Regenerate client from commit 1358b465 of spec repo (#862)

Co-authored-by: ci.datadog-api-spec <[email protected]>

Author: api-clients-generation-pipeline[bot]

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2022-09-30 11:29:35.529283",
-            "spec_repo_commit": "e6eb3136"
+            "regenerated": "2022-10-03 13:35:17.264691",
+            "spec_repo_commit": "1358b465"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2022-09-30 11:29:35.549126",
-            "spec_repo_commit": "e6eb3136"
+            "regenerated": "2022-10-03 13:35:17.277667",
+            "spec_repo_commit": "1358b465"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -6278,6 +6278,24 @@ components:
           description: A Boolean indicating whether tagged users is notified on changes
             to this monitor.
           type: boolean
+        notify_by:
+          description: 'Controls what granularity a monitor alerts on. Only available
+            for multi-alerts.
+
+            For instance, a monitor grouped by `cluster`, `namespace`, `pod` can be
+            configured to only notify on each
+
+            new `cluster` violating the alert conditions by setting `notify_by` to
+            `["cluster"]`. Tags mentioned
+
+            in `notify_by` have to be a subset of the grouping tags in the query.
+
+            For example, a query grouped by `cluster`, `namespace` cannot notify on
+            `region`.'
+          items:
+            description: A grouping tag.
+            type: string
+          type: array
         notify_no_data:
           default: false
           description: A Boolean indicating whether this monitor notifies when data

cassettes/v1/Monitors_4022238206/Validate-a-multi-alert-monitor-returns-OK-response_3334762130/frozen.json

@@ -1 +1 @@
-"2022-08-15T18:04:46.756Z"
+"2022-09-30T16:41:33.797Z"

cassettes/v1/Monitors_4022238206/Validate-a-multi-alert-monitor-returns-OK-response_3334762130/recording.har

@@ -8,11 +8,11 @@
     },
     "entries": [
       {
-        "_id": "e34971e4a97d76f72fa0a6f1ecf342e2",
+        "_id": "d52889849c4e433be88c072aa18bcf71",
         "_order": 0,
         "cache": {},
         "request": {
-          "bodySize": 804,
+          "bodySize": 834,
           "cookies": [],
           "headers": [
             {
@@ -32,17 +32,17 @@
           "postData": {
             "mimeType": "application/json",
             "params": [],
-            "text": "{\"message\":\"some message Notify: @hipchat-channel\",\"name\":\"Test-Validate_a_multi_alert_monitor_returns_OK_response-1660586686\",\"options\":{\"enable_logs_sample\":true,\"escalation_message\":\"the situation has escalated\",\"evaluation_delay\":700,\"group_retention_duration\":\"2d\",\"groupby_simple_monitor\":false,\"include_tags\":true,\"locked\":false,\"new_host_delay\":600,\"no_data_timeframe\":null,\"notify_audit\":false,\"notify_no_data\":false,\"on_missing_data\":\"show_and_notify_no_data\",\"renotify_interval\":60,\"require_full_window\":true,\"thresholds\":{\"critical\":2,\"warning\":1},\"timeout_h\":24},\"priority\":3,\"query\":\"logs(\\\"service:foo AND type:error\\\").index(\\\"main\\\").rollup(\\\"count\\\").by(\\\"source\\\").last(\\\"5m\\\") > 2\",\"tags\":[\"test:testvalidateamultialertmonitorreturnsokresponse1660586686\",\"env:ci\"],\"type\":\"log alert\"}"
+            "text": "{\"message\":\"some message Notify: @hipchat-channel\",\"name\":\"Test-Validate_a_multi_alert_monitor_returns_OK_response-1664556093\",\"options\":{\"enable_logs_sample\":true,\"escalation_message\":\"the situation has escalated\",\"evaluation_delay\":700,\"group_retention_duration\":\"2d\",\"groupby_simple_monitor\":false,\"include_tags\":true,\"locked\":false,\"new_host_delay\":600,\"no_data_timeframe\":null,\"notify_audit\":false,\"notify_by\":[\"status\"],\"notify_no_data\":false,\"on_missing_data\":\"show_and_notify_no_data\",\"renotify_interval\":60,\"require_full_window\":true,\"thresholds\":{\"critical\":2,\"warning\":1},\"timeout_h\":24},\"priority\":3,\"query\":\"logs(\\\"service:foo AND type:error\\\").index(\\\"main\\\").rollup(\\\"count\\\").by(\\\"source,status\\\").last(\\\"5m\\\") > 2\",\"tags\":[\"test:testvalidateamultialertmonitorreturnsokresponse1664556093\",\"env:ci\"],\"type\":\"log alert\"}"
           },
           "queryString": [],
           "url": "https://api.datadoghq.com/api/v1/monitor/validate"
         },
         "response": {
-          "bodySize": 2,
+          "bodySize": 3,
           "content": {
             "mimeType": "application/json",
-            "size": 2,
-            "text": "{}"
+            "size": 3,
+            "text": "{}\n"
           },
           "cookies": [],
           "headers": [
@@ -51,14 +51,14 @@
               "value": "application/json"
             }
           ],
-          "headersSize": 611,
+          "headersSize": 568,
           "httpVersion": "HTTP/1.1",
           "redirectURL": "",
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2022-08-15T18:04:46.760Z",
-        "time": 355
+        "startedDateTime": "2022-09-30T16:41:33.817Z",
+        "time": 672
       }
     ],
     "pages": [],

examples/v1/monitors/ValidateMonitor_4247196452.ts

@@ -11,7 +11,7 @@ const params: v1.MonitorsApiValidateMonitorRequest = {
   body: {
     name: "Example-Validate_a_multi_alert_monitor_returns_OK_response",
     type: "log alert",
-    query: `logs("service:foo AND type:error").index("main").rollup("count").by("source").last("5m") > 2`,
+    query: `logs("service:foo AND type:error").index("main").rollup("count").by("source,status").last("5m") > 2`,
     message: "some message Notify: @hipchat-channel",
     tags: ["test:examplevalidateamultialertmonitorreturnsokresponse", "env:ci"],
     priority: 3,
@@ -26,6 +26,7 @@ const params: v1.MonitorsApiValidateMonitorRequest = {
       newHostDelay: 600,
       noDataTimeframe: undefined,
       notifyAudit: false,
+      notifyBy: ["status"],
       notifyNoData: false,
       onMissingData: "show_and_notify_no_data",
       renotifyInterval: 60,

features/v1/monitors.feature

@@ -115,7 +115,7 @@ Feature: Monitors
   Scenario: Edit a monitor returns "Bad Request" response
     Given new "UpdateMonitor" request
     And request contains "monitor_id" parameter from "REPLACE.ME"
-    And body with value {"options": {"escalation_message": "none", "evaluation_delay": null, "include_tags": true, "min_failure_duration": 0, "min_location_failed": 1, "new_group_delay": null, "new_host_delay": 300, "no_data_timeframe": null, "notify_audit": false, "notify_no_data": false, "on_missing_data": "default", "renotify_interval": null, "renotify_occurrences": null, "renotify_statuses": ["alert"], "synthetics_check_id": null, "threshold_windows": {"recovery_window": null, "trigger_window": null}, "thresholds": {"critical_recovery": null, "ok": null, "unknown": null, "warning": null, "warning_recovery": null}, "timeout_h": null, "variables": [{"compute": {"aggregation": "avg", "interval": 60000, "metric": "@duration"}, "data_source": "rum", "group_by": [{"facet": "status", "limit": 10, "sort": {"aggregation": "avg", "order": "desc"}}], "indexes": ["days-3", "days-7"], "name": "query_errors", "search": {"query": "service:query"}}]}, "restricted_roles": [], "tags": [], "type": "query alert"}
+    And body with value {"options": {"escalation_message": "none", "evaluation_delay": null, "include_tags": true, "min_failure_duration": 0, "min_location_failed": 1, "new_group_delay": null, "new_host_delay": 300, "no_data_timeframe": null, "notify_audit": false, "notify_by": [], "notify_no_data": false, "on_missing_data": "default", "renotify_interval": null, "renotify_occurrences": null, "renotify_statuses": ["alert"], "synthetics_check_id": null, "threshold_windows": {"recovery_window": null, "trigger_window": null}, "thresholds": {"critical_recovery": null, "ok": null, "unknown": null, "warning": null, "warning_recovery": null}, "timeout_h": null, "variables": [{"compute": {"aggregation": "avg", "interval": 60000, "metric": "@duration"}, "data_source": "rum", "group_by": [{"facet": "status", "limit": 10, "sort": {"aggregation": "avg", "order": "desc"}}], "indexes": ["days-3", "days-7"], "name": "query_errors", "search": {"query": "service:query"}}]}, "restricted_roles": [], "tags": [], "type": "query alert"}
     When the request is sent
     Then the response status is 400 Bad Request
 

features/v1/multi_alert_monitor_payload.json

@@ -1,7 +1,7 @@
 {
   "name": "{{ unique }}",
   "type": "log alert",
-  "query": "logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source\").last(\"5m\") > 2",
+  "query": "logs(\"service:foo AND type:error\").index(\"main\").rollup(\"count\").by(\"source,status\").last(\"5m\") > 2",
   "message": "some message Notify: @hipchat-channel",
   "tags": ["test:{{ unique_lower_alnum }}", "env:ci"],
   "priority": 3,
@@ -16,6 +16,7 @@
     "new_host_delay": 600,
     "no_data_timeframe": null,
     "notify_audit": false,
+    "notify_by": ["status"],
     "notify_no_data": false,
     "on_missing_data": "show_and_notify_no_data",
     "renotify_interval": 60,

packages/datadog-api-client-v1/models/MonitorOptions.ts

@@ -101,6 +101,14 @@ export class MonitorOptions {
    * A Boolean indicating whether tagged users is notified on changes to this monitor.
    */
   "notifyAudit"?: boolean;
+  /**
+   * Controls what granularity a monitor alerts on. Only available for multi-alerts.
+   * For instance, a monitor grouped by `cluster`, `namespace`, `pod` can be configured to only notify on each
+   * new `cluster` violating the alert conditions by setting `notify_by` to `["cluster"]`. Tags mentioned
+   * in `notify_by` have to be a subset of the grouping tags in the query.
+   * For example, a query grouped by `cluster`, `namespace` cannot notify on `region`.
+   */
+  "notifyBy"?: Array<string>;
   /**
    * A Boolean indicating whether this monitor notifies when data stops reporting.
    */
@@ -232,6 +240,10 @@ export class MonitorOptions {
       baseName: "notify_audit",
       type: "boolean",
     },
+    notifyBy: {
+      baseName: "notify_by",
+      type: "Array<string>",
+    },
     notifyNoData: {
       baseName: "notify_no_data",
       type: "boolean",