fix: fxing syntax

ExpediaGroup · Nov 19, 2024 · a2e7077 · a2e7077
1 parent 4e33ff5
commit a2e7077
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/common.tf b/common.tf
@@ -64,6 +64,8 @@ locals {
 
   ro_ingress_cidr = var.ingress_cidr
   rw_ingress_cidr = length(var.rw_ingress_cidr) == 0 ? var.ingress_cidr : var.rw_ingress_cidr
+  hms_metrics                = join("\",\"", var.datadog_metrics_hms_readwrite_readonly)
+  hms_metrics_type_overrides = join("\": \"gauge\",\"", var.datadog_metrics_hms_readwrite_readonly)
 }
 
 data "aws_iam_account_alias" "current" {}

diff --git a/templates.tf b/templates.tf
@@ -71,9 +71,11 @@ locals{
     datadog_agent_version = var.datadog_agent_version
     datadog_agent_enabled = var.datadog_agent_enabled
     datadog_tags          = local.datadog_tags
-    tcp_keepalive_time     = var.tcp_keepalive_time
-    tcp_keepalive_intvl    = var.tcp_keepalive_intvl
-    tcp_keepalive_probes   = var.tcp_keepalive_probes
+    tcp_keepalive_time    = var.tcp_keepalive_time
+    tcp_keepalive_intvl   = var.tcp_keepalive_intvl
+    tcp_keepalive_probes  = var.tcp_keepalive_probes
+    hms_metrics                = local.hms_metrics
+    hms_metrics_type_overrides = local.hms_metrics_type_overrides
   })
 
   hms_readonly_template = templatefile("${path.module}/templates/apiary-hms-readonly.json", {
@@ -131,5 +133,7 @@ locals{
     hms_readwrite_namespace = var.hms_readwrite_namespace
     hms_readonly_namespace  = var.hms_readonly_namespace
     datadog_metrics_hms_readwrite_readonly = var.datadog_metrics_hms_readwrite_readonly
+    hms_metrics                = local.hms_metrics
+    hms_metrics_type_overrides = local.hms_metrics_type_overrides
   })
 }
diff --git a/templates/apiary-hms-readonly.json b/templates/apiary-hms-readonly.json
@@ -75,7 +75,7 @@
         }
     },
     "dockerLabels": {
-        "com.datadoghq.ad.instances": "[{ \"prometheus_url\": \"http://%%host%%:8080/actuator/prometheus\", \"namespace\": \"${hms_readonly_namespace}\", \"metrics\": [${join(\",\", ${datadog_metrics_hms_readwrite_readonly} )}] }]"
+        "com.datadoghq.ad.instances": "[{ \"prometheus_url\": \"http://%%host%%:8080/actuator/prometheus\", \"namespace\": \"${hms_readonly_namespace}\", \"metrics\": [\"${hms_metrics}\"],\"type_overrides\":{\"${hms_metrics_type_overrides}\": \"gauge\"} }]",
         "com.datadoghq.ad.check_names": "[\"prometheus\"]",
         "com.datadoghq.ad.init_configs": "[{}]"
     },

diff --git a/templates/apiary-hms-readwrite.json b/templates/apiary-hms-readwrite.json
@@ -75,7 +75,7 @@
         }
     },
     "dockerLabels": {
-        "com.datadoghq.ad.instances": "[{ \"prometheus_url\": \"http://%%host%%:8080/actuator/prometheus\", \"namespace\": \"${hms_readwrite_namespace}\", \"metrics\": [${join(\",\", var.datadog_metrics_hms_readwrite_readonly)}] }]"
+        "com.datadoghq.ad.instances": "[{ \"prometheus_url\": \"http://%%host%%:8080/actuator/prometheus\", \"namespace\": \"${hms_readwrite_namespace}\", \"metrics\": [\"${hms_metrics}\"],\"type_overrides\":{\"${hms_metrics_type_overrides}\": \"gauge\"} }]",
         "com.datadoghq.ad.check_names": "[\"prometheus\"]",
         "com.datadoghq.ad.init_configs": "[{}]"
   },