diff --git a/.apigentools-info b/.apigentools-info
index 27d643d5771..b5cc0048c90 100644
--- a/.apigentools-info
+++ b/.apigentools-info
@@ -4,13 +4,13 @@
     "spec_versions": {
         "v1": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2021-11-23 10:44:47.556895",
-            "spec_repo_commit": "a3413fa"
+            "regenerated": "2021-11-24 17:07:29.126206",
+            "spec_repo_commit": "7f68307"
         },
         "v2": {
             "apigentools_version": "1.5.1.dev2",
-            "regenerated": "2021-11-23 10:44:47.577788",
-            "spec_repo_commit": "a3413fa"
+            "regenerated": "2021-11-24 17:07:29.145222",
+            "spec_repo_commit": "7f68307"
         }
     }
 }
\ No newline at end of file
diff --git a/.generator/schemas/v1/openapi.yaml b/.generator/schemas/v1/openapi.yaml
index ed8a8dd53b1..2b9f43d432d 100644
--- a/.generator/schemas/v1/openapi.yaml
+++ b/.generator/schemas/v1/openapi.yaml
@@ -12406,6 +12406,12 @@ components:
           description: The hour for the usage.
           format: date-time
           type: string
+        org_name:
+          description: The organization name.
+          type: string
+        public_id:
+          description: The organization public ID.
+          type: string
         tasks_count:
           description: The number of Fargate tasks run.
           format: int64
@@ -12939,6 +12945,12 @@ components:
             hour."
           format: int64
           type: integer
+        org_name:
+          description: The organization name.
+          type: string
+        public_id:
+          description: The organization public ID.
+          type: string
         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
diff --git a/api/v1/datadog/docs/UsageFargateHour.md b/api/v1/datadog/docs/UsageFargateHour.md
index 3bbd4adb239..95556363fea 100644
--- a/api/v1/datadog/docs/UsageFargateHour.md
+++ b/api/v1/datadog/docs/UsageFargateHour.md
@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ---- | ---- | ----------- | ------
 **AvgProfiledFargateTasks** | Pointer to **int64** | The average profiled task count for Fargate Profiling. | [optional] 
 **Hour** | Pointer to **time.Time** | The hour for the usage. | [optional] 
+**OrgName** | Pointer to **string** | The organization name. | [optional] 
+**PublicId** | Pointer to **string** | The organization public ID. | [optional] 
 **TasksCount** | Pointer to **int64** | The number of Fargate tasks run. | [optional] 
 
 ## Methods
@@ -77,6 +79,56 @@ SetHour sets Hour field to given value.
 
 HasHour returns a boolean if a field has been set.
 
+### GetOrgName
+
+`func (o *UsageFargateHour) GetOrgName() string`
+
+GetOrgName returns the OrgName field if non-nil, zero value otherwise.
+
+### GetOrgNameOk
+
+`func (o *UsageFargateHour) GetOrgNameOk() (*string, bool)`
+
+GetOrgNameOk returns a tuple with the OrgName field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetOrgName
+
+`func (o *UsageFargateHour) SetOrgName(v string)`
+
+SetOrgName sets OrgName field to given value.
+
+### HasOrgName
+
+`func (o *UsageFargateHour) HasOrgName() bool`
+
+HasOrgName returns a boolean if a field has been set.
+
+### GetPublicId
+
+`func (o *UsageFargateHour) GetPublicId() string`
+
+GetPublicId returns the PublicId field if non-nil, zero value otherwise.
+
+### GetPublicIdOk
+
+`func (o *UsageFargateHour) GetPublicIdOk() (*string, bool)`
+
+GetPublicIdOk returns a tuple with the PublicId field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetPublicId
+
+`func (o *UsageFargateHour) SetPublicId(v string)`
+
+SetPublicId sets PublicId field to given value.
+
+### HasPublicId
+
+`func (o *UsageFargateHour) HasPublicId() bool`
+
+HasPublicId returns a boolean if a field has been set.
+
 ### GetTasksCount
 
 `func (o *UsageFargateHour) GetTasksCount() int64`
diff --git a/api/v1/datadog/docs/UsageSDSHour.md b/api/v1/datadog/docs/UsageSDSHour.md
index 56c8016cd92..cc58dc3930e 100644
--- a/api/v1/datadog/docs/UsageSDSHour.md
+++ b/api/v1/datadog/docs/UsageSDSHour.md
@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ---- | ---- | ----------- | ------
 **Hour** | Pointer to **time.Time** | The hour for the usage. | [optional] 
 **LogsScannedBytes** | Pointer to **int64** | 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. | [optional] 
+**OrgName** | Pointer to **string** | The organization name. | [optional] 
+**PublicId** | Pointer to **string** | The organization public ID. | [optional] 
 **TotalScannedBytes** | Pointer to **int64** | 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. | [optional] 
 
 ## Methods
@@ -77,6 +79,56 @@ SetLogsScannedBytes sets LogsScannedBytes field to given value.
 
 HasLogsScannedBytes returns a boolean if a field has been set.
 
