Add new SDS fields to usage API (#1726)

Co-authored-by: ci.datadog-api-spec <[email protected]>
Co-authored-by: api-clients-generation-pipeline[bot] <54105614+api-clients-generation-pipeline[bot]@users.noreply.github.com>

Author: api-clients-generation-pipeline[bot]

.apigentools-info

@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2022-10-25 14:15:19.092009",
-            "spec_repo_commit": "ecf2f022"
+            "regenerated": "2022-10-25 16:38:18.985317",
+            "spec_repo_commit": "afdd6b70"
         },
         "v2": {
             "apigentools_version": "1.6.4",
-            "regenerated": "2022-10-25 14:15:19.105318",
-            "spec_repo_commit": "ecf2f022"
+            "regenerated": "2022-10-25 16:38:18.997896",
+            "spec_repo_commit": "afdd6b70"
         }
     }
 }

.generator/schemas/v1/openapi.yaml

@@ -15677,6 +15677,18 @@ components:
       description: Sensitive Data Scanner usage for a given organization for a given
         hour.
       properties:
+        apm_scanned_bytes:
+          description: "The total number of bytes scanned of APM usage across all
+            usage types by the Sensitive Data Scanner from the start of the given
+            hour\u2019s month until the given hour."
+          format: int64
+          type: integer
+        events_scanned_bytes:
+          description: "The total number of bytes scanned of Events usage across all
+            usage types by the Sensitive Data Scanner from the start of the given
+            hour\u2019s month until the given hour."
+          format: int64
+          type: integer
         hour:
           description: The hour for the usage.
           format: date-time
@@ -15693,6 +15705,12 @@ components:
         public_id:
           description: The organization public ID.
           type: string
+        rum_scanned_bytes:
+          description: "The total number of bytes scanned of RUM usage across all
+            usage types by the Sensitive Data Scanner from the start of the given
+            hour\u2019s month until the given hour."
+          format: int64
+          type: integer
         total_scanned_bytes:
           description: "The total number of bytes scanned across all usage types by
             the Sensitive Data Scanner from the start of the given hour\u2019s month
@@ -16120,11 +16138,26 @@ components:
             hours in the current date for all organizations.
           format: int64
           type: integer
+        sds_apm_scanned_bytes_sum:
+          description: Sum of all APM bytes scanned with sensitive data scanner over
+            all hours in the current date for all organizations.
+          format: int64
+          type: integer
+        sds_events_scanned_bytes_sum:
+          description: Sum of all event stream events bytes scanned with sensitive
+            data scanner over all hours in the current date for all organizations.
+          format: int64
+          type: integer
         sds_logs_scanned_bytes_sum:
           description: Shows the sum of all bytes scanned of logs usage by the Sensitive
             Data Scanner over all hours in the current month for all organizations.
           format: int64
           type: integer
+        sds_rum_scanned_bytes_sum:
+          description: Sum of all RUM bytes scanned with sensitive data scanner over
+            all hours in the current date for all organizations.
+          format: int64
+          type: integer
         sds_total_scanned_bytes_sum:
           description: Shows the sum of all bytes scanned across all usage types by
             the Sensitive Data Scanner over all hours in the current month for all
@@ -16458,11 +16491,26 @@ components:
             hours in the current date for the given org.
           format: int64
           type: integer
+        sds_apm_scanned_bytes_sum:
+          description: Sum of all APM bytes scanned with sensitive data scanner over
+            all hours in the current date for the given org.
+          format: int64
+          type: integer
+        sds_events_scanned_bytes_sum:
+          description: Sum of all event stream events bytes scanned with sensitive
+            data scanner over all hours in the current date for the given org.
+          format: int64
+          type: integer
         sds_logs_scanned_bytes_sum:
           description: Shows the sum of all bytes scanned of logs usage by the Sensitive
             Data Scanner over all hours in the current month for the given org.
           format: int64
           type: integer
+        sds_rum_scanned_bytes_sum:
+          description: Sum of all RUM bytes scanned with sensitive data scanner over
+            all hours in the current date for the given org.
+          format: int64
+          type: integer
         sds_total_scanned_bytes_sum:
           description: Shows the sum of all bytes scanned across all usage types by
             the Sensitive Data Scanner over all hours in the current month for the
@@ -16833,11 +16881,26 @@ components:
             hours in the current months for all organizations.
           format: int64
           type: integer
+        sds_apm_scanned_bytes_sum:
+          description: Sum of all APM bytes scanned with sensitive data scanner in
+            the current months for all organizations.
+          format: int64
+          type: integer
+        sds_events_scanned_bytes_sum:
+          description: Sum of all event stream events bytes scanned with sensitive
+            data scanner in the current months for all organizations.
+          format: int64
+          type: integer
         sds_logs_scanned_bytes_sum:
           description: Shows the sum of all bytes scanned of logs usage by the Sensitive
             Data Scanner over all hours in the current month for all organizations.
           format: int64
           type: integer
