Add infra_host_basic and eph_infra_host_basic to usage metering API

.generator/schemas/v1/openapi.yaml

@@ -4542,6 +4542,7 @@ components:
         - incident_management_monthly_active_users_usage
         - indexed_spans_usage
         - infra_host_usage
+        - infra_host_basic_usage
         - ingested_logs_bytes_usage
         - ingested_spans_bytes_usage
         - invocations_usage
@@ -4629,6 +4630,7 @@ components:
         - INCIDENT_MANAGEMENT_MONTHLY_ACTIVE_USERS_USAGE
         - INDEXED_SPANS_USAGE
         - INFRA_HOST_USAGE
+        - INFRA_HOST_BASIC_USAGE
         - INGESTED_LOGS_BYTES_USAGE
         - INGESTED_SPANS_BYTES_USAGE
         - INVOCATIONS_USAGE
@@ -9122,6 +9124,8 @@ components:
         - incident_management_monthly_active_users_percentage
         - infra_host_usage
         - infra_host_percentage
+        - infra_host_basic_usage
+        - infra_host_basic_percentage
         - invocations_usage
         - invocations_percentage
         - lambda_traced_invocations_usage
@@ -9287,6 +9291,8 @@ components:
         - INCIDENT_MANAGEMENT_MONTHLY_ACTIVE_USERS_PERCENTAGE
         - INFRA_HOST_USAGE
         - INFRA_HOST_PERCENTAGE
+        - INFRA_HOST_BASIC_USAGE
+        - INFRA_HOST_BASIC_PERCENTAGE
         - INVOCATIONS_USAGE
         - INVOCATIONS_PERCENTAGE
         - LAMBDA_TRACED_INVOCATIONS_USAGE
@@ -9682,6 +9688,14 @@ components:
           description: The total APM Indexed Spans usage by tag(s).
           format: double
           type: number
+        infra_host_basic_percentage:
+          description: The percentage of infrastructure host Basic usage by tag(s).
+          format: double
+          type: number
+        infra_host_basic_usage:
+          description: The infrastructure host Basic usage by tag(s).
+          format: double
+          type: number
         infra_host_percentage:
           description: The percentage of infrastructure host usage by tag(s).
           format: double
@@ -21247,6 +21261,14 @@ components:
           description: Shows the average of all normalized Database Monitoring queries over all hours in the current date for all organizations.
           format: int64
           type: integer
+        eph_infra_basic_agent_sum:
+          description: Shows the sum of all ephemeral infrastructure hosts for Basic with the Datadog Agent over all hours in the current date for all organizations.
+          format: int64
+          type: integer
+        eph_infra_basic_vsphere_sum:
+          description: Shows the sum of all ephemeral infrastructure hosts for Basic on vSphere over all hours in the current date for all organizations.
+          format: int64
+          type: integer
         eph_infra_host_agent_sum:
           description: Shows the sum of all ephemeral infrastructure hosts with the Datadog Agent over all hours in the current date for the given org.
           format: int64
@@ -21263,6 +21285,10 @@ components:
           description: Shows the sum of all ephemeral infrastructure hosts on Azure over all hours in the current date for the given org.
           format: int64
           type: integer
+        eph_infra_host_basic_sum:
+          description: Shows the sum of all ephemeral infrastructure hosts for Basic over all hours in the current date for all organizations.
+          format: int64
+          type: integer
         eph_infra_host_ent_sum:
           description: Shows the sum of all ephemeral infrastructure hosts for Enterprise over all hours in the current date for the given org.
           format: int64
@@ -21407,10 +21433,22 @@ components:
           description: Shows the sum of all log events indexed over all hours in the current date for all organizations.
           format: int64
           type: integer
+        infra_basic_agent_host_top99p:
+          description: Shows the 99th percentile of all distinct infrastructure hosts for Basic with the Datadog Agent over all hours in the current date for all organizations.
+          format: int64
+          type: integer
+        infra_basic_vsphere_host_top99p:
+          description: Shows the 99th percentile of all distinct infrastructure hosts for Basic on vSphere over all hours in the current date for all organizations.
+          format: int64
+          type: integer
         infra_edge_monitoring_devices_top99p:
           description: Shows the 99th percentile of all Edge Devices Monitoring devices over all hours in the current date for all organizations.
           format: int64
           type: integer
