feat: Adds support for send_collection_latency_metrics and send_database_metrics for Datadog integrations in mongodbatlas_third_party_integration (mongodb#3259)

Author: francovp

.changelog/3259.txt

@@ -0,0 +1,11 @@
+```release-note:enhancement
+resource/mongodbatlas_third_party_integration: Adds support for `send_collection_latency_metrics` and `send_database_metrics` for Datadog integrations
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_third_party_integration: Adds support for `send_collection_latency_metrics` and `send_database_metrics` for Datadog integrations
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_third_party_integrations: Adds support for `send_collection_latency_metrics` and `send_database_metrics` for Datadog integrations
+```

docs/data-sources/third_party_integration.md

@@ -46,7 +46,7 @@ Additional values based on Type
 * `DATADOG`
   * `api_key` - Your API Key.
   * `region` - Two-letter code that indicates which API URL to use. See the `region` response field of [MongoDB API Third-Party Service Integration documentation](https://www.mongodb.com/docs/atlas/reference/api-resources-spec/v2/#tag/Third-Party-Integrations/operation/getThirdPartyIntegration) for more details. Datadog will use "US" by default.
-  * `send_collection_latency_metrics` - Toggle sending collection latency metrics that includes database names and collection namesand latency metrics on reads, writes, commands, and transactions.
+  * `send_collection_latency_metrics` - Toggle sending collection latency metrics that includes database names and collection name sand latency metrics on reads, writes, commands, and transactions.
   * `send_database_metrics` - Toggle sending database metrics that includes database names and metrics on the number of collections, storage size, and index size.
 * `OPS_GENIE`
   * `api_key` - Your API Key.

docs/data-sources/third_party_integrations.md

@@ -60,7 +60,7 @@ Additional values based on Type
 * `DATADOG`
   * `api_key` - Your API Key.
   * `region` - Two-letter code that indicates which API URL to use. See the `region` response field of [MongoDB API Third-Party Service Integration documentation](https://www.mongodb.com/docs/atlas/reference/api-resources-spec/v2/#tag/Third-Party-Integrations/operation/getThirdPartyIntegration) for more details. Datadog will use "US" by default.
-  * `send_collection_latency_metrics` - Toggle sending collection latency metrics that includes database names and collection namesand latency metrics on reads, writes, commands, and transactions.
+  * `send_collection_latency_metrics` - Toggle sending collection latency metrics that includes database names and collection names and latency metrics on reads, writes, commands, and transactions.
   * `send_database_metrics` - Toggle sending database metrics that includes database names and metrics on the number of collections, storage size, and index size.
 * `OPS_GENIE`
   * `api_key` - Your API Key.

docs/resources/third_party_integration.md

@@ -43,7 +43,7 @@ resource "mongodbatlas_third_party_integration" "test_datadog" {
 * `DATADOG`
   * `api_key` - Your API Key.
   * `region` (Required) - Two-letter code that indicates which API URL to use. See the `region` request parameter of [MongoDB API Third-Party Service Integration documentation](https://www.mongodb.com/docs/atlas/reference/api-resources-spec/v2/#tag/Third-Party-Integrations/operation/createThirdPartyIntegration) for more details. Datadog will use "US" by default.
-  * `send_collection_latency_metrics` - Toggle sending collection latency metrics that includes database names and collection namesand latency metrics on reads, writes, commands, and transactions. Default: `false`.
+  * `send_collection_latency_metrics` - Toggle sending collection latency metrics that includes database names and collection names and latency metrics on reads, writes, commands, and transactions. Default: `false`.
   * `send_database_metrics` - Toggle sending database metrics that includes database names and metrics on the number of collections, storage size, and index size. Default: `false`.
 * `OPS_GENIE`
   * `api_key` - Your API Key.
@@ -62,6 +62,8 @@ resource "mongodbatlas_third_party_integration" "test_datadog" {
   * `service_discovery` - Indicates which service discovery method is used, either file or http.
   * `enabled` - Whether your cluster has Prometheus enabled.
 
+-> **NOTE:** For certain attributes with default values, it's recommended to explicitly set them back to their default instead of removing them from the configuration. For example, if `send_collection_latency_metrics` is set to `true` and you want to revert to the default (`false`), set it to `false` rather than removing it.
+
 ## Attributes Reference
 
 * `id` - Unique identifier of the integration.

examples/mongodbatlas_third_party_integration/datadog/variables.tf

@@ -26,13 +26,13 @@ variable "cluster_name" {
 }
 
 variable "send_collection_latency_metrics" {
-  description = "Send collection latency metrics"
+  description = "Send collection latency metrics (only for Datadog integrations)"
   default     = false
   type        = bool
 }
 
 variable "send_database_metrics" {
-  description = "Send database metrics"
+  description = "Send database metrics (only for Datadog integrations)"
   default     = false
   type        = bool
 }

internal/service/thirdpartyintegration/data_source_third_party_integration.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
 )
 
@@ -85,21 +86,29 @@ func thirdPartyIntegrationSchema() *schema.Resource {
 			"microsoft_teams_webhook_url": {
 				Type:      schema.TypeString,
 				Sensitive: true,
-				Optional:  true,
+				Computed:  true,
 			},
 			"user_name": {
 				Type:      schema.TypeString,
 				Sensitive: true,
-				Optional:  true,
+				Computed:  true,
 			},
 			"service_discovery": {
 				Type:      schema.TypeString,
 				Sensitive: true,
-				Optional:  true,
+				Computed:  true,
 			},
 			"enabled": {
 				Type:     schema.TypeBool,
-				Optional: true,
+				Computed: true,
+			},
+			"send_collection_latency_metrics": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"send_database_metrics": {
+				Type:     schema.TypeBool,
+				Computed: true,
 			},
 			"send_collection_latency_metrics": {
 				Type:     schema.TypeBool,

internal/service/thirdpartyintegration/data_source_third_party_integrations.go

@@ -4,12 +4,14 @@ import (
 	"context"
 	"fmt"
 
+	"go.mongodb.org/atlas-sdk/v20250312002/admin"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/id"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/conversion"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
-	"go.mongodb.org/atlas-sdk/v20250312002/admin"
 )
 
 func PluralDataSource() *schema.Resource {

internal/service/thirdpartyintegration/resource_third_party_integration.go

@@ -8,6 +8,7 @@ import (
 	"github.com/hashicorp/go-cty/cty"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/common/validate"
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/config"
 )

internal/service/thirdpartyintegration/resource_third_party_integration_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
+
 	"github.com/mongodb/terraform-provider-mongodbatlas/internal/testutil/acc"
 )
 
@@ -178,7 +179,7 @@ func datadogTest(tb testing.TB) *resource.TestCase {
 		CheckDestroy:             checkDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: configDatadog(projectID, apiKey, "US", false, false),
+				Config: configDatadog(projectID, apiKey, "US", false, false, false),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					checkExists(resourceName),
 					resource.TestCheckResourceAttr(resourceName, "type", intType),
@@ -193,18 +194,33 @@ func datadogTest(tb testing.TB) *resource.TestCase {
 				),
 			},
 			{
-				Config: configDatadog(projectID, updatedAPIKey, "US", false, false),
+				Config: configDatadog(projectID, apiKey, "US", true, true, false),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					checkExists(resourceName),
+					resource.TestCheckResourceAttr(resourceName, "type", intType),
+					resource.TestCheckResourceAttr(resourceName, "api_key", apiKey),
+					resource.TestCheckResourceAttr(resourceName, "region", region),
+					resource.TestCheckResourceAttr(resourceName, "send_collection_latency_metrics", "true"),
+					resource.TestCheckResourceAttr(resourceName, "send_database_metrics", "false"),
+					resource.TestCheckResourceAttr(dataSourceName, "type", intType),
+					resource.TestCheckResourceAttr(dataSourceName, "region", region),
+					resource.TestCheckResourceAttr(dataSourceName, "send_collection_latency_metrics", "true"),
+					resource.TestCheckResourceAttr(dataSourceName, "send_database_metrics", "false"),
+				),
+			},
+			{
+				Config: configDatadog(projectID, updatedAPIKey, "US", true, false, true),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					checkExists(resourceName),
 					resource.TestCheckResourceAttr(resourceName, "type", intType),
 					resource.TestCheckResourceAttr(resourceName, "api_key", updatedAPIKey),
 					resource.TestCheckResourceAttr(resourceName, "region", region),
 					resource.TestCheckResourceAttr(resourceName, "send_collection_latency_metrics", "false"),
-					resource.TestCheckResourceAttr(resourceName, "send_database_metrics", "false"),
+					resource.TestCheckResourceAttr(resourceName, "send_database_metrics", "true"),
 				),
 			},
 			{
-				Config: configDatadog(projectID, updatedAPIKey, "US", true, true),
+				Config: configDatadog(projectID, updatedAPIKey, "US", true, true, true),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					checkExists(resourceName),
 					resource.TestCheckResourceAttr(resourceName, "type", intType),
@@ -443,23 +459,28 @@ func configVictorOps(projectID, apiKey string) string {
 	) + singularDataStr
 }
 
-func configDatadog(projectID, apiKey, region string, sendCollectionLatencyMetrics, sendDatabaseMetrics bool) string {
+func configDatadog(projectID, apiKey, region string, useOptionalAttr, sendCollectionLatencyMetrics, sendDatabaseMetrics bool) string {
+	optionalConfigAttrs := ""
+	if useOptionalAttr {
+		optionalConfigAttrs = fmt.Sprintf(
+			`send_collection_latency_metrics = %[1]t
+		send_database_metrics = %[2]t`, sendCollectionLatencyMetrics, sendDatabaseMetrics)
+	}
 	return fmt.Sprintf(`
 	resource "mongodbatlas_third_party_integration" "test" {
 		project_id = "%[1]s"
 		type = "%[2]s"
 		api_key = "%[3]s"
 		region  ="%[4]s"
-		send_collection_latency_metrics = %[5]t
-		send_database_metrics = %[6]t
+		
+		%[5]s
 	}
 	`,
 		projectID,
 		"DATADOG",
 		apiKey,
 		region,
-		sendCollectionLatencyMetrics,
-		sendDatabaseMetrics,
+		optionalConfigAttrs,
 	) + singularDataStr
 }