Skip to content

Commit 6eccd41

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Allow monitor notification rule on restriction policy (#3822)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent 8e723dd commit 6eccd41

File tree

7 files changed

+49
-4
lines changed

7 files changed

+49
-4
lines changed

.generator/schemas/v1/openapi.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4579,6 +4579,7 @@ components:
45794579
- sca_fargate_usage
45804580
- sds_scanned_bytes_usage
45814581
- serverless_apps_usage
4582+
- serverless_apps_apm_usage
45824583
- siem_analyzed_logs_add_on_usage
45834584
- siem_ingested_bytes_usage
45844585
- snmp_usage
@@ -4666,6 +4667,7 @@ components:
46664667
- SCA_FARGATE_USAGE
46674668
- SDS_SCANNED_BYTES_USAGE
46684669
- SERVERLESS_APPS_USAGE
4670+
- SERVERLESS_APPS_APM_USAGE
46694671
- SIEM_ANALYZED_LOGS_ADD_ON_USAGE
46704672
- SIEM_INGESTED_BYTES_USAGE
46714673
- SNMP_USAGE
@@ -9156,6 +9158,8 @@ components:
91569158
- published_app_percentage
91579159
- serverless_apps_usage
91589160
- serverless_apps_percentage
9161+
- serverless_apps_apm_usage
9162+
- serverless_apps_apm_percentage
91599163
- snmp_usage
91609164
- snmp_percentage
91619165
- universal_service_monitoring_usage
@@ -9321,6 +9325,8 @@ components:
93219325
- PUBLISHED_APP_PERCENTAGE
93229326
- SERVERLESS_APPS_USAGE
93239327
- SERVERLESS_APPS_PERCENTAGE
9328+
- SERVERLESS_APPS_APM_USAGE
9329+
- SERVERLESS_APPS_APM_PERCENTAGE
93249330
- SNMP_USAGE
93259331
- SNMP_PERCENTAGE
93269332
- UNIVERSAL_SERVICE_MONITORING_USAGE
@@ -9978,6 +9984,14 @@ components:
99789984
description: The total Sensitive Data Scanner usage by tag(s).
99799985
format: double
99809986
type: number
9987+
serverless_apps_apm_percentage:
9988+
description: The percentage of Serverless Apps APM usage by tag(s).
9989+
format: double
9990+
type: number
9991+
serverless_apps_apm_usage:
9992+
description: The total Serverless Apps APM usage by tag(s).
9993+
format: double
9994+
type: number
99819995
serverless_apps_percentage:
99829996
description: The percentage of Serverless Apps usage by tag(s).
99839997
format: double

.generator/schemas/v2/openapi.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@ components:
10561056
type: string
10571057
ResourceID:
10581058
description: |-
1059-
Identifier, formatted as `type:id`. Supported types: `dashboard`, `integration-service`, `integration-webhook`, `notebook`, `powerpack`, `reference-table`, `security-rule`, `slo`, `synthetics-global-variable`, `synthetics-test`, `synthetics-private-location`, `monitor`, `workflow`, `app-builder-app`, `connection`, `connection-group`, `rum-application`, `cross-org-connection`, `spreadsheet`, `on-call-schedule`, `on-call-escalation-policy`, `on-call-team-routing-rules`, `logs-pipeline`, `case-management-project`.
1059+
Identifier, formatted as `type:id`. Supported types: `dashboard`, `integration-service`, `integration-webhook`, `notebook`, `powerpack`, `reference-table`, `security-rule`, `slo`, `synthetics-global-variable`, `synthetics-test`, `synthetics-private-location`, `monitor`, `workflow`, `app-builder-app`, `connection`, `connection-group`, `rum-application`, `cross-org-connection`, `spreadsheet`, `on-call-schedule`, `on-call-escalation-policy`, `on-call-team-routing-rules`, `logs-pipeline`, `case-management-project`, `monitor-notification-rule`.
10601060
example: "dashboard:abc-def-ghi"
10611061
in: path
10621062
name: resource_id
@@ -99061,6 +99061,7 @@ paths:
9906199061
- On-Call Team Routing Rules: `on-call-team-routing-rules`
9906299062
- Logs Pipelines: `logs-pipeline`
9906399063
- Case Management Projects: `case-management-project`
99064+
- Monitor Notification Rules: `monitor-notification-rule`
9906499065

9906599066
#### Supported relations for resources
9906699067
Resource Type | Supported Relations
@@ -99089,6 +99090,7 @@ paths:
9908999090
On-Call Team Routing Rules | `viewer`, `editor`
9909099091
Logs Pipelines | `viewer`, `processors_editor`, `editor`
9909199092
Case Management Projects | `viewer`, `contributor`, `manager`
99093+
Monitor Notification Rules | `viewer`, `editor`
9909299094
operationId: UpdateRestrictionPolicy
9909399095
parameters:
9909499096
- $ref: "#/components/parameters/ResourceID"

services/restriction_policies/src/v2/RestrictionPoliciesApi.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,23 +370,23 @@ export class RestrictionPoliciesApiResponseProcessor {
370370

371371
export interface RestrictionPoliciesApiDeleteRestrictionPolicyRequest {
372372
/**
373-
* Identifier, formatted as `type:id`. Supported types: `dashboard`, `integration-service`, `integration-webhook`, `notebook`, `powerpack`, `reference-table`, `security-rule`, `slo`, `synthetics-global-variable`, `synthetics-test`, `synthetics-private-location`, `monitor`, `workflow`, `app-builder-app`, `connection`, `connection-group`, `rum-application`, `cross-org-connection`, `spreadsheet`, `on-call-schedule`, `on-call-escalation-policy`, `on-call-team-routing-rules`, `logs-pipeline`, `case-management-project`.
373+
* Identifier, formatted as `type:id`. Supported types: `dashboard`, `integration-service`, `integration-webhook`, `notebook`, `powerpack`, `reference-table`, `security-rule`, `slo`, `synthetics-global-variable`, `synthetics-test`, `synthetics-private-location`, `monitor`, `workflow`, `app-builder-app`, `connection`, `connection-group`, `rum-application`, `cross-org-connection`, `spreadsheet`, `on-call-schedule`, `on-call-escalation-policy`, `on-call-team-routing-rules`, `logs-pipeline`, `case-management-project`, `monitor-notification-rule`.
374374
* @type string
375375
*/
376376
resourceId: string;
377377
}
378378

379379
export interface RestrictionPoliciesApiGetRestrictionPolicyRequest {
380380
/**
381-
* Identifier, formatted as `type:id`. Supported types: `dashboard`, `integration-service`, `integration-webhook`, `notebook`, `powerpack`, `reference-table`, `security-rule`, `slo`, `synthetics-global-variable`, `synthetics-test`, `synthetics-private-location`, `monitor`, `workflow`, `app-builder-app`, `connection`, `connection-group`, `rum-application`, `cross-org-connection`, `spreadsheet`, `on-call-schedule`, `on-call-escalation-policy`, `on-call-team-routing-rules`, `logs-pipeline`, `case-management-project`.
381+
* Identifier, formatted as `type:id`. Supported types: `dashboard`, `integration-service`, `integration-webhook`, `notebook`, `powerpack`, `reference-table`, `security-rule`, `slo`, `synthetics-global-variable`, `synthetics-test`, `synthetics-private-location`, `monitor`, `workflow`, `app-builder-app`, `connection`, `connection-group`, `rum-application`, `cross-org-connection`, `spreadsheet`, `on-call-schedule`, `on-call-escalation-policy`, `on-call-team-routing-rules`, `logs-pipeline`, `case-management-project`, `monitor-notification-rule`.
382382
* @type string
383383
*/
384384
resourceId: string;
385385
}
386386

387387
export interface RestrictionPoliciesApiUpdateRestrictionPolicyRequest {
388388
/**
389-
* Identifier, formatted as `type:id`. Supported types: `dashboard`, `integration-service`, `integration-webhook`, `notebook`, `powerpack`, `reference-table`, `security-rule`, `slo`, `synthetics-global-variable`, `synthetics-test`, `synthetics-private-location`, `monitor`, `workflow`, `app-builder-app`, `connection`, `connection-group`, `rum-application`, `cross-org-connection`, `spreadsheet`, `on-call-schedule`, `on-call-escalation-policy`, `on-call-team-routing-rules`, `logs-pipeline`, `case-management-project`.
389+
* Identifier, formatted as `type:id`. Supported types: `dashboard`, `integration-service`, `integration-webhook`, `notebook`, `powerpack`, `reference-table`, `security-rule`, `slo`, `synthetics-global-variable`, `synthetics-test`, `synthetics-private-location`, `monitor`, `workflow`, `app-builder-app`, `connection`, `connection-group`, `rum-application`, `cross-org-connection`, `spreadsheet`, `on-call-schedule`, `on-call-escalation-policy`, `on-call-team-routing-rules`, `logs-pipeline`, `case-management-project`, `monitor-notification-rule`.
390390
* @type string
391391
*/
392392
resourceId: string;
@@ -495,6 +495,7 @@ export class RestrictionPoliciesApi {
495495
* - On-Call Team Routing Rules: `on-call-team-routing-rules`
496496
* - Logs Pipelines: `logs-pipeline`
497497
* - Case Management Projects: `case-management-project`
498+
* - Monitor Notification Rules: `monitor-notification-rule`
498499
*
499500
* #### Supported relations for resources
500501
* Resource Type | Supported Relations
@@ -523,6 +524,7 @@ export class RestrictionPoliciesApi {
523524
* On-Call Team Routing Rules | `viewer`, `editor`
524525
* Logs Pipelines | `viewer`, `processors_editor`, `editor`
525526
* Case Management Projects | `viewer`, `contributor`, `manager`
527+
* Monitor Notification Rules | `viewer`, `editor`
526528
* @param param The request object
527529
*/
528530
public updateRestrictionPolicy(

services/usage_metering/src/v1/models/HourlyUsageAttributionUsageType.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ export type HourlyUsageAttributionUsageType =
8484
| typeof SCA_FARGATE_USAGE
8585
| typeof SDS_SCANNED_BYTES_USAGE
8686
| typeof SERVERLESS_APPS_USAGE
87+
| typeof SERVERLESS_APPS_APM_USAGE
8788
| typeof SIEM_ANALYZED_LOGS_ADD_ON_USAGE
8889
| typeof SIEM_INGESTED_BYTES_USAGE
8990
| typeof SNMP_USAGE
@@ -182,6 +183,7 @@ export const RUM_SESSION_REPLAY_ADD_ON_USAGE =
182183
export const SCA_FARGATE_USAGE = "sca_fargate_usage";
183184
export const SDS_SCANNED_BYTES_USAGE = "sds_scanned_bytes_usage";
184185
export const SERVERLESS_APPS_USAGE = "serverless_apps_usage";
186+
export const SERVERLESS_APPS_APM_USAGE = "serverless_apps_apm_usage";
185187
export const SIEM_ANALYZED_LOGS_ADD_ON_USAGE =
186188
"siem_analyzed_logs_add_on_usage";
187189
export const SIEM_INGESTED_BYTES_USAGE = "siem_ingested_bytes_usage";

services/usage_metering/src/v1/models/MonthlyUsageAttributionSupportedMetrics.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ export type MonthlyUsageAttributionSupportedMetrics =
107107
| typeof PUBLISHED_APP_PERCENTAGE
108108
| typeof SERVERLESS_APPS_USAGE
109109
| typeof SERVERLESS_APPS_PERCENTAGE
110+
| typeof SERVERLESS_APPS_APM_USAGE
111+
| typeof SERVERLESS_APPS_APM_PERCENTAGE
110112
| typeof SNMP_USAGE
111113
| typeof SNMP_PERCENTAGE
112114
| typeof UNIVERSAL_SERVICE_MONITORING_USAGE
@@ -288,6 +290,8 @@ export const PUBLISHED_APP_USAGE = "published_app_usage";
288290
export const PUBLISHED_APP_PERCENTAGE = "published_app_percentage";
289291
export const SERVERLESS_APPS_USAGE = "serverless_apps_usage";
290292
export const SERVERLESS_APPS_PERCENTAGE = "serverless_apps_percentage";
293+
export const SERVERLESS_APPS_APM_USAGE = "serverless_apps_apm_usage";
294+
export const SERVERLESS_APPS_APM_PERCENTAGE = "serverless_apps_apm_percentage";
291295
export const SNMP_USAGE = "snmp_usage";
292296
export const SNMP_PERCENTAGE = "snmp_percentage";
293297
export const UNIVERSAL_SERVICE_MONITORING_USAGE =

services/usage_metering/src/v1/models/MonthlyUsageAttributionValues.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,14 @@ export class MonthlyUsageAttributionValues {
596596
* The total Sensitive Data Scanner usage by tag(s).
597597
*/
598598
"sdsScannedBytesUsage"?: number;
599+
/**
600+
* The percentage of Serverless Apps APM usage by tag(s).
601+
*/
602+
"serverlessAppsApmPercentage"?: number;
603+
/**
604+
* The total Serverless Apps APM usage by tag(s).
605+
*/
606+
"serverlessAppsApmUsage"?: number;
599607
/**
600608
* The percentage of Serverless Apps usage by tag(s).
601609
*/
@@ -1407,6 +1415,16 @@ export class MonthlyUsageAttributionValues {
14071415
type: "number",
14081416
format: "double",
14091417
},
1418+
serverlessAppsApmPercentage: {
1419+
baseName: "serverless_apps_apm_percentage",
1420+
type: "number",
1421+
format: "double",
1422+
},
1423+
serverlessAppsApmUsage: {
1424+
baseName: "serverless_apps_apm_usage",
1425+
type: "number",
1426+
format: "double",
1427+
},
14101428
serverlessAppsPercentage: {
14111429
baseName: "serverless_apps_percentage",
14121430
type: "number",

services/usage_metering/src/v1/models/TypingInfo.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ export const TypingInfo: ModelTypingInfo = {
177177
"sca_fargate_usage",
178178
"sds_scanned_bytes_usage",
179179
"serverless_apps_usage",
180+
"serverless_apps_apm_usage",
180181
"siem_analyzed_logs_add_on_usage",
181182
"siem_ingested_bytes_usage",
182183
"snmp_usage",
@@ -287,6 +288,8 @@ export const TypingInfo: ModelTypingInfo = {
287288
"published_app_percentage",
288289
"serverless_apps_usage",
289290
"serverless_apps_percentage",
291+
"serverless_apps_apm_usage",
292+
"serverless_apps_apm_percentage",
290293
"snmp_usage",
291294
"snmp_percentage",
292295
"universal_service_monitoring_usage",

0 commit comments

Comments
 (0)