+        sds_rum_scanned_bytes_sum:
+          description: Sum of all RUM bytes scanned with sensitive data scanner in
+            the current months for all organizations.
+          format: int64
+          type: integer
         sds_total_scanned_bytes_sum:
           description: Shows the sum of all bytes scanned across all usage types by
             the Sensitive Data Scanner over all hours in the current month for all

api/datadogV1/model_usage_sds_hour.go

@@ -11,6 +11,10 @@ import (
 
 // UsageSDSHour Sensitive Data Scanner usage for a given organization for a given hour.
 type UsageSDSHour struct {
+	// The total number of bytes scanned of APM usage across all usage types by the Sensitive Data Scanner from the start of the given hour’s month until the given hour.
+	ApmScannedBytes *int64 `json:"apm_scanned_bytes,omitempty"`
+	// The total number of bytes scanned of Events usage across all usage types by the Sensitive Data Scanner from the start of the given hour’s month until the given hour.
+	EventsScannedBytes *int64 `json:"events_scanned_bytes,omitempty"`
 	// The hour for the usage.
 	Hour *time.Time `json:"hour,omitempty"`
 	// The total number of bytes scanned of logs usage by the Sensitive Data Scanner from the start of the given hour’s month until the given hour.
@@ -19,6 +23,8 @@ type UsageSDSHour struct {
 	OrgName *string `json:"org_name,omitempty"`
 	// The organization public ID.
 	PublicId *string `json:"public_id,omitempty"`
+	// The total number of bytes scanned of RUM usage across all usage types by the Sensitive Data Scanner from the start of the given hour’s month until the given hour.
+	RumScannedBytes *int64 `json:"rum_scanned_bytes,omitempty"`
 	// The total number of bytes scanned across all usage types by the Sensitive Data Scanner from the start of the given hour’s month until the given hour.
 	TotalScannedBytes *int64 `json:"total_scanned_bytes,omitempty"`
 	// UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct
@@ -43,6 +49,62 @@ func NewUsageSDSHourWithDefaults() *UsageSDSHour {
 	return &this
 }
 
+// GetApmScannedBytes returns the ApmScannedBytes field value if set, zero value otherwise.
+func (o *UsageSDSHour) GetApmScannedBytes() int64 {
+	if o == nil || o.ApmScannedBytes == nil {
+		var ret int64
+		return ret
+	}
+	return *o.ApmScannedBytes
+}
+
+// GetApmScannedBytesOk returns a tuple with the ApmScannedBytes field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+func (o *UsageSDSHour) GetApmScannedBytesOk() (*int64, bool) {
+	if o == nil || o.ApmScannedBytes == nil {
+		return nil, false
+	}
+	return o.ApmScannedBytes, true
+}
+
+// HasApmScannedBytes returns a boolean if a field has been set.
+func (o *UsageSDSHour) HasApmScannedBytes() bool {
+	return o != nil && o.ApmScannedBytes != nil
+}
+
+// SetApmScannedBytes gets a reference to the given int64 and assigns it to the ApmScannedBytes field.
+func (o *UsageSDSHour) SetApmScannedBytes(v int64) {
+	o.ApmScannedBytes = &v
+}
+
+// GetEventsScannedBytes returns the EventsScannedBytes field value if set, zero value otherwise.
+func (o *UsageSDSHour) GetEventsScannedBytes() int64 {
+	if o == nil || o.EventsScannedBytes == nil {
+		var ret int64
+		return ret
+	}
+	return *o.EventsScannedBytes
+}
+
+// GetEventsScannedBytesOk returns a tuple with the EventsScannedBytes field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+func (o *UsageSDSHour) GetEventsScannedBytesOk() (*int64, bool) {
+	if o == nil || o.EventsScannedBytes == nil {
+		return nil, false
+	}
+	return o.EventsScannedBytes, true
+}
+
+// HasEventsScannedBytes returns a boolean if a field has been set.
+func (o *UsageSDSHour) HasEventsScannedBytes() bool {
+	return o != nil && o.EventsScannedBytes != nil
+}
+
+// SetEventsScannedBytes gets a reference to the given int64 and assigns it to the EventsScannedBytes field.
+func (o *UsageSDSHour) SetEventsScannedBytes(v int64) {
+	o.EventsScannedBytes = &v
+}
+
 // GetHour returns the Hour field value if set, zero value otherwise.
 func (o *UsageSDSHour) GetHour() time.Time {
 	if o == nil || o.Hour == nil {
@@ -155,6 +217,34 @@ func (o *UsageSDSHour) SetPublicId(v string) {
 	o.PublicId = &v
 }
 
+// GetRumScannedBytes returns the RumScannedBytes field value if set, zero value otherwise.
+func (o *UsageSDSHour) GetRumScannedBytes() int64 {
+	if o == nil || o.RumScannedBytes == nil {
+		var ret int64
+		return ret
+	}
+	return *o.RumScannedBytes
+}
+
+// GetRumScannedBytesOk returns a tuple with the RumScannedBytes field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+func (o *UsageSDSHour) GetRumScannedBytesOk() (*int64, bool) {
+	if o == nil || o.RumScannedBytes == nil {
+		return nil, false
+	}
+	return o.RumScannedBytes, true
+}
+
+// HasRumScannedBytes returns a boolean if a field has been set.
+func (o *UsageSDSHour) HasRumScannedBytes() bool {
+	return o != nil && o.RumScannedBytes != nil
+}
+
+// SetRumScannedBytes gets a reference to the given int64 and assigns it to the RumScannedBytes field.
+func (o *UsageSDSHour) SetRumScannedBytes(v int64) {
+	o.RumScannedBytes = &v
+}
+
 // GetTotalScannedBytes returns the TotalScannedBytes field value if set, zero value otherwise.
 func (o *UsageSDSHour) GetTotalScannedBytes() int64 {
 	if o == nil || o.TotalScannedBytes == nil {
@@ -189,6 +279,12 @@ func (o UsageSDSHour) MarshalJSON() ([]byte, error) {
 	if o.UnparsedObject != nil {
 		return json.Marshal(o.UnparsedObject)
 	}
+	if o.ApmScannedBytes != nil {
+		toSerialize["apm_scanned_bytes"] = o.ApmScannedBytes
+	}
+	if o.EventsScannedBytes != nil {
+		toSerialize["events_scanned_bytes"] = o.EventsScannedBytes
+	}
 	if o.Hour != nil {
 		if o.Hour.Nanosecond() == 0 {
 			toSerialize["hour"] = o.Hour.Format("2006-01-02T15:04:05Z07:00")
@@ -205,6 +301,9 @@ func (o UsageSDSHour) MarshalJSON() ([]byte, error) {
 	if o.PublicId != nil {
 		toSerialize["public_id"] = o.PublicId
 	}
+	if o.RumScannedBytes != nil {
+		toSerialize["rum_scanned_bytes"] = o.RumScannedBytes
+	}
 	if o.TotalScannedBytes != nil {
 		toSerialize["total_scanned_bytes"] = o.TotalScannedBytes
 	}
@@ -219,11 +318,14 @@ func (o UsageSDSHour) MarshalJSON() ([]byte, error) {
 func (o *UsageSDSHour) UnmarshalJSON(bytes []byte) (err error) {
 	raw := map[string]interface{}{}
 	all := struct {
-		Hour              *time.Time `json:"hour,omitempty"`
-		LogsScannedBytes  *int64     `json:"logs_scanned_bytes,omitempty"`
-		OrgName           *string    `json:"org_name,omitempty"`
-		PublicId          *string    `json:"public_id,omitempty"`
-		TotalScannedBytes *int64     `json:"total_scanned_bytes,omitempty"`
+		ApmScannedBytes    *int64     `json:"apm_scanned_bytes,omitempty"`
+		EventsScannedBytes *int64     `json:"events_scanned_bytes,omitempty"`
+		Hour               *time.Time `json:"hour,omitempty"`
+		LogsScannedBytes   *int64     `json:"logs_scanned_bytes,omitempty"`
+		OrgName            *string    `json:"org_name,omitempty"`
+		PublicId           *string    `json:"public_id,omitempty"`
+		RumScannedBytes    *int64     `json:"rum_scanned_bytes,omitempty"`
+		TotalScannedBytes  *int64     `json:"total_scanned_bytes,omitempty"`
 	}{}
 	err = json.Unmarshal(bytes, &all)
 	if err != nil {
@@ -234,10 +336,13 @@ func (o *UsageSDSHour) UnmarshalJSON(bytes []byte) (err error) {
 		o.UnparsedObject = raw
 		return nil
 	}
+	o.ApmScannedBytes = all.ApmScannedBytes
+	o.EventsScannedBytes = all.EventsScannedBytes
 	o.Hour = all.Hour
 	o.LogsScannedBytes = all.LogsScannedBytes
 	o.OrgName = all.OrgName
 	o.PublicId = all.PublicId
+	o.RumScannedBytes = all.RumScannedBytes
 	o.TotalScannedBytes = all.TotalScannedBytes
 	return nil
 }