+        infra_host_basic_top99p:
+          description: Shows the 99th percentile of all distinct infrastructure hosts for Basic over all hours in the current date for all organizations.
+          format: int64
+          type: integer
         infra_host_top99p:
           description: Shows the 99th percentile of all distinct infrastructure hosts over all hours in the current date for all organizations.
           format: int64
@@ -22140,6 +22178,14 @@ components:
           description: Shows the average of all distinct Database Monitoring normalized queries over all hours in the current month for the given org.
           format: int64
           type: integer
+        eph_infra_basic_agent_sum:
+          description: Shows the sum of all ephemeral infrastructure hosts for Basic with the Datadog Agent over all hours in the current date for the given org.
+          format: int64
+          type: integer
+        eph_infra_basic_vsphere_sum:
+          description: Shows the sum of all ephemeral infrastructure hosts for Basic on vSphere over all hours in the current date for the given org.
+          format: int64
+          type: integer
         eph_infra_host_agent_sum:
           description: Shows the sum of all ephemeral infrastructure hosts with the Datadog Agent over all hours in the current date for the given org.
           format: int64
@@ -22156,6 +22202,10 @@ components:
           description: Shows the sum of all ephemeral infrastructure hosts on Azure over all hours in the current date for the given org.
           format: int64
           type: integer
+        eph_infra_host_basic_sum:
+          description: Shows the sum of all ephemeral infrastructure hosts for Basic over all hours in the current date for the given org.
+          format: int64
+          type: integer
         eph_infra_host_ent_sum:
           description: Shows the sum of all ephemeral infrastructure hosts for Enterprise over all hours in the current date for the given org.
           format: int64
@@ -22304,10 +22354,22 @@ components:
           description: Shows the sum of all log events indexed over all hours in the current date for the given org (To be deprecated on October 1st, 2024).
           format: int64
           type: integer
+        infra_basic_agent_host_top99p:
+          description: Shows the 99th percentile of all distinct infrastructure hosts for Basic with the Datadog Agent over all hours in the current date for the given org.
+          format: int64
+          type: integer
+        infra_basic_vsphere_host_top99p:
+          description: Shows the 99th percentile of all distinct infrastructure hosts for Basic on vSphere over all hours in the current date for the given org.
+          format: int64
+          type: integer
         infra_edge_monitoring_devices_top99p:
           description: Shows the 99th percentile of all Edge Devices Monitoring devices over all hours in the current date for the given org.
           format: int64
           type: integer
+        infra_host_basic_top99p:
+          description: Shows the 99th percentile of all distinct infrastructure hosts for Basic over all hours in the current date for the given org.
+          format: int64
+          type: integer
         infra_host_top99p:
           description: Shows the 99th percentile of all distinct infrastructure hosts over all hours in the current date for the given org.
           format: int64
@@ -23043,6 +23105,14 @@ components:
           description: Shows the last date of usage in the current month for all organizations.
           format: date-time
           type: string
+        eph_infra_basic_agent_agg_sum:
+          description: Shows the sum of all ephemeral infrastructure hosts for Basic with the Datadog Agent over all hours in the current month for all organizations.
+          format: int64
+          type: integer
+        eph_infra_basic_vsphere_agg_sum:
+          description: Shows the sum of all ephemeral infrastructure hosts for Basic on vSphere over all hours in the current month for all organizations.
+          format: int64
+          type: integer
         eph_infra_host_agent_agg_sum:
           description: Shows the sum of all ephemeral infrastructure hosts with the Datadog Agent over all hours in the current month for all organizations.
           format: int64
@@ -23059,6 +23129,10 @@ components:
           description: Shows the sum of all ephemeral infrastructure hosts on Azure over all hours in the current month for all organizations.
           format: int64
           type: integer
+        eph_infra_host_basic_agg_sum:
+          description: Shows the sum of all ephemeral infrastructure hosts for Basic over all hours in the current month for all organizations.
+          format: int64
+          type: integer
         eph_infra_host_ent_agg_sum:
           description: Shows the sum of all ephemeral infrastructure hosts for Enterprise over all hours in the current month for all organizations.
           format: int64
@@ -23204,10 +23278,22 @@ components:
           description: Shows the sum of all log events indexed over all hours in the current month for all organizations (To be deprecated on October 1st, 2024).
           format: int64
           type: integer
