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

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

@@ -47,6 +47,7 @@ export type HourlyUsageAttributionUsageType =
   | typeof INCIDENT_MANAGEMENT_MONTHLY_ACTIVE_USERS_USAGE
   | typeof INDEXED_SPANS_USAGE
   | typeof INFRA_HOST_USAGE
+  | typeof INFRA_HOST_BASIC_USAGE
   | typeof INGESTED_LOGS_BYTES_USAGE
   | typeof INGESTED_SPANS_BYTES_USAGE
   | typeof INVOCATIONS_USAGE
@@ -140,6 +141,7 @@ export const INCIDENT_MANAGEMENT_MONTHLY_ACTIVE_USERS_USAGE =
   "incident_management_monthly_active_users_usage";
 export const INDEXED_SPANS_USAGE = "indexed_spans_usage";
 export const INFRA_HOST_USAGE = "infra_host_usage";
+export const INFRA_HOST_BASIC_USAGE = "infra_host_basic_usage";
 export const INGESTED_LOGS_BYTES_USAGE = "ingested_logs_bytes_usage";
 export const INGESTED_SPANS_BYTES_USAGE = "ingested_spans_bytes_usage";
 export const INVOCATIONS_USAGE = "invocations_usage";

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

@@ -73,6 +73,8 @@ export type MonthlyUsageAttributionSupportedMetrics =
   | typeof INCIDENT_MANAGEMENT_MONTHLY_ACTIVE_USERS_PERCENTAGE
   | typeof INFRA_HOST_USAGE
   | typeof INFRA_HOST_PERCENTAGE
+  | typeof INFRA_HOST_BASIC_USAGE
+  | typeof INFRA_HOST_BASIC_PERCENTAGE
   | typeof INVOCATIONS_USAGE
   | typeof INVOCATIONS_PERCENTAGE
   | typeof LAMBDA_TRACED_INVOCATIONS_USAGE
@@ -249,6 +251,8 @@ export const INCIDENT_MANAGEMENT_MONTHLY_ACTIVE_USERS_PERCENTAGE =
   "incident_management_monthly_active_users_percentage";
 export const INFRA_HOST_USAGE = "infra_host_usage";
 export const INFRA_HOST_PERCENTAGE = "infra_host_percentage";
+export const INFRA_HOST_BASIC_USAGE = "infra_host_basic_usage";
+export const INFRA_HOST_BASIC_PERCENTAGE = "infra_host_basic_percentage";
 export const INVOCATIONS_USAGE = "invocations_usage";
 export const INVOCATIONS_PERCENTAGE = "invocations_percentage";
 export const LAMBDA_TRACED_INVOCATIONS_USAGE =

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

