Add universal service monitoring to usage metering API

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-04-03 12:03:46.161181",
-            "spec_repo_commit": "1cb4b144"
+            "regenerated": "2023-04-04 17:50:42.777972",
+            "spec_repo_commit": "9a7b22d0"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-04-03 12:03:46.173552",
-            "spec_repo_commit": "1cb4b144"
+            "regenerated": "2023-04-04 17:50:42.790852",
+            "spec_repo_commit": "9a7b22d0"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -3683,6 +3683,7 @@ components:
       - profiled_host_usage
       - snmp_usage
       - estimated_rum_sessions_usage
+      - universal_service_monitoring_usage
       type: string
       x-enum-varnames:
       - API_USAGE
@@ -3715,6 +3716,7 @@ components:
       - PROFILED_HOST_USAGE
       - SNMP_USAGE
       - ESTIMATED_RUM_SESSIONS_USAGE
+      - UNIVERSAL_SERVICE_MONITORING_USAGE
     IFrameWidgetDefinition:
       description: The iframe widget allows you to embed a portion of any other web
         page on your dashboard. Only available on FREE layout dashboards.
@@ -7171,6 +7173,8 @@ components:
       - snmp_percentage
       - estimated_rum_sessions_usage
       - estimated_rum_sessions_percentage
+      - universal_service_monitoring_usage
+      - universal_service_monitoring_percentage
       - '*'
       type: string
       x-enum-varnames:
@@ -7234,6 +7238,8 @@ components:
       - SNMP_PERCENTAGE
       - ESTIMATED_RUM_SESSIONS_USAGE
       - ESTIMATED_RUM_SESSIONS_PERCENTAGE
+      - UNIVERSAL_SERVICE_MONITORING_USAGE
+      - UNIVERSAL_SERVICE_MONITORING_PERCENTAGE
       - ALL
     MonthlyUsageAttributionValues:
       description: Fields in Usage Summary by tag(s).
@@ -7483,6 +7489,14 @@ components:
           description: The network device usage by tag(s).
           format: double
           type: number
+        universal_service_monitoring_percentage:
+          description: The percentage of universal service monitoring usage by tag(s).
+          format: double
+          type: number
+        universal_service_monitoring_usage:
+          description: The universal service monitoring usage by tag(s).
+          format: double
+          type: number
       type: object
     NoteWidgetDefinition:
       description: The notes and links widget is similar to free text widget, but
@@ -17087,6 +17101,11 @@ components:
             in the current date for all organizations.
           format: int64
           type: integer
+        universal_service_monitoring_host_top99p:
+          description: Shows the 99th percentile of all universal service management
+            hosts over all hours in the current date for the given org.
+          format: int64
+          type: integer
         vsphere_host_top99p:
           description: Shows the 99th percentile of all vSphere hosts over all hours
             in the current date for all organizations.
@@ -17481,6 +17500,11 @@ components:
             in the current date for the given org.
           format: int64
           type: integer
+        universal_service_monitoring_host_top99p:
+          description: Shows the 99th percentile of all Universal Service Monitoring
+            hosts over all hours in the current date for the given org.
+          format: int64
+          type: integer
         vsphere_host_top99p:
           description: Shows the 99th percentile of all vSphere hosts over all hours
             in the current date for the given org.
@@ -17916,6 +17940,11 @@ components:
             in the current months for all organizations.
           format: int64
           type: integer
+        universal_service_monitoring_host_top99p_sum:
+          description: Shows the 99th percentile of all Universal Service Monitoring
+            hosts over all hours in the current months for all organizations.
+          format: int64
+          type: integer
         usage:
           description: An array of objects regarding hourly usage.
           items:

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

@@ -84,6 +84,8 @@ public class HourlyUsageAttributionUsageType {
       new HourlyUsageAttributionUsageType("snmp_usage");
   public static final HourlyUsageAttributionUsageType ESTIMATED_RUM_SESSIONS_USAGE =
       new HourlyUsageAttributionUsageType("estimated_rum_sessions_usage");
+  public static final HourlyUsageAttributionUsageType UNIVERSAL_SERVICE_MONITORING_USAGE =
+      new HourlyUsageAttributionUsageType("universal_service_monitoring_usage");
 
   private static final Set<String> allowedValues =
       new HashSet<String>(
@@ -117,7 +119,8 @@ public class HourlyUsageAttributionUsageType {
               "profiled_fargate_usage",
               "profiled_host_usage",
               "snmp_usage",
-              "estimated_rum_sessions_usage"));
+              "estimated_rum_sessions_usage",
+              "universal_service_monitoring_usage"));
 
   private String value;
 

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

