Add rabbitmq_dashboard_metrics_format as option to datadog integration

cloudamqp/resource_cloudamqp_integration_metric_prometheus.go

@@ -74,6 +74,11 @@ func resourceIntegrationMetricPrometheus() *schema.Resource {
 							Optional:    true,
 							Description: "tags. E.g. env=prod,service=web",
 						},
+						"rabbitmq_dashboard_metrics_format": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Description: "Enable metric name transformation to match Datadog's RabbitMQ dashboard format",
+						},
 					},
 				},
 			},
@@ -266,6 +271,13 @@ func resourceIntegrationMetricPrometheusCreate(ctx context.Context, d *schema.Re
 		if tags := datadogConfig["tags"]; tags != nil && tags != "" {
 			params["tags"] = tags
 		}
+		if format, ok := datadogConfig["rabbitmq_dashboard_metrics_format"].(bool); ok {
+			if format {
+				params["rabbitmq_dashboard_metrics_format"] = "true"
+			} else {
+				params["rabbitmq_dashboard_metrics_format"] = "false"
+			}
+		}
 	} else if azureMonitorList := d.Get("azure_monitor").(*schema.Set).List(); len(azureMonitorList) > 0 {
 		intName = "azure_monitor"
 		azureMonitorConfig := azureMonitorList[0].(map[string]any)
@@ -412,6 +424,9 @@ func resourceIntegrationMetricPrometheusRead(ctx context.Context, d *schema.Reso
 		if tags, ok := data["tags"]; ok {
 			datadogV3[0]["tags"] = tags
 		}
+		if format, ok := data["rabbitmq_dashboard_metrics_format"]; ok {
+			datadogV3[0]["rabbitmq_dashboard_metrics_format"] = format == "true"
+		}
 		if err := d.Set("datadog_v3", datadogV3); err != nil {
 			return diag.Errorf("error setting datadog_v3 for resource %s: %s", d.Id(), err)
 		}
@@ -516,6 +531,13 @@ func resourceIntegrationMetricPrometheusUpdate(ctx context.Context, d *schema.Re
 		if tags := datadogConfig["tags"]; tags != nil && tags != "" {
 			params["tags"] = tags
 		}
+		if format, ok := datadogConfig["rabbitmq_dashboard_metrics_format"].(bool); ok {
+			if format {
+				params["rabbitmq_dashboard_metrics_format"] = "true"
+			} else {
+				params["rabbitmq_dashboard_metrics_format"] = "false"
+			}
+		}
 	} else if azureMonitorList := d.Get("azure_monitor").(*schema.Set).List(); len(azureMonitorList) > 0 {
 		azureMonitorConfig := azureMonitorList[0].(map[string]any)
 		params["connection_string"] = azureMonitorConfig["connection_string"]

cloudamqp/resource_cloudamqp_integration_metric_prometheus_test.go

@@ -261,21 +261,23 @@ func TestAccIntegrationMetricPrometheusDatadogV3_Update(t *testing.T) {
 		prometheusDatadogResourceName = "cloudamqp_integration_metric_prometheus.datadog_v3"
 
 		paramsCreate = map[string]string{
-			"InstanceName":  "TestAccIntegrationMetricPrometheusDatadogV3_Update",
-			"InstanceID":    fmt.Sprintf("%s.id", instanceResourceName),
-			"InstancePlan":  "bunny-1",
-			"DatadogApiKey": testApiKey,
-			"DatadogRegion": "us1",
-			"DatadogTags":   "key=value,key2=value2",
+			"InstanceName":                          "TestAccIntegrationMetricPrometheusDatadogV3_Update",
+			"InstanceID":                            fmt.Sprintf("%s.id", instanceResourceName),
+			"InstancePlan":                          "bunny-1",
+			"DatadogApiKey":                         testApiKey,
+			"DatadogRegion":                         "us1",
+			"DatadogTags":                           "key=value,key2=value2",
+			"DatadogRabbitmqDashboardMetricsFormat": "false",
 		}
 
 		paramsUpdate = map[string]string{
-			"InstanceName":  "TestAccIntegrationMetricPrometheusDatadogV3_Update",
-			"InstanceID":    fmt.Sprintf("%s.id", instanceResourceName),
-			"InstancePlan":  "bunny-1",
-			"DatadogApiKey": testApiKey,
-			"DatadogRegion": "us1",
-			"DatadogTags":   "key=value2,key2=value3",
+			"InstanceName":                          "TestAccIntegrationMetricPrometheusDatadogV3_Update",
+			"InstanceID":                            fmt.Sprintf("%s.id", instanceResourceName),
+			"InstancePlan":                          "bunny-1",
+			"DatadogApiKey":                         testApiKey,
+			"DatadogRegion":                         "us1",
+			"DatadogTags":                           "key=value2,key2=value3",
+			"DatadogRabbitmqDashboardMetricsFormat": "true",
 		}
 	)
 
@@ -288,6 +290,7 @@ func TestAccIntegrationMetricPrometheusDatadogV3_Update(t *testing.T) {
 					resource.TestCheckResourceAttr(instanceResourceName, "name", paramsCreate["InstanceName"]),
 					resource.TestCheckResourceAttr(prometheusDatadogResourceName, "datadog_v3.0.region", paramsCreate["DatadogRegion"]),
 					resource.TestCheckResourceAttr(prometheusDatadogResourceName, "datadog_v3.0.tags", paramsCreate["DatadogTags"]),
+					resource.TestCheckResourceAttr(prometheusDatadogResourceName, "datadog_v3.0.rabbitmq_dashboard_metrics_format", "false"),
 				),
 			},
 			{
@@ -296,6 +299,7 @@ func TestAccIntegrationMetricPrometheusDatadogV3_Update(t *testing.T) {
 					resource.TestCheckResourceAttr(instanceResourceName, "name", paramsUpdate["InstanceName"]),
 					resource.TestCheckResourceAttr(prometheusDatadogResourceName, "datadog_v3.0.region", paramsUpdate["DatadogRegion"]),
 					resource.TestCheckResourceAttr(prometheusDatadogResourceName, "datadog_v3.0.tags", paramsUpdate["DatadogTags"]),
+					resource.TestCheckResourceAttr(prometheusDatadogResourceName, "datadog_v3.0.rabbitmq_dashboard_metrics_format", "true"),
 				),
 			},
 		},

docs/resources/integration_metric_prometheus.md

@@ -24,9 +24,10 @@ resource "cloudamqp_integration_metric_prometheus" "datadog_v3" {
   instance_id = cloudamqp_instance.instance.id
 
   datadog_v3 {
-    api_key = var.datadog_api_key
-    region  = "us1"
-    tags    = "key=value,key2=value2"
+    api_key                            = var.datadog_api_key
+    region                             = "us1"
+    tags                               = "key=value,key2=value2"
+    rabbitmq_dashboard_metrics_format  = true
   }
 }
 ```
@@ -127,6 +128,7 @@ The following arguments are supported:
 * `api_key` - (Required) Datadog API key for authentication.
 * `region` - (Required) Datadog region code. Valid values: `us1`, `us3`, `us5`, `eu1`.
 * `tags` - (Optional) Additional tags to attach to metrics. Format: `key=value,key2=value2`.
+* `rabbitmq_dashboard_metrics_format` - (Optional) Enable metric name transformation to match Datadog's RabbitMQ dashboard format. Default: `false`. **Note:** This option is only available for RabbitMQ clusters, not LavinMQ clusters.
 
 ### azure_monitor
 

test/configurations/integrations/metrics/integration_metric_prometheus_datadog_v3.txt

@@ -1,8 +1,9 @@
 resource "cloudamqp_integration_metric_prometheus" "datadog_v3" {
   instance_id = {{.InstanceID}}
   datadog_v3 {
-    api_key = "{{.DatadogApiKey}}"
-    region  = "{{.DatadogRegion}}"
-    tags    = "{{.DatadogTags}}"
+    api_key                           = "{{.DatadogApiKey}}"
+    region                            = "{{.DatadogRegion}}"
+    tags                              = "{{.DatadogTags}}"
+    {{if .DatadogRabbitmqDashboardMetricsFormat}}rabbitmq_dashboard_metrics_format = {{.DatadogRabbitmqDashboardMetricsFormat}}{{end}}
   }
 }