diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml index 0eb8762ac2b..daea243f007 100644 --- a/.generator/schemas/v1/openapi.yaml +++ b/.generator/schemas/v1/openapi.yaml @@ -23207,6 +23207,10 @@ components: description: Shows the average number of Serverless Apps for Azure Web App instances for the current date for all organizations. format: int64 type: integer + serverless_apps_dsm_fargate_tasks_avg: + description: Shows the average number of DSM Fargate ECS tasks monitored under Serverless Apps DSM for the current date for all organizations. + format: int64 + type: integer serverless_apps_ecs_avg: description: Shows the average number of Serverless Apps for Elastic Container Service for the current date for all organizations. format: int64 @@ -24244,6 +24248,10 @@ components: description: Shows the average number of Serverless Apps for Azure Web App instances for the given date and given org. format: int64 type: integer + serverless_apps_dsm_fargate_tasks_avg: + description: Shows the average number of DSM Fargate ECS tasks monitored under Serverless Apps DSM for the given date and given org. + format: int64 + type: integer serverless_apps_ecs_avg: description: Shows the average number of Serverless Apps for Elastic Container Service for the given date and given org. format: int64 @@ -25299,6 +25307,10 @@ components: description: Sum of the average number of Serverless Apps for Azure Web App instances in the current month for all organizations. format: int64 type: integer + serverless_apps_dsm_fargate_tasks_avg_sum: + description: Sum of the average number of DSM Fargate ECS tasks monitored under Serverless Apps DSM in the current month for all organizations. + format: int64 + type: integer serverless_apps_ecs_avg_sum: description: Sum of the average number of Serverless Apps for Elastic Container Service in the current month for all organizations. format: int64 diff --git a/.generator/schemas/v2/openapi.yaml b/.generator/schemas/v2/openapi.yaml index 2692eaaf1cf..086b5f9ef37 100644 --- a/.generator/schemas/v2/openapi.yaml +++ b/.generator/schemas/v2/openapi.yaml @@ -66681,9 +66681,6 @@ components: filter: description: Filter expression applied to the recommendations. type: string - scope: - description: Recommendations scope. Defaults to `ccm`; use `experiment` for experimental recommendations or `*` for both. - type: string sort: description: Ordered list of sort clauses applied to the result set. items: diff --git a/src/main/java/com/datadog/api/client/v1/model/UsageSummaryDate.java b/src/main/java/com/datadog/api/client/v1/model/UsageSummaryDate.java index f02a5c23c4a..ede38ac27fe 100644 --- a/src/main/java/com/datadog/api/client/v1/model/UsageSummaryDate.java +++ b/src/main/java/com/datadog/api/client/v1/model/UsageSummaryDate.java @@ -248,6 +248,7 @@ UsageSummaryDate.JSON_PROPERTY_SERVERLESS_APPS_AZURE_COUNT_AVG, UsageSummaryDate.JSON_PROPERTY_SERVERLESS_APPS_AZURE_FUNCTION_APP_INSTANCES_AVG, UsageSummaryDate.JSON_PROPERTY_SERVERLESS_APPS_AZURE_WEB_APP_INSTANCES_AVG, + UsageSummaryDate.JSON_PROPERTY_SERVERLESS_APPS_DSM_FARGATE_TASKS_AVG, UsageSummaryDate.JSON_PROPERTY_SERVERLESS_APPS_ECS_AVG, UsageSummaryDate.JSON_PROPERTY_SERVERLESS_APPS_EKS_AVG, UsageSummaryDate.JSON_PROPERTY_SERVERLESS_APPS_EXCL_FARGATE_AVG, @@ -1091,6 +1092,10 @@ public class UsageSummaryDate { "serverless_apps_azure_web_app_instances_avg"; private Long serverlessAppsAzureWebAppInstancesAvg; + public static final String JSON_PROPERTY_SERVERLESS_APPS_DSM_FARGATE_TASKS_AVG = + "serverless_apps_dsm_fargate_tasks_avg"; + private Long serverlessAppsDsmFargateTasksAvg; + public static final String JSON_PROPERTY_SERVERLESS_APPS_ECS_AVG = "serverless_apps_ecs_avg"; private Long serverlessAppsEcsAvg; @@ -6272,6 +6277,28 @@ public void setServerlessAppsAzureWebAppInstancesAvg(Long serverlessAppsAzureWeb this.serverlessAppsAzureWebAppInstancesAvg = serverlessAppsAzureWebAppInstancesAvg; } + public UsageSummaryDate serverlessAppsDsmFargateTasksAvg(Long serverlessAppsDsmFargateTasksAvg) { + this.serverlessAppsDsmFargateTasksAvg = serverlessAppsDsmFargateTasksAvg; + return this; + } + + /** + * Shows the average number of DSM Fargate ECS tasks monitored under Serverless Apps DSM for the + * current date for all organizations. + * + * @return serverlessAppsDsmFargateTasksAvg + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SERVERLESS_APPS_DSM_FARGATE_TASKS_AVG) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getServerlessAppsDsmFargateTasksAvg() { + return serverlessAppsDsmFargateTasksAvg; + } + + public void setServerlessAppsDsmFargateTasksAvg(Long serverlessAppsDsmFargateTasksAvg) { + this.serverlessAppsDsmFargateTasksAvg = serverlessAppsDsmFargateTasksAvg; + } + public UsageSummaryDate serverlessAppsEcsAvg(Long serverlessAppsEcsAvg) { this.serverlessAppsEcsAvg = serverlessAppsEcsAvg; return this; @@ -7349,6 +7376,9 @@ public boolean equals(Object o) { && Objects.equals( this.serverlessAppsAzureWebAppInstancesAvg, usageSummaryDate.serverlessAppsAzureWebAppInstancesAvg) + && Objects.equals( + this.serverlessAppsDsmFargateTasksAvg, + usageSummaryDate.serverlessAppsDsmFargateTasksAvg) && Objects.equals(this.serverlessAppsEcsAvg, usageSummaryDate.serverlessAppsEcsAvg) && Objects.equals(this.serverlessAppsEksAvg, usageSummaryDate.serverlessAppsEksAvg) && Objects.equals( @@ -7640,6 +7670,7 @@ public int hashCode() { serverlessAppsAzureCountAvg, serverlessAppsAzureFunctionAppInstancesAvg, serverlessAppsAzureWebAppInstancesAvg, + serverlessAppsDsmFargateTasksAvg, serverlessAppsEcsAvg, serverlessAppsEksAvg, serverlessAppsExclFargateAvg, @@ -8233,6 +8264,9 @@ public String toString() { sb.append(" serverlessAppsAzureWebAppInstancesAvg: ") .append(toIndentedString(serverlessAppsAzureWebAppInstancesAvg)) .append("\n"); + sb.append(" serverlessAppsDsmFargateTasksAvg: ") + .append(toIndentedString(serverlessAppsDsmFargateTasksAvg)) + .append("\n"); sb.append(" serverlessAppsEcsAvg: ") .append(toIndentedString(serverlessAppsEcsAvg)) .append("\n"); diff --git a/src/main/java/com/datadog/api/client/v1/model/UsageSummaryDateOrg.java b/src/main/java/com/datadog/api/client/v1/model/UsageSummaryDateOrg.java index 1ee6b30a032..d78a52697e5 100644 --- a/src/main/java/com/datadog/api/client/v1/model/UsageSummaryDateOrg.java +++ b/src/main/java/com/datadog/api/client/v1/model/UsageSummaryDateOrg.java @@ -251,6 +251,7 @@ UsageSummaryDateOrg.JSON_PROPERTY_SERVERLESS_APPS_AZURE_COUNT_AVG, UsageSummaryDateOrg.JSON_PROPERTY_SERVERLESS_APPS_AZURE_FUNCTION_APP_INSTANCES_AVG, UsageSummaryDateOrg.JSON_PROPERTY_SERVERLESS_APPS_AZURE_WEB_APP_INSTANCES_AVG, + UsageSummaryDateOrg.JSON_PROPERTY_SERVERLESS_APPS_DSM_FARGATE_TASKS_AVG, UsageSummaryDateOrg.JSON_PROPERTY_SERVERLESS_APPS_ECS_AVG, UsageSummaryDateOrg.JSON_PROPERTY_SERVERLESS_APPS_EKS_AVG, UsageSummaryDateOrg.JSON_PROPERTY_SERVERLESS_APPS_EXCL_FARGATE_AVG, @@ -1113,6 +1114,10 @@ public class UsageSummaryDateOrg { "serverless_apps_azure_web_app_instances_avg"; private Long serverlessAppsAzureWebAppInstancesAvg; + public static final String JSON_PROPERTY_SERVERLESS_APPS_DSM_FARGATE_TASKS_AVG = + "serverless_apps_dsm_fargate_tasks_avg"; + private Long serverlessAppsDsmFargateTasksAvg; + public static final String JSON_PROPERTY_SERVERLESS_APPS_ECS_AVG = "serverless_apps_ecs_avg"; private Long serverlessAppsEcsAvg; @@ -6413,6 +6418,29 @@ public void setServerlessAppsAzureWebAppInstancesAvg(Long serverlessAppsAzureWeb this.serverlessAppsAzureWebAppInstancesAvg = serverlessAppsAzureWebAppInstancesAvg; } + public UsageSummaryDateOrg serverlessAppsDsmFargateTasksAvg( + Long serverlessAppsDsmFargateTasksAvg) { + this.serverlessAppsDsmFargateTasksAvg = serverlessAppsDsmFargateTasksAvg; + return this; + } + + /** + * Shows the average number of DSM Fargate ECS tasks monitored under Serverless Apps DSM for the + * given date and given org. + * + * @return serverlessAppsDsmFargateTasksAvg + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SERVERLESS_APPS_DSM_FARGATE_TASKS_AVG) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getServerlessAppsDsmFargateTasksAvg() { + return serverlessAppsDsmFargateTasksAvg; + } + + public void setServerlessAppsDsmFargateTasksAvg(Long serverlessAppsDsmFargateTasksAvg) { + this.serverlessAppsDsmFargateTasksAvg = serverlessAppsDsmFargateTasksAvg; + } + public UsageSummaryDateOrg serverlessAppsEcsAvg(Long serverlessAppsEcsAvg) { this.serverlessAppsEcsAvg = serverlessAppsEcsAvg; return this; @@ -7518,6 +7546,9 @@ public boolean equals(Object o) { && Objects.equals( this.serverlessAppsAzureWebAppInstancesAvg, usageSummaryDateOrg.serverlessAppsAzureWebAppInstancesAvg) + && Objects.equals( + this.serverlessAppsDsmFargateTasksAvg, + usageSummaryDateOrg.serverlessAppsDsmFargateTasksAvg) && Objects.equals(this.serverlessAppsEcsAvg, usageSummaryDateOrg.serverlessAppsEcsAvg) && Objects.equals(this.serverlessAppsEksAvg, usageSummaryDateOrg.serverlessAppsEksAvg) && Objects.equals( @@ -7815,6 +7846,7 @@ public int hashCode() { serverlessAppsAzureCountAvg, serverlessAppsAzureFunctionAppInstancesAvg, serverlessAppsAzureWebAppInstancesAvg, + serverlessAppsDsmFargateTasksAvg, serverlessAppsEcsAvg, serverlessAppsEksAvg, serverlessAppsExclFargateAvg, @@ -8416,6 +8448,9 @@ public String toString() { sb.append(" serverlessAppsAzureWebAppInstancesAvg: ") .append(toIndentedString(serverlessAppsAzureWebAppInstancesAvg)) .append("\n"); + sb.append(" serverlessAppsDsmFargateTasksAvg: ") + .append(toIndentedString(serverlessAppsDsmFargateTasksAvg)) + .append("\n"); sb.append(" serverlessAppsEcsAvg: ") .append(toIndentedString(serverlessAppsEcsAvg)) .append("\n"); diff --git a/src/main/java/com/datadog/api/client/v1/model/UsageSummaryResponse.java b/src/main/java/com/datadog/api/client/v1/model/UsageSummaryResponse.java index 3ed4744c264..f1452391540 100644 --- a/src/main/java/com/datadog/api/client/v1/model/UsageSummaryResponse.java +++ b/src/main/java/com/datadog/api/client/v1/model/UsageSummaryResponse.java @@ -262,6 +262,7 @@ UsageSummaryResponse.JSON_PROPERTY_SERVERLESS_APPS_AZURE_COUNT_AVG_SUM, UsageSummaryResponse.JSON_PROPERTY_SERVERLESS_APPS_AZURE_FUNCTION_APP_INSTANCES_AVG_SUM, UsageSummaryResponse.JSON_PROPERTY_SERVERLESS_APPS_AZURE_WEB_APP_INSTANCES_AVG_SUM, + UsageSummaryResponse.JSON_PROPERTY_SERVERLESS_APPS_DSM_FARGATE_TASKS_AVG_SUM, UsageSummaryResponse.JSON_PROPERTY_SERVERLESS_APPS_ECS_AVG_SUM, UsageSummaryResponse.JSON_PROPERTY_SERVERLESS_APPS_EKS_AVG_SUM, UsageSummaryResponse.JSON_PROPERTY_SERVERLESS_APPS_EXCL_FARGATE_AVG_SUM, @@ -1183,6 +1184,10 @@ public class UsageSummaryResponse { "serverless_apps_azure_web_app_instances_avg_sum"; private Long serverlessAppsAzureWebAppInstancesAvgSum; + public static final String JSON_PROPERTY_SERVERLESS_APPS_DSM_FARGATE_TASKS_AVG_SUM = + "serverless_apps_dsm_fargate_tasks_avg_sum"; + private Long serverlessAppsDsmFargateTasksAvgSum; + public static final String JSON_PROPERTY_SERVERLESS_APPS_ECS_AVG_SUM = "serverless_apps_ecs_avg_sum"; private Long serverlessAppsEcsAvgSum; @@ -6645,6 +6650,29 @@ public void setServerlessAppsAzureWebAppInstancesAvgSum( this.serverlessAppsAzureWebAppInstancesAvgSum = serverlessAppsAzureWebAppInstancesAvgSum; } + public UsageSummaryResponse serverlessAppsDsmFargateTasksAvgSum( + Long serverlessAppsDsmFargateTasksAvgSum) { + this.serverlessAppsDsmFargateTasksAvgSum = serverlessAppsDsmFargateTasksAvgSum; + return this; + } + + /** + * Sum of the average number of DSM Fargate ECS tasks monitored under Serverless Apps DSM in the + * current month for all organizations. + * + * @return serverlessAppsDsmFargateTasksAvgSum + */ + @jakarta.annotation.Nullable + @JsonProperty(JSON_PROPERTY_SERVERLESS_APPS_DSM_FARGATE_TASKS_AVG_SUM) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public Long getServerlessAppsDsmFargateTasksAvgSum() { + return serverlessAppsDsmFargateTasksAvgSum; + } + + public void setServerlessAppsDsmFargateTasksAvgSum(Long serverlessAppsDsmFargateTasksAvgSum) { + this.serverlessAppsDsmFargateTasksAvgSum = serverlessAppsDsmFargateTasksAvgSum; + } + public UsageSummaryResponse serverlessAppsEcsAvgSum(Long serverlessAppsEcsAvgSum) { this.serverlessAppsEcsAvgSum = serverlessAppsEcsAvgSum; return this; @@ -7892,6 +7920,9 @@ public boolean equals(Object o) { && Objects.equals( this.serverlessAppsAzureWebAppInstancesAvgSum, usageSummaryResponse.serverlessAppsAzureWebAppInstancesAvgSum) + && Objects.equals( + this.serverlessAppsDsmFargateTasksAvgSum, + usageSummaryResponse.serverlessAppsDsmFargateTasksAvgSum) && Objects.equals( this.serverlessAppsEcsAvgSum, usageSummaryResponse.serverlessAppsEcsAvgSum) && Objects.equals( @@ -8204,6 +8235,7 @@ public int hashCode() { serverlessAppsAzureCountAvgSum, serverlessAppsAzureFunctionAppInstancesAvgSum, serverlessAppsAzureWebAppInstancesAvgSum, + serverlessAppsDsmFargateTasksAvgSum, serverlessAppsEcsAvgSum, serverlessAppsEksAvgSum, serverlessAppsExclFargateAvgSum, @@ -8872,6 +8904,9 @@ public String toString() { sb.append(" serverlessAppsAzureWebAppInstancesAvgSum: ") .append(toIndentedString(serverlessAppsAzureWebAppInstancesAvgSum)) .append("\n"); + sb.append(" serverlessAppsDsmFargateTasksAvgSum: ") + .append(toIndentedString(serverlessAppsDsmFargateTasksAvgSum)) + .append("\n"); sb.append(" serverlessAppsEcsAvgSum: ") .append(toIndentedString(serverlessAppsEcsAvgSum)) .append("\n"); diff --git a/src/main/java/com/datadog/api/client/v2/model/RecommendationsFilterRequest.java b/src/main/java/com/datadog/api/client/v2/model/RecommendationsFilterRequest.java index 7a56006839d..b46f68d51e6 100644 --- a/src/main/java/com/datadog/api/client/v2/model/RecommendationsFilterRequest.java +++ b/src/main/java/com/datadog/api/client/v2/model/RecommendationsFilterRequest.java @@ -21,7 +21,6 @@ /** Request body for filtering cost recommendations. */ @JsonPropertyOrder({ RecommendationsFilterRequest.JSON_PROPERTY_FILTER, - RecommendationsFilterRequest.JSON_PROPERTY_SCOPE, RecommendationsFilterRequest.JSON_PROPERTY_SORT, RecommendationsFilterRequest.JSON_PROPERTY_VIEW }) @@ -32,9 +31,6 @@ public class RecommendationsFilterRequest { public static final String JSON_PROPERTY_FILTER = "filter"; private String filter; - public static final String JSON_PROPERTY_SCOPE = "scope"; - private String scope; - public static final String JSON_PROPERTY_SORT = "sort"; private List sort = null; @@ -62,28 +58,6 @@ public void setFilter(String filter) { this.filter = filter; } - public RecommendationsFilterRequest scope(String scope) { - this.scope = scope; - return this; - } - - /** - * Recommendations scope. Defaults to ccm; use experiment for - * experimental recommendations or * for both. - * - * @return scope - */ - @jakarta.annotation.Nullable - @JsonProperty(JSON_PROPERTY_SCOPE) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getScope() { - return scope; - } - - public void setScope(String scope) { - this.scope = scope; - } - public RecommendationsFilterRequest sort(List sort) { this.sort = sort; for (RecommendationsFilterRequestSortItems item : sort) { @@ -196,7 +170,6 @@ public boolean equals(Object o) { } RecommendationsFilterRequest recommendationsFilterRequest = (RecommendationsFilterRequest) o; return Objects.equals(this.filter, recommendationsFilterRequest.filter) - && Objects.equals(this.scope, recommendationsFilterRequest.scope) && Objects.equals(this.sort, recommendationsFilterRequest.sort) && Objects.equals(this.view, recommendationsFilterRequest.view) && Objects.equals( @@ -205,7 +178,7 @@ public boolean equals(Object o) { @Override public int hashCode() { - return Objects.hash(filter, scope, sort, view, additionalProperties); + return Objects.hash(filter, sort, view, additionalProperties); } @Override @@ -213,7 +186,6 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class RecommendationsFilterRequest {\n"); sb.append(" filter: ").append(toIndentedString(filter)).append("\n"); - sb.append(" scope: ").append(toIndentedString(scope)).append("\n"); sb.append(" sort: ").append(toIndentedString(sort)).append("\n"); sb.append(" view: ").append(toIndentedString(view)).append("\n"); sb.append(" additionalProperties: ")