Add Application Vulnerability Management to usage metering API

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-05-12 13:12:59.895744",
-            "spec_repo_commit": "9eca3996"
+            "regenerated": "2023-05-17 14:44:33.390332",
+            "spec_repo_commit": "f8bfb8c1"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2023-05-12 13:12:59.908226",
-            "spec_repo_commit": "9eca3996"
+            "regenerated": "2023-05-17 14:44:33.403841",
+            "spec_repo_commit": "f8bfb8c1"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -3764,6 +3764,7 @@ components:
       - snmp_usage
       - estimated_rum_sessions_usage
       - universal_service_monitoring_usage
+      - vuln_management_hosts_usage
       type: string
       x-enum-varnames:
       - API_USAGE
@@ -3797,6 +3798,7 @@ components:
       - SNMP_USAGE
       - ESTIMATED_RUM_SESSIONS_USAGE
       - UNIVERSAL_SERVICE_MONITORING_USAGE
+      - VULN_MANAGEMENT_HOSTS_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.
@@ -7260,6 +7262,8 @@ components:
       - estimated_rum_sessions_percentage
       - universal_service_monitoring_usage
       - universal_service_monitoring_percentage
+      - vuln_management_hosts_usage
+      - vuln_management_hosts_percentage
       - '*'
       type: string
       x-enum-varnames:
@@ -7325,6 +7329,8 @@ components:
       - ESTIMATED_RUM_SESSIONS_PERCENTAGE
       - UNIVERSAL_SERVICE_MONITORING_USAGE
       - UNIVERSAL_SERVICE_MONITORING_PERCENTAGE
+      - VULN_MANAGEMENT_HOSTS_USAGE
+      - VULN_MANAGEMENT_HOSTS_PERCENTAGE
       - ALL
     MonthlyUsageAttributionValues:
       description: Fields in Usage Summary by tag(s).
@@ -7582,6 +7588,15 @@ components:
           description: The universal service monitoring usage by tag(s).
           format: double
           type: number
+        vuln_management_hosts_percentage:
+          description: The percentage of Application Vulnerability Management usage
+            by tag(s).
+          format: double
+          type: number
+        vuln_management_hosts_usage:
+          description: The Application Vulnerability Management usage by tag(s).
+          format: double
+          type: number
       type: object
     NoteWidgetDefinition:
       description: The notes and links widget is similar to free text widget, but
@@ -17615,6 +17630,11 @@ components:
             in the current date for all organizations.
           format: int64
           type: integer
+        vuln_management_host_count_top99p:
+          description: Shows the 99th percentile of all Application Vulnerability
+            Management hosts over all hours in the current date for the given org.
+          format: int64
+          type: integer
       type: object
     UsageSummaryDateOrg:
       description: Global hourly report of all data billed by Datadog for a given
@@ -18020,6 +18040,11 @@ components:
             in the current date for the given org.
           format: int64
           type: integer
+        vuln_management_host_count_top99p:
+          description: Shows the 99th percentile of all Application Vulnerability
+            Management hosts over all hours in the current date for the given org.
+          format: int64
+          type: integer
       type: object
     UsageSummaryResponse:
       description: Response summarizing all usage aggregated across the months in
@@ -18472,6 +18497,11 @@ components:
             in the current months for all organizations.
           format: int64
           type: integer
+        vuln_management_host_count_top99p_sum:
+          description: Shows the 99th percentile of all Application Vulnerability
+            Management hosts over all hours in the current months for all organizations.
+          format: int64
+          type: integer
       type: object
     UsageSyntheticsAPIHour:
       description: Number of Synthetics API tests run for each hour for a given organization.

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

@@ -86,6 +86,8 @@ public class HourlyUsageAttributionUsageType {
       new HourlyUsageAttributionUsageType("estimated_rum_sessions_usage");
   public static final HourlyUsageAttributionUsageType UNIVERSAL_SERVICE_MONITORING_USAGE =
       new HourlyUsageAttributionUsageType("universal_service_monitoring_usage");
+  public static final HourlyUsageAttributionUsageType VULN_MANAGEMENT_HOSTS_USAGE =
+      new HourlyUsageAttributionUsageType("vuln_management_hosts_usage");
 
   private static final Set<String> allowedValues =
       new HashSet<String>(
@@ -120,7 +122,8 @@ public class HourlyUsageAttributionUsageType {
               "profiled_host_usage",
               "snmp_usage",
               "estimated_rum_sessions_usage",
-              "universal_service_monitoring_usage"));
+              "universal_service_monitoring_usage",
+              "vuln_management_hosts_usage"));
 
   private String value;
 

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

