From 5559f0222cd9ada0e877a484a92c332e1b6e8218 Mon Sep 17 00:00:00 2001
From: natemollica-dev <nathan.mollica@hashicorp.com>
Date: Sat, 3 Feb 2024 19:01:47 -0800
Subject: [PATCH] update server-statefulset.yaml to exclude prometheus.io/
 annotations if/when enabling datadog openmetrics method for consul server
 metrics scrape. conflict present with http vs https that breaks openemtrics
 scrape on consul

---
 charts/consul/templates/server-statefulset.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/consul/templates/server-statefulset.yaml b/charts/consul/templates/server-statefulset.yaml
index aa7fbab1b5..6dcd2e320a 100644
--- a/charts/consul/templates/server-statefulset.yaml
+++ b/charts/consul/templates/server-statefulset.yaml
@@ -135,7 +135,7 @@ spec:
         {{- if not .Values.global.metrics.datadog.openMetricsPrometheus.enabled }}
         "prometheus.io/scrape": "true"
         "prometheus.io/path": "/v1/agent/metrics"
-        {{- if and .Values.global.tls.enabled }}
+        {{- if .Values.global.tls.enabled }}
         "prometheus.io/port": "8501"
         "prometheus.io/scheme": "https"
         {{- else }}