From 7512f0ed08a20ef93e8c668cfe05d5068ba6599c Mon Sep 17 00:00:00 2001
From: natemollica-dev <nathan.mollica@hashicorp.com>
Date: Thu, 15 Feb 2024 09:31:32 -0800
Subject: [PATCH 1/3] Update dogstatsd hostPath rendering for Unix domain
 sockets -- override customizable and volumeMount/volume should align

---
 .../consul/templates/server-statefulset.yaml  |  4 +--
 .../consul/test/unit/server-statefulset.bats  | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/charts/consul/templates/server-statefulset.yaml b/charts/consul/templates/server-statefulset.yaml
index 6dcd2e320a..ddb79d0c9b 100644
--- a/charts/consul/templates/server-statefulset.yaml
+++ b/charts/consul/templates/server-statefulset.yaml
@@ -292,7 +292,7 @@ spec:
         {{- if and .Values.global.metrics.datadog.enabled .Values.global.metrics.datadog.dogstatsd.enabled (eq .Values.global.metrics.datadog.dogstatsd.socketTransportType "UDS" ) }}
         - name: dsdsocket
           hostPath:
-            path: /var/run/datadog
+            path: {{ dir .Values.global.metrics.datadog.dogstatsd.dogstatsdAddr | trimAll "\"" }}
             type: DirectoryOrCreate
         {{- end }}
         {{- range .Values.server.extraVolumes }}
@@ -542,7 +542,7 @@ spec:
             {{- end }}
             {{- if and .Values.global.metrics.datadog.enabled .Values.global.metrics.datadog.dogstatsd.enabled (eq .Values.global.metrics.datadog.dogstatsd.socketTransportType "UDS" ) }}
             - name: dsdsocket
-              mountPath: /var/run/datadog
+              mountPath: {{ dir .Values.global.metrics.datadog.dogstatsd.dogstatsdAddr | trimAll "\"" }}
               readOnly: true
             {{- end }}
             {{- range .Values.server.extraVolumes }}
diff --git a/charts/consul/test/unit/server-statefulset.bats b/charts/consul/test/unit/server-statefulset.bats
index 8fceb5c474..4c1dbc0378 100755
--- a/charts/consul/test/unit/server-statefulset.bats
+++ b/charts/consul/test/unit/server-statefulset.bats
@@ -1070,6 +1070,37 @@ load _helpers
   [ "${actual}" = "consul-server" ]
 }
 
+@test "server/StatefulSet: datadog unix socket path name rendering for hostPath volume and volumeMount using default" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      -s templates/server-statefulset.yaml \
+      --set 'global.metrics.enabled=true'  \
+      --set 'telemetryCollector.enabled=true' \
+      --set 'global.metrics.enableAgentMetrics=true'  \
+      --set 'global.metrics.datadog.enabled=true' \
+      --set 'global.metrics.datadog.dogstatsd.enabled=true' \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.volumes[] | select(.name=="dsdsocket") | .hostPath.path' | tee /dev/stderr)
+
+  [ "${actual}" = "/var/run/datadog" ]
+}
+
+@test "server/StatefulSet: datadog unix socket path name rendering for hostPath volume and volumeMount using non default" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      -s templates/server-statefulset.yaml \
+      --set 'global.metrics.enabled=true'  \
+      --set 'telemetryCollector.enabled=true' \
+      --set 'global.metrics.enableAgentMetrics=true'  \
+      --set 'global.metrics.datadog.enabled=true' \
+      --set 'global.metrics.datadog.dogstatsd.enabled=true' \
+      --set 'global.metrics.datadog.dogstatsd.dogstatsdAddr="/this/otherpath/datadog/dsd.socket"' \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.volumes[] | select(.name=="dsdsocket") | .hostPath.path' | tee /dev/stderr)
+
+  [ "${actual}" = "/this/otherpath/datadog" ]
+}
+
 #--------------------------------------------------------------------
 # config-configmap
 

From a64ccf29384b443f93c05ea85ae0b8c60c139131 Mon Sep 17 00:00:00 2001
From: natemollica-dev <nathan.mollica@hashicorp.com>
Date: Thu, 15 Feb 2024 11:07:26 -0800
Subject: [PATCH 2/3] changelog update

---
 .changelog/3635.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .changelog/3635.txt

diff --git a/.changelog/3635.txt b/.changelog/3635.txt
new file mode 100644
index 0000000000..983cae571d
--- /dev/null
+++ b/.changelog/3635.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+helm: updated `server-statefulset.yaml` templating to handle custom Unix Domain Socket paths.
+```
\ No newline at end of file

From bf638d2685134e79156c60fda3404ce4b16cdb4e Mon Sep 17 00:00:00 2001
From: natemollica-dev <nathan.mollica@hashicorp.com>
Date: Tue, 12 Mar 2024 11:00:36 -0700
Subject: [PATCH 3/3] changelog: reviewer update to include datadog specific
 context

---
 .changelog/3635.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changelog/3635.txt b/.changelog/3635.txt
index 983cae571d..c5c505c808 100644
--- a/.changelog/3635.txt
+++ b/.changelog/3635.txt
@@ -1,3 +1,3 @@
 ```release-note:bug
-helm: updated `server-statefulset.yaml` templating to handle custom Unix Domain Socket paths.
+helm: (datadog integration) updated `server-statefulset.yaml` templating to handle custom Unix Domain Socket paths.
 ```
\ No newline at end of file