Merge pull request #138 from ExpediaGroup/feature/waggledance_other_d…

…eployments

Feature/waggledance other deployments

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [4.3.1] - 2024-02-22
+### Updated
+- Updated eks to use instance name instead of hard coding.
+
 ## [4.3.0] - 2024-02-08
 ### Added
 - Variable to add a readonly primary optional host/port. Waggle Dance will redirect get calls automatically to those.

k8s.tf

@@ -49,9 +49,9 @@ resource "kubernetes_deployment_v1" "waggle_dance" {
           name = local.instance_alias
         }
         annotations = {
-          "ad.datadoghq.com/waggledance.check_names" = var.datadog_metrics_enabled ?  "[\"openmetrics\"]" : null
-          "ad.datadoghq.com/waggledance.init_configs" = var.datadog_metrics_enabled ?  "[{}]" : null
-          "ad.datadoghq.com/waggledance.instances" = var.datadog_metrics_enabled ?  "[{ \"prometheus_url\": \"http://%%host%%:${var.metrics_port}/actuator/prometheus\", \"namespace\": \"waggledance\", \"metrics\": [ \"${join("\",\"", var.datadog_metrics_waggledance)}\" ]  }]" : null
+          "ad.datadoghq.com/${local.instance_alias}.check_names" = var.datadog_metrics_enabled ?  "[\"openmetrics\"]" : null
+          "ad.datadoghq.com/${local.instance_alias}.init_configs" = var.datadog_metrics_enabled ?  "[{}]" : null
+          "ad.datadoghq.com/${local.instance_alias}.instances" = var.datadog_metrics_enabled ?  "[{ \"prometheus_url\": \"http://%%host%%:${var.metrics_port}/actuator/prometheus\", \"namespace\": \"waggledance\", \"metrics\": [ \"${join("\",\"", var.datadog_metrics_waggledance)}\" ]  }]" : null
           "prometheus.io/scrape" : var.prometheus_enabled
           "prometheus.io/port" : local.actuator_port
           "prometheus.io/path" : "/actuator/prometheus"