+### GetOrgName
+
+`func (o *UsageSDSHour) GetOrgName() string`
+
+GetOrgName returns the OrgName field if non-nil, zero value otherwise.
+
+### GetOrgNameOk
+
+`func (o *UsageSDSHour) GetOrgNameOk() (*string, bool)`
+
+GetOrgNameOk returns a tuple with the OrgName field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetOrgName
+
+`func (o *UsageSDSHour) SetOrgName(v string)`
+
+SetOrgName sets OrgName field to given value.
+
+### HasOrgName
+
+`func (o *UsageSDSHour) HasOrgName() bool`
+
+HasOrgName returns a boolean if a field has been set.
+
+### GetPublicId
+
+`func (o *UsageSDSHour) GetPublicId() string`
+
+GetPublicId returns the PublicId field if non-nil, zero value otherwise.
+
+### GetPublicIdOk
+
+`func (o *UsageSDSHour) GetPublicIdOk() (*string, bool)`
+
+GetPublicIdOk returns a tuple with the PublicId field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetPublicId
+
+`func (o *UsageSDSHour) SetPublicId(v string)`
+
+SetPublicId sets PublicId field to given value.
+
+### HasPublicId
+
+`func (o *UsageSDSHour) HasPublicId() bool`
+
+HasPublicId returns a boolean if a field has been set.
+
 ### GetTotalScannedBytes
 
 `func (o *UsageSDSHour) GetTotalScannedBytes() int64`