@@ -147,6 +147,11 @@ public class MonthlyUsageAttributionSupportedMetrics {
       new MonthlyUsageAttributionSupportedMetrics("estimated_rum_sessions_usage");
   public static final MonthlyUsageAttributionSupportedMetrics ESTIMATED_RUM_SESSIONS_PERCENTAGE =
       new MonthlyUsageAttributionSupportedMetrics("estimated_rum_sessions_percentage");
+  public static final MonthlyUsageAttributionSupportedMetrics UNIVERSAL_SERVICE_MONITORING_USAGE =
+      new MonthlyUsageAttributionSupportedMetrics("universal_service_monitoring_usage");
+  public static final MonthlyUsageAttributionSupportedMetrics
+      UNIVERSAL_SERVICE_MONITORING_PERCENTAGE =
+          new MonthlyUsageAttributionSupportedMetrics("universal_service_monitoring_percentage");
   public static final MonthlyUsageAttributionSupportedMetrics ALL =
       new MonthlyUsageAttributionSupportedMetrics("*");
 
@@ -213,6 +218,8 @@ public class MonthlyUsageAttributionSupportedMetrics {
               "snmp_percentage",
               "estimated_rum_sessions_usage",
               "estimated_rum_sessions_percentage",
+              "universal_service_monitoring_usage",
+              "universal_service_monitoring_percentage",
               "*"));
 
   private String value;

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

@@ -73,7 +73,9 @@
   MonthlyUsageAttributionValues.JSON_PROPERTY_PROFILED_HOST_PERCENTAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_PROFILED_HOST_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_SNMP_PERCENTAGE,
-  MonthlyUsageAttributionValues.JSON_PROPERTY_SNMP_USAGE
+  MonthlyUsageAttributionValues.JSON_PROPERTY_SNMP_USAGE,
+  MonthlyUsageAttributionValues.JSON_PROPERTY_UNIVERSAL_SERVICE_MONITORING_PERCENTAGE,
+  MonthlyUsageAttributionValues.JSON_PROPERTY_UNIVERSAL_SERVICE_MONITORING_USAGE
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
@@ -277,6 +279,14 @@ public class MonthlyUsageAttributionValues {
   public static final String JSON_PROPERTY_SNMP_USAGE = "snmp_usage";
   private Double snmpUsage;
 
+  public static final String JSON_PROPERTY_UNIVERSAL_SERVICE_MONITORING_PERCENTAGE =
+      "universal_service_monitoring_percentage";
+  private Double universalServiceMonitoringPercentage;
+
+  public static final String JSON_PROPERTY_UNIVERSAL_SERVICE_MONITORING_USAGE =
+      "universal_service_monitoring_usage";
+  private Double universalServiceMonitoringUsage;
+
   public MonthlyUsageAttributionValues apiPercentage(Double apiPercentage) {
     this.apiPercentage = apiPercentage;
     return this;
@@ -1550,6 +1560,50 @@ public void setSnmpUsage(Double snmpUsage) {
     this.snmpUsage = snmpUsage;
   }
 
+  public MonthlyUsageAttributionValues universalServiceMonitoringPercentage(
+      Double universalServiceMonitoringPercentage) {
+    this.universalServiceMonitoringPercentage = universalServiceMonitoringPercentage;
+    return this;
+  }
+
+  /**
+   * The percentage of universal service monitoring usage by tag(s).
+   *
+   * @return universalServiceMonitoringPercentage
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_UNIVERSAL_SERVICE_MONITORING_PERCENTAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Double getUniversalServiceMonitoringPercentage() {
+    return universalServiceMonitoringPercentage;
+  }
+
+  public void setUniversalServiceMonitoringPercentage(Double universalServiceMonitoringPercentage) {
+    this.universalServiceMonitoringPercentage = universalServiceMonitoringPercentage;
+  }
+
+  public MonthlyUsageAttributionValues universalServiceMonitoringUsage(
+      Double universalServiceMonitoringUsage) {
+    this.universalServiceMonitoringUsage = universalServiceMonitoringUsage;
+    return this;
+  }
+
+  /**
+   * The universal service monitoring usage by tag(s).
+   *
+   * @return universalServiceMonitoringUsage
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_UNIVERSAL_SERVICE_MONITORING_USAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Double getUniversalServiceMonitoringUsage() {
+    return universalServiceMonitoringUsage;
+  }
+
+  public void setUniversalServiceMonitoringUsage(Double universalServiceMonitoringUsage) {
+    this.universalServiceMonitoringUsage = universalServiceMonitoringUsage;
+  }
+
   /** Return true if this MonthlyUsageAttributionValues object is equal to o. */
   @Override
   public boolean equals(Object o) {
@@ -1664,7 +1718,13 @@ public boolean equals(Object o) {
             this.profiledHostPercentage, monthlyUsageAttributionValues.profiledHostPercentage)
         && Objects.equals(this.profiledHostUsage, monthlyUsageAttributionValues.profiledHostUsage)
         && Objects.equals(this.snmpPercentage, monthlyUsageAttributionValues.snmpPercentage)
-        && Objects.equals(this.snmpUsage, monthlyUsageAttributionValues.snmpUsage);
+        && Objects.equals(this.snmpUsage, monthlyUsageAttributionValues.snmpUsage)
+        && Objects.equals(
+            this.universalServiceMonitoringPercentage,
+            monthlyUsageAttributionValues.universalServiceMonitoringPercentage)
+        && Objects.equals(
+            this.universalServiceMonitoringUsage,
+            monthlyUsageAttributionValues.universalServiceMonitoringUsage);
   }
 
   @Override
@@ -1729,7 +1789,9 @@ public int hashCode() {
         profiledHostPercentage,
         profiledHostUsage,
         snmpPercentage,
-        snmpUsage);
+        snmpUsage,
+        universalServiceMonitoringPercentage,
+        universalServiceMonitoringUsage);
   }
 
   @Override