@@ -152,6 +152,10 @@ public class MonthlyUsageAttributionSupportedMetrics {
   public static final MonthlyUsageAttributionSupportedMetrics
       UNIVERSAL_SERVICE_MONITORING_PERCENTAGE =
           new MonthlyUsageAttributionSupportedMetrics("universal_service_monitoring_percentage");
+  public static final MonthlyUsageAttributionSupportedMetrics VULN_MANAGEMENT_HOSTS_USAGE =
+      new MonthlyUsageAttributionSupportedMetrics("vuln_management_hosts_usage");
+  public static final MonthlyUsageAttributionSupportedMetrics VULN_MANAGEMENT_HOSTS_PERCENTAGE =
+      new MonthlyUsageAttributionSupportedMetrics("vuln_management_hosts_percentage");
   public static final MonthlyUsageAttributionSupportedMetrics ALL =
       new MonthlyUsageAttributionSupportedMetrics("*");
 
@@ -220,6 +224,8 @@ public class MonthlyUsageAttributionSupportedMetrics {
               "estimated_rum_sessions_percentage",
               "universal_service_monitoring_usage",
               "universal_service_monitoring_percentage",
+              "vuln_management_hosts_usage",
+              "vuln_management_hosts_percentage",
               "*"));
 
   private String value;

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

@@ -75,7 +75,9 @@
   MonthlyUsageAttributionValues.JSON_PROPERTY_SNMP_PERCENTAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_SNMP_USAGE,
   MonthlyUsageAttributionValues.JSON_PROPERTY_UNIVERSAL_SERVICE_MONITORING_PERCENTAGE,
-  MonthlyUsageAttributionValues.JSON_PROPERTY_UNIVERSAL_SERVICE_MONITORING_USAGE
+  MonthlyUsageAttributionValues.JSON_PROPERTY_UNIVERSAL_SERVICE_MONITORING_USAGE,
+  MonthlyUsageAttributionValues.JSON_PROPERTY_VULN_MANAGEMENT_HOSTS_PERCENTAGE,
+  MonthlyUsageAttributionValues.JSON_PROPERTY_VULN_MANAGEMENT_HOSTS_USAGE
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
@@ -287,6 +289,14 @@ public class MonthlyUsageAttributionValues {
       "universal_service_monitoring_usage";
   private Double universalServiceMonitoringUsage;
 
+  public static final String JSON_PROPERTY_VULN_MANAGEMENT_HOSTS_PERCENTAGE =
+      "vuln_management_hosts_percentage";
+  private Double vulnManagementHostsPercentage;
+
+  public static final String JSON_PROPERTY_VULN_MANAGEMENT_HOSTS_USAGE =
+      "vuln_management_hosts_usage";
+  private Double vulnManagementHostsUsage;
+
   public MonthlyUsageAttributionValues apiPercentage(Double apiPercentage) {
     this.apiPercentage = apiPercentage;
     return this;
@@ -1604,6 +1614,49 @@ public void setUniversalServiceMonitoringUsage(Double universalServiceMonitoring
     this.universalServiceMonitoringUsage = universalServiceMonitoringUsage;
   }
 
+  public MonthlyUsageAttributionValues vulnManagementHostsPercentage(
+      Double vulnManagementHostsPercentage) {
+    this.vulnManagementHostsPercentage = vulnManagementHostsPercentage;
+    return this;
+  }
+
+  /**
+   * The percentage of Application Vulnerability Management usage by tag(s).
+   *
+   * @return vulnManagementHostsPercentage
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_VULN_MANAGEMENT_HOSTS_PERCENTAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Double getVulnManagementHostsPercentage() {
+    return vulnManagementHostsPercentage;
+  }
+
+  public void setVulnManagementHostsPercentage(Double vulnManagementHostsPercentage) {
+    this.vulnManagementHostsPercentage = vulnManagementHostsPercentage;
+  }
+
+  public MonthlyUsageAttributionValues vulnManagementHostsUsage(Double vulnManagementHostsUsage) {
+    this.vulnManagementHostsUsage = vulnManagementHostsUsage;
+    return this;
+  }
+
+  /**
+   * The Application Vulnerability Management usage by tag(s).
+   *
+   * @return vulnManagementHostsUsage
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_VULN_MANAGEMENT_HOSTS_USAGE)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Double getVulnManagementHostsUsage() {
+    return vulnManagementHostsUsage;
+  }
+
+  public void setVulnManagementHostsUsage(Double vulnManagementHostsUsage) {
+    this.vulnManagementHostsUsage = vulnManagementHostsUsage;
+  }
+
   /** Return true if this MonthlyUsageAttributionValues object is equal to o. */
   @Override
   public boolean equals(Object o) {
@@ -1724,7 +1777,12 @@ public boolean equals(Object o) {
             monthlyUsageAttributionValues.universalServiceMonitoringPercentage)
         && Objects.equals(
             this.universalServiceMonitoringUsage,
-            monthlyUsageAttributionValues.universalServiceMonitoringUsage);
+            monthlyUsageAttributionValues.universalServiceMonitoringUsage)
+        && Objects.equals(
+            this.vulnManagementHostsPercentage,
+            monthlyUsageAttributionValues.vulnManagementHostsPercentage)
+        && Objects.equals(
+            this.vulnManagementHostsUsage, monthlyUsageAttributionValues.vulnManagementHostsUsage);
   }
 
   @Override
@@ -1791,7 +1849,9 @@ public int hashCode() {
         snmpPercentage,
         snmpUsage,
         universalServiceMonitoringPercentage,
-        universalServiceMonitoringUsage);
+        universalServiceMonitoringUsage,
+        vulnManagementHostsPercentage,
+        vulnManagementHostsUsage);
   }
 
   @Override