diff --git a/api/v1/datadog/model_usage_fargate_hour.go b/api/v1/datadog/model_usage_fargate_hour.go
index 9a3e52c48d3..b1be5cdce45 100644
--- a/api/v1/datadog/model_usage_fargate_hour.go
+++ b/api/v1/datadog/model_usage_fargate_hour.go
@@ -19,6 +19,10 @@ type UsageFargateHour struct {
 	AvgProfiledFargateTasks *int64 `json:"avg_profiled_fargate_tasks,omitempty"`
 	// The hour for the usage.
 	Hour *time.Time `json:"hour,omitempty"`
+	// The organization name.
+	OrgName *string `json:"org_name,omitempty"`
+	// The organization public ID.
+	PublicId *string `json:"public_id,omitempty"`
 	// The number of Fargate tasks run.
 	TasksCount *int64 `json:"tasks_count,omitempty"`
 	// UnparsedObject contains the raw value of the object if there was an error when deserializing into the struct
@@ -106,6 +110,70 @@ func (o *UsageFargateHour) SetHour(v time.Time) {
 	o.Hour = &v
 }
 
+// GetOrgName returns the OrgName field value if set, zero value otherwise.
+func (o *UsageFargateHour) GetOrgName() string {
+	if o == nil || o.OrgName == nil {
+		var ret string
+		return ret
+	}
+	return *o.OrgName
+}
+
+// GetOrgNameOk returns a tuple with the OrgName field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+func (o *UsageFargateHour) GetOrgNameOk() (*string, bool) {
+	if o == nil || o.OrgName == nil {
+		return nil, false
+	}
+	return o.OrgName, true
+}
+
+// HasOrgName returns a boolean if a field has been set.
+func (o *UsageFargateHour) HasOrgName() bool {
+	if o != nil && o.OrgName != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetOrgName gets a reference to the given string and assigns it to the OrgName field.
+func (o *UsageFargateHour) SetOrgName(v string) {
+	o.OrgName = &v
+}
+
+// GetPublicId returns the PublicId field value if set, zero value otherwise.
+func (o *UsageFargateHour) GetPublicId() string {
+	if o == nil || o.PublicId == nil {
+		var ret string
+		return ret
+	}
+	return *o.PublicId
+}
+
+// GetPublicIdOk returns a tuple with the PublicId field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+func (o *UsageFargateHour) GetPublicIdOk() (*string, bool) {
+	if o == nil || o.PublicId == nil {
+		return nil, false
+	}
+	return o.PublicId, true
+}
+
+// HasPublicId returns a boolean if a field has been set.
+func (o *UsageFargateHour) HasPublicId() bool {
+	if o != nil && o.PublicId != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPublicId gets a reference to the given string and assigns it to the PublicId field.
+func (o *UsageFargateHour) SetPublicId(v string) {
+	o.PublicId = &v
+}
+
 // GetTasksCount returns the TasksCount field value if set, zero value otherwise.
 func (o *UsageFargateHour) GetTasksCount() int64 {
 	if o == nil || o.TasksCount == nil {
@@ -149,6 +217,12 @@ func (o UsageFargateHour) MarshalJSON() ([]byte, error) {
 	if o.Hour != nil {
 		toSerialize["hour"] = o.Hour
 	}
+	if o.OrgName != nil {
+		toSerialize["org_name"] = o.OrgName
+	}
+	if o.PublicId != nil {
+		toSerialize["public_id"] = o.PublicId
+	}
 	if o.TasksCount != nil {
 		toSerialize["tasks_count"] = o.TasksCount
 	}
@@ -160,6 +234,8 @@ func (o *UsageFargateHour) UnmarshalJSON(bytes []byte) (err error) {
 	all := struct {
 		AvgProfiledFargateTasks *int64     `json:"avg_profiled_fargate_tasks,omitempty"`
 		Hour                    *time.Time `json:"hour,omitempty"`
+		OrgName                 *string    `json:"org_name,omitempty"`
+		PublicId                *string    `json:"public_id,omitempty"`
 		TasksCount              *int64     `json:"tasks_count,omitempty"`
 	}{}
 	err = json.Unmarshal(bytes, &all)
@@ -173,6 +249,8 @@ func (o *UsageFargateHour) UnmarshalJSON(bytes []byte) (err error) {
 	}
 	o.AvgProfiledFargateTasks = all.AvgProfiledFargateTasks
 	o.Hour = all.Hour
+	o.OrgName = all.OrgName
+	o.PublicId = all.PublicId
 	o.TasksCount = all.TasksCount
 	return nil
 }
diff --git a/api/v1/datadog/model_usage_sds_hour.go b/api/v1/datadog/model_usage_sds_hour.go
index be53c4658cd..b9b4bc7d297 100644
--- a/api/v1/datadog/model_usage_sds_hour.go
+++ b/api/v1/datadog/model_usage_sds_hour.go
@@ -19,6 +19,10 @@ type UsageSDSHour struct {
 	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.
 	LogsScannedBytes *int64 `json:"logs_scanned_bytes,omitempty"`
+	// The organization name.
+	OrgName *string `json:"org_name,omitempty"`
+	// The organization public ID.
+	PublicId *string `json:"public_id,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
@@ -106,6 +110,70 @@ func (o *UsageSDSHour) SetLogsScannedBytes(v int64) {
 	o.LogsScannedBytes = &v
 }
 
+// GetOrgName returns the OrgName field value if set, zero value otherwise.
+func (o *UsageSDSHour) GetOrgName() string {
+	if o == nil || o.OrgName == nil {
+		var ret string
+		return ret
+	}
+	return *o.OrgName
+}
+
+// GetOrgNameOk returns a tuple with the OrgName field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+func (o *UsageSDSHour) GetOrgNameOk() (*string, bool) {
+	if o == nil || o.OrgName == nil {
+		return nil, false
+	}
+	return o.OrgName, true
+}
+
+// HasOrgName returns a boolean if a field has been set.
+func (o *UsageSDSHour) HasOrgName() bool {
+	if o != nil && o.OrgName != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetOrgName gets a reference to the given string and assigns it to the OrgName field.
+func (o *UsageSDSHour) SetOrgName(v string) {
+	o.OrgName = &v
+}
+
+// GetPublicId returns the PublicId field value if set, zero value otherwise.
+func (o *UsageSDSHour) GetPublicId() string {
+	if o == nil || o.PublicId == nil {
+		var ret string
+		return ret
+	}
+	return *o.PublicId
+}
+
+// GetPublicIdOk returns a tuple with the PublicId field value if set, nil otherwise
+// and a boolean to check if the value has been set.
+func (o *UsageSDSHour) GetPublicIdOk() (*string, bool) {
+	if o == nil || o.PublicId == nil {
+		return nil, false
+	}
+	return o.PublicId, true
+}
+
+// HasPublicId returns a boolean if a field has been set.
+func (o *UsageSDSHour) HasPublicId() bool {
+	if o != nil && o.PublicId != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPublicId gets a reference to the given string and assigns it to the PublicId field.
+func (o *UsageSDSHour) SetPublicId(v string) {
+	o.PublicId = &v
+}
+
 // GetTotalScannedBytes returns the TotalScannedBytes field value if set, zero value otherwise.
 func (o *UsageSDSHour) GetTotalScannedBytes() int64 {
 	if o == nil || o.TotalScannedBytes == nil {
@@ -149,6 +217,12 @@ func (o UsageSDSHour) MarshalJSON() ([]byte, error) {
 	if o.LogsScannedBytes != nil {
 		toSerialize["logs_scanned_bytes"] = o.LogsScannedBytes
 	}
+	if o.OrgName != nil {
+		toSerialize["org_name"] = o.OrgName
+	}
+	if o.PublicId != nil {
+		toSerialize["public_id"] = o.PublicId
+	}
 	if o.TotalScannedBytes != nil {
 		toSerialize["total_scanned_bytes"] = o.TotalScannedBytes
 	}
@@ -160,6 +234,8 @@ func (o *UsageSDSHour) UnmarshalJSON(bytes []byte) (err error) {
 	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"`
 	}{}
 	err = json.Unmarshal(bytes, &all)
@@ -173,6 +249,8 @@ func (o *UsageSDSHour) UnmarshalJSON(bytes []byte) (err error) {
 	}
 	o.Hour = all.Hour
 	o.LogsScannedBytes = all.LogsScannedBytes
+	o.OrgName = all.OrgName
+	o.PublicId = all.PublicId
 	o.TotalScannedBytes = all.TotalScannedBytes
 	return nil
 }