+        infra_basic_agent_host_top99p_sum:
+          description: Shows the 99th percentile of all distinct infrastructure hosts for Basic with the Datadog Agent over all hours in the current month for all organizations.
+          format: int64
+          type: integer
+        infra_basic_vsphere_host_top99p_sum:
+          description: Shows the 99th percentile of all distinct infrastructure hosts for Basic on vSphere over all hours in the current month for all organizations.
+          format: int64
+          type: integer
         infra_edge_monitoring_devices_top99p_sum:
           description: Shows the 99th percentile of all Edge Devices Monitoring devices over all hours in the current month for all organizations.
           format: int64
           type: integer
+        infra_host_basic_top99p_sum:
+          description: Shows the 99th percentile of all distinct infrastructure hosts for Basic over all hours in the current month for all organizations.
+          format: int64
+          type: integer
         infra_host_top99p_sum:
           description: Shows the 99th percentile of all distinct infrastructure hosts over all hours in the current month for all organizations.
           format: int64

src/main/java/com/datadog/api/client/v1/model/HourlyUsageAttributionUsageType.java

@@ -74,6 +74,7 @@ public class HourlyUsageAttributionUsageType extends ModelEnum<String> {
               "incident_management_monthly_active_users_usage",
               "indexed_spans_usage",
               "infra_host_usage",
+              "infra_host_basic_usage",
               "ingested_logs_bytes_usage",
               "ingested_spans_bytes_usage",
               "invocations_usage",
@@ -203,6 +204,8 @@ public class HourlyUsageAttributionUsageType extends ModelEnum<String> {
       new HourlyUsageAttributionUsageType("indexed_spans_usage");
   public static final HourlyUsageAttributionUsageType INFRA_HOST_USAGE =
       new HourlyUsageAttributionUsageType("infra_host_usage");
+  public static final HourlyUsageAttributionUsageType INFRA_HOST_BASIC_USAGE =
+      new HourlyUsageAttributionUsageType("infra_host_basic_usage");
   public static final HourlyUsageAttributionUsageType INGESTED_LOGS_BYTES_USAGE =
       new HourlyUsageAttributionUsageType("ingested_logs_bytes_usage");
   public static final HourlyUsageAttributionUsageType INGESTED_SPANS_BYTES_USAGE =

src/main/java/com/datadog/api/client/v1/model/MonthlyUsageAttributionSupportedMetrics.java

@@ -102,6 +102,8 @@ public class MonthlyUsageAttributionSupportedMetrics extends ModelEnum<String> {
               "incident_management_monthly_active_users_percentage",
               "infra_host_usage",
               "infra_host_percentage",
+              "infra_host_basic_usage",
+              "infra_host_basic_percentage",
               "invocations_usage",
               "invocations_percentage",
               "lambda_traced_invocations_usage",
@@ -342,6 +344,10 @@ public class MonthlyUsageAttributionSupportedMetrics extends ModelEnum<String> {
       new MonthlyUsageAttributionSupportedMetrics("infra_host_usage");
   public static final MonthlyUsageAttributionSupportedMetrics INFRA_HOST_PERCENTAGE =
       new MonthlyUsageAttributionSupportedMetrics("infra_host_percentage");
+  public static final MonthlyUsageAttributionSupportedMetrics INFRA_HOST_BASIC_USAGE =
+      new MonthlyUsageAttributionSupportedMetrics("infra_host_basic_usage");
+  public static final MonthlyUsageAttributionSupportedMetrics INFRA_HOST_BASIC_PERCENTAGE =
+      new MonthlyUsageAttributionSupportedMetrics("infra_host_basic_percentage");
   public static final MonthlyUsageAttributionSupportedMetrics INVOCATIONS_USAGE =
       new MonthlyUsageAttributionSupportedMetrics("invocations_usage");
   public static final MonthlyUsageAttributionSupportedMetrics INVOCATIONS_PERCENTAGE =

src/main/java/com/datadog/api/client/v1/model/MonthlyUsageAttributionValues.java

@@ -92,6 +92,8 @@
   MonthlyUsageAttributionValues.JSON_PROPERTY_INCIDENT_MANAGEMENT_MONTHLY_ACTIVE_USERS_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_INDEXED_SPANS_PERCENTAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_INDEXED_SPANS_USAGE,
+  MonthlyUsageAttributionValues.JSON_PROPERTY_INFRA_HOST_BASIC_PERCENTAGE,
+  MonthlyUsageAttributionValues.JSON_PROPERTY_INFRA_HOST_BASIC_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_INFRA_HOST_PERCENTAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_INFRA_HOST_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_INGESTED_LOGS_BYTES_PERCENTAGE,
@@ -436,6 +438,13 @@ public class MonthlyUsageAttributionValues {
   public static final String JSON_PROPERTY_INDEXED_SPANS_USAGE = "indexed_spans_usage";
   private Double indexedSpansUsage;
 
+  public static final String JSON_PROPERTY_INFRA_HOST_BASIC_PERCENTAGE =
+      "infra_host_basic_percentage";
+  private Double infraHostBasicPercentage;
+
+  public static final String JSON_PROPERTY_INFRA_HOST_BASIC_USAGE = "infra_host_basic_usage";
+  private Double infraHostBasicUsage;
+
   public static final String JSON_PROPERTY_INFRA_HOST_PERCENTAGE = "infra_host_percentage";
   private Double infraHostPercentage;
 
@@ -2322,6 +2331,48 @@ public void setIndexedSpansUsage(Double indexedSpansUsage) {
     this.indexedSpansUsage = indexedSpansUsage;
   }
 
+  public MonthlyUsageAttributionValues infraHostBasicPercentage(Double infraHostBasicPercentage) {
+    this.infraHostBasicPercentage = infraHostBasicPercentage;
+    return this;
+  }
+
+  /**
+   * The percentage of infrastructure host Basic usage by tag(s).
+   *
+   * @return infraHostBasicPercentage
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_INFRA_HOST_BASIC_PERCENTAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Double getInfraHostBasicPercentage() {
+    return infraHostBasicPercentage;
+  }
+
+  public void setInfraHostBasicPercentage(Double infraHostBasicPercentage) {
+    this.infraHostBasicPercentage = infraHostBasicPercentage;
+  }
+
+  public MonthlyUsageAttributionValues infraHostBasicUsage(Double infraHostBasicUsage) {
+    this.infraHostBasicUsage = infraHostBasicUsage;
+    return this;
+  }
+
+  /**
+   * The infrastructure host Basic usage by tag(s).
+   *
+   * @return infraHostBasicUsage
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_INFRA_HOST_BASIC_USAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Double getInfraHostBasicUsage() {
+    return infraHostBasicUsage;
+  }
+
+  public void setInfraHostBasicUsage(Double infraHostBasicUsage) {
+    this.infraHostBasicUsage = infraHostBasicUsage;
+  }
+
   public MonthlyUsageAttributionValues infraHostPercentage(Double infraHostPercentage) {
     this.infraHostPercentage = infraHostPercentage;
     return this;
@@ -4400,6 +4451,10 @@ public boolean equals(Object o) {
         && Objects.equals(
             this.indexedSpansPercentage, monthlyUsageAttributionValues.indexedSpansPercentage)
         && Objects.equals(this.indexedSpansUsage, monthlyUsageAttributionValues.indexedSpansUsage)
+        && Objects.equals(
+            this.infraHostBasicPercentage, monthlyUsageAttributionValues.infraHostBasicPercentage)
+        && Objects.equals(
+            this.infraHostBasicUsage, monthlyUsageAttributionValues.infraHostBasicUsage)
         && Objects.equals(
             this.infraHostPercentage, monthlyUsageAttributionValues.infraHostPercentage)
         && Objects.equals(this.infraHostUsage, monthlyUsageAttributionValues.infraHostUsage)
@@ -4677,6 +4732,8 @@ public int hashCode() {
         incidentManagementMonthlyActiveUsersUsage,
         indexedSpansPercentage,
         indexedSpansUsage,
+        infraHostBasicPercentage,
+        infraHostBasicUsage,
         infraHostPercentage,
         infraHostUsage,
         ingestedLogsBytesPercentage,
@@ -4940,6 +4997,12 @@ public String toString() {
         .append(toIndentedString(indexedSpansPercentage))
         .append("\n");
     sb.append("    indexedSpansUsage: ").append(toIndentedString(indexedSpansUsage)).append("\n");
+    sb.append("    infraHostBasicPercentage: ")
+        .append(toIndentedString(infraHostBasicPercentage))
+        .append("\n");
+    sb.append("    infraHostBasicUsage: ")
+        .append(toIndentedString(infraHostBasicUsage))
+        .append("\n");
     sb.append("    infraHostPercentage: ")
         .append(toIndentedString(infraHostPercentage))
         .append("\n");