@@ -1928,6 +1988,12 @@ public String toString() {
     sb.append("    universalServiceMonitoringUsage: ")
         .append(toIndentedString(universalServiceMonitoringUsage))
         .append("\n");
+    sb.append("    vulnManagementHostsPercentage: ")
+        .append(toIndentedString(vulnManagementHostsPercentage))
+        .append("\n");
+    sb.append("    vulnManagementHostsUsage: ")
+        .append(toIndentedString(vulnManagementHostsUsage))
+        .append("\n");
     sb.append("}");
     return sb.toString();
   }

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

@@ -97,7 +97,8 @@
   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
+  UsageSummaryDate.JSON_PROPERTY_VSPHERE_HOST_TOP99P,
+  UsageSummaryDate.JSON_PROPERTY_VULN_MANAGEMENT_HOST_COUNT_TOP99P
 })
 @jakarta.annotation.Generated(
     value = "https://github.com/DataDog/datadog-api-client-java/blob/master/.generator")
@@ -376,6 +377,10 @@ public class UsageSummaryDate {
   public static final String JSON_PROPERTY_VSPHERE_HOST_TOP99P = "vsphere_host_top99p";
   private Long vsphereHostTop99p;
 
+  public static final String JSON_PROPERTY_VULN_MANAGEMENT_HOST_COUNT_TOP99P =
+      "vuln_management_host_count_top99p";
+  private Long vulnManagementHostCountTop99p;
+
   public UsageSummaryDate agentHostTop99p(Long agentHostTop99p) {
     this.agentHostTop99p = agentHostTop99p;
     return this;
@@ -2130,6 +2135,28 @@ public void setVsphereHostTop99p(Long vsphereHostTop99p) {
     this.vsphereHostTop99p = vsphereHostTop99p;
   }
 
+  public UsageSummaryDate vulnManagementHostCountTop99p(Long vulnManagementHostCountTop99p) {
+    this.vulnManagementHostCountTop99p = vulnManagementHostCountTop99p;
+    return this;
+  }
+
+  /**
+   * Shows the 99th percentile of all Application Vulnerability Management hosts over all hours in
+   * the current date for the given org.
+   *
+   * @return vulnManagementHostCountTop99p
+   */
+  @jakarta.annotation.Nullable
+  @JsonProperty(JSON_PROPERTY_VULN_MANAGEMENT_HOST_COUNT_TOP99P)
+  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  public Long getVulnManagementHostCountTop99p() {
+    return vulnManagementHostCountTop99p;
+  }
+
+  public void setVulnManagementHostCountTop99p(Long vulnManagementHostCountTop99p) {
+    this.vulnManagementHostCountTop99p = vulnManagementHostCountTop99p;
+  }
+
   /** Return true if this UsageSummaryDate object is equal to o. */
   @Override
   public boolean equals(Object o) {
@@ -2250,7 +2277,9 @@ public boolean equals(Object o) {
         && Objects.equals(
             this.universalServiceMonitoringHostTop99p,
             usageSummaryDate.universalServiceMonitoringHostTop99p)
-        && Objects.equals(this.vsphereHostTop99p, usageSummaryDate.vsphereHostTop99p);
+        && Objects.equals(this.vsphereHostTop99p, usageSummaryDate.vsphereHostTop99p)
+        && Objects.equals(
+            this.vulnManagementHostCountTop99p, usageSummaryDate.vulnManagementHostCountTop99p);
   }
 
   @Override
@@ -2334,7 +2363,8 @@ public int hashCode() {
         traceSearchIndexedEventsCountSum,
         twolIngestedEventsBytesSum,
         universalServiceMonitoringHostTop99p,
-        vsphereHostTop99p);
+        vsphereHostTop99p,
+        vulnManagementHostCountTop99p);
   }
 
   @Override
@@ -2518,6 +2548,9 @@ public String toString() {
         .append(toIndentedString(universalServiceMonitoringHostTop99p))
         .append("\n");
     sb.append("    vsphereHostTop99p: ").append(toIndentedString(vsphereHostTop99p)).append("\n");
+    sb.append("    vulnManagementHostCountTop99p: ")
+        .append(toIndentedString(vulnManagementHostCountTop99p))
+        .append("\n");
     sb.append("}");
     return sb.toString();
   }