@@ -1860,6 +1922,12 @@ public String toString() {
     sb.append("    profiledHostUsage: ").append(toIndentedString(profiledHostUsage)).append("\n");
     sb.append("    snmpPercentage: ").append(toIndentedString(snmpPercentage)).append("\n");
     sb.append("    snmpUsage: ").append(toIndentedString(snmpUsage)).append("\n");
+    sb.append("    universalServiceMonitoringPercentage: ")
+        .append(toIndentedString(universalServiceMonitoringPercentage))
+        .append("\n");
+    sb.append("    universalServiceMonitoringUsage: ")
+        .append(toIndentedString(universalServiceMonitoringUsage))
+        .append("\n");
     sb.append("}");
     return sb.toString();
   }

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

@@ -95,6 +95,7 @@
   UsageSummaryDate.JSON_PROPERTY_SYNTHETICS_PARALLEL_TESTING_MAX_SLOTS_HWM,
   UsageSummaryDate.JSON_PROPERTY_TRACE_SEARCH_INDEXED_EVENTS_COUNT_SUM,
   UsageSummaryDate.JSON_PROPERTY_TWOL_INGESTED_EVENTS_BYTES_SUM,
+  UsageSummaryDate.JSON_PROPERTY_UNIVERSAL_SERVICE_MONITORING_HOST_TOP99P,
   UsageSummaryDate.JSON_PROPERTY_VSPHERE_HOST_TOP99P
 })
 @jakarta.annotation.Generated(
@@ -363,6 +364,10 @@ public class UsageSummaryDate {
       "twol_ingested_events_bytes_sum";
   private Long twolIngestedEventsBytesSum;
 
+  public static final String JSON_PROPERTY_UNIVERSAL_SERVICE_MONITORING_HOST_TOP99P =
+      "universal_service_monitoring_host_top99p";
+  private Long universalServiceMonitoringHostTop99p;
+
   public static final String JSON_PROPERTY_VSPHERE_HOST_TOP99P = "vsphere_host_top99p";
   private Long vsphereHostTop99p;
 
@@ -2050,6 +2055,29 @@ public void setTwolIngestedEventsBytesSum(Long twolIngestedEventsBytesSum) {
     this.twolIngestedEventsBytesSum = twolIngestedEventsBytesSum;
   }
 
+  public UsageSummaryDate universalServiceMonitoringHostTop99p(
+      Long universalServiceMonitoringHostTop99p) {
+    this.universalServiceMonitoringHostTop99p = universalServiceMonitoringHostTop99p;
+    return this;
+  }
+
+  /**
+   * Shows the 99th percentile of all universal service management hosts over all hours in the
+   * current date for the given org.
+   *
+   * @return universalServiceMonitoringHostTop99p
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_UNIVERSAL_SERVICE_MONITORING_HOST_TOP99P)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Long getUniversalServiceMonitoringHostTop99p() {
+    return universalServiceMonitoringHostTop99p;
+  }
+
+  public void setUniversalServiceMonitoringHostTop99p(Long universalServiceMonitoringHostTop99p) {
+    this.universalServiceMonitoringHostTop99p = universalServiceMonitoringHostTop99p;
+  }
+
   public UsageSummaryDate vsphereHostTop99p(Long vsphereHostTop99p) {
     this.vsphereHostTop99p = vsphereHostTop99p;
     return this;
@@ -2188,6 +2216,9 @@ public boolean equals(Object o) {
             usageSummaryDate.traceSearchIndexedEventsCountSum)
         && Objects.equals(
             this.twolIngestedEventsBytesSum, usageSummaryDate.twolIngestedEventsBytesSum)
+        && Objects.equals(
+            this.universalServiceMonitoringHostTop99p,
+            usageSummaryDate.universalServiceMonitoringHostTop99p)
         && Objects.equals(this.vsphereHostTop99p, usageSummaryDate.vsphereHostTop99p);
   }
 
@@ -2270,6 +2301,7 @@ public int hashCode() {
         syntheticsParallelTestingMaxSlotsHwm,
         traceSearchIndexedEventsCountSum,
         twolIngestedEventsBytesSum,
+        universalServiceMonitoringHostTop99p,
         vsphereHostTop99p);
   }
 
@@ -2447,6 +2479,9 @@ public String toString() {
     sb.append("    twolIngestedEventsBytesSum: ")
         .append(toIndentedString(twolIngestedEventsBytesSum))
         .append("\n");
+    sb.append("    universalServiceMonitoringHostTop99p: ")
+        .append(toIndentedString(universalServiceMonitoringHostTop99p))
+        .append("\n");
     sb.append("    vsphereHostTop99p: ").append(toIndentedString(vsphereHostTop99p)).append("\n");
     sb.append("}");
     return sb.toString();