@@ -300,6 +300,14 @@ export class MonthlyUsageAttributionValues {
    * The total APM Indexed Spans usage by tag(s).
    */
   "indexedSpansUsage"?: number;
+  /**
+   * The percentage of infrastructure host Basic usage by tag(s).
+   */
+  "infraHostBasicPercentage"?: number;
+  /**
+   * The infrastructure host Basic usage by tag(s).
+   */
+  "infraHostBasicUsage"?: number;
   /**
    * The percentage of infrastructure host usage by tag(s).
    */
@@ -1037,6 +1045,16 @@ export class MonthlyUsageAttributionValues {
       type: "number",
       format: "double",
     },
+    infraHostBasicPercentage: {
+      baseName: "infra_host_basic_percentage",
+      type: "number",
+      format: "double",
+    },
+    infraHostBasicUsage: {
+      baseName: "infra_host_basic_usage",
+      type: "number",
+      format: "double",
+    },
     infraHostPercentage: {
       baseName: "infra_host_percentage",
       type: "number",

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

@@ -140,6 +140,7 @@ export const TypingInfo: ModelTypingInfo = {
       "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",
@@ -253,6 +254,8 @@ export const TypingInfo: ModelTypingInfo = {
       "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",

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

@@ -274,6 +274,14 @@ export class UsageSummaryDate {
    * Shows the average of all normalized Database Monitoring queries over all hours in the current date for all organizations.
    */
   "dbmQueriesCountAvg"?: number;
+  /**
+   * Shows the sum of all ephemeral infrastructure hosts for Basic with the Datadog Agent over all hours in the current date for all organizations.
+   */
+  "ephInfraBasicAgentSum"?: number;
+  /**
+   * Shows the sum of all ephemeral infrastructure hosts for Basic on vSphere over all hours in the current date for all organizations.
+   */
+  "ephInfraBasicVsphereSum"?: number;
   /**
    * Shows the sum of all ephemeral infrastructure hosts with the Datadog Agent over all hours in the current date for the given org.
    */
@@ -290,6 +298,10 @@ export class UsageSummaryDate {
    * Shows the sum of all ephemeral infrastructure hosts on Azure over all hours in the current date for the given org.
    */
   "ephInfraHostAzureSum"?: number;
+  /**
+   * Shows the sum of all ephemeral infrastructure hosts for Basic over all hours in the current date for all organizations.
+   */
+  "ephInfraHostBasicSum"?: number;
   /**
    * Shows the sum of all ephemeral infrastructure hosts for Enterprise over all hours in the current date for the given org.
    */
@@ -434,10 +446,22 @@ export class UsageSummaryDate {
    * Shows the sum of all log events indexed over all hours in the current date for all organizations.
    */
   "indexedEventsCountSum"?: number;
+  /**
+   * 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.
+   */
+  "infraBasicAgentHostTop99p"?: number;
+  /**
+   * Shows the 99th percentile of all distinct infrastructure hosts for Basic on vSphere over all hours in the current date for all organizations.
+   */
+  "infraBasicVsphereHostTop99p"?: number;
   /**
    * Shows the 99th percentile of all Edge Devices Monitoring devices over all hours in the current date for all organizations.
    */
   "infraEdgeMonitoringDevicesTop99p"?: number;
+  /**
+   * Shows the 99th percentile of all distinct infrastructure hosts for Basic over all hours in the current date for all organizations.
+   */
+  "infraHostBasicTop99p"?: number;
   /**
    * Shows the 99th percentile of all distinct infrastructure hosts over all hours in the current date for all organizations.
    */
@@ -1220,6 +1244,16 @@ export class UsageSummaryDate {
       type: "number",
       format: "int64",
     },
+    ephInfraBasicAgentSum: {
+      baseName: "eph_infra_basic_agent_sum",
+      type: "number",
+      format: "int64",
+    },
+    ephInfraBasicVsphereSum: {
+      baseName: "eph_infra_basic_vsphere_sum",
+      type: "number",
+      format: "int64",
+    },
     ephInfraHostAgentSum: {
       baseName: "eph_infra_host_agent_sum",
       type: "number",
@@ -1240,6 +1274,11 @@ export class UsageSummaryDate {
       type: "number",
       format: "int64",
     },
+    ephInfraHostBasicSum: {
+      baseName: "eph_infra_host_basic_sum",
+      type: "number",
+      format: "int64",
+    },
     ephInfraHostEntSum: {
       baseName: "eph_infra_host_ent_sum",
       type: "number",
@@ -1420,11 +1459,26 @@ export class UsageSummaryDate {
       type: "number",
       format: "int64",
     },
+    infraBasicAgentHostTop99p: {
+      baseName: "infra_basic_agent_host_top99p",
+      type: "number",
+      format: "int64",
+    },
+    infraBasicVsphereHostTop99p: {
+      baseName: "infra_basic_vsphere_host_top99p",
+      type: "number",
+      format: "int64",
+    },
     infraEdgeMonitoringDevicesTop99p: {
       baseName: "infra_edge_monitoring_devices_top99p",
       type: "number",
       format: "int64",
     },
+    infraHostBasicTop99p: {
+      baseName: "infra_host_basic_top99p",
+      type: "number",
+      format: "int64",
+    },
     infraHostTop99p: {
       baseName: "infra_host_top99p",
       type: "number",