From ae6581ca96c35e31f7e1f8f8adbeda99f884a8fb Mon Sep 17 00:00:00 2001
From: hc-github-team-consul-core <github-team-consul-core@hashicorp.com>
Date: Thu, 1 Jun 2023 12:23:34 -0400
Subject: [PATCH] Backport of update cloud preset to enable telemetry collector
 into release/1.1.x (#2215)

* backport of commit d474975a2756a43eea67e0ba47877eb82a0d1b18

* backport of commit 10b48eff5c21bf82c9fa45f7e0004bc24b803eae

* backport of commit 2555f006f4097d52c2f654894c0d5d26937675ef

---------

Co-authored-by: Nick Ethier <nethier@hashicorp.com>
---
 .changelog/2205.txt             |  3 +++
 charts/consul/values.yaml       |  2 +-
 cli/preset/cloud_preset.go      | 13 +++++++++++++
 cli/preset/cloud_preset_test.go | 22 ++++++++++++++++++++++
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 .changelog/2205.txt

diff --git a/.changelog/2205.txt b/.changelog/2205.txt
new file mode 100644
index 0000000000..6a66970cfc
--- /dev/null
+++ b/.changelog/2205.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+cli: update cloud preset to enable telemetry collector
+```
\ No newline at end of file
diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml
index 541bb3c3b3..bdf1d52007 100644
--- a/charts/consul/values.yaml
+++ b/charts/consul/values.yaml
@@ -550,7 +550,7 @@ global:
     # Configures the Helm chart’s components to forward envoy metrics for the Consul service mesh to the
     # consul-telemetry-collector. This includes gateway metrics and sidecar metrics.
     # @type: boolean
-    enableTelemetryCollector: true
+    enableTelemetryCollector: false
 
   # The name (and tag) of the consul-dataplane Docker image used for the
   # connect-injected sidecar proxies and mesh, terminating, and ingress gateways.
diff --git a/cli/preset/cloud_preset.go b/cli/preset/cloud_preset.go
index 95219cb378..eb54a721b1 100644
--- a/cli/preset/cloud_preset.go
+++ b/cli/preset/cloud_preset.go
@@ -198,6 +198,8 @@ global:
     bootstrapToken:
       secretName: %s
       secretKey: %s
+  metrics:
+    enableTelemetryCollector: true
   cloud:
     enabled: true
     resourceId:
@@ -212,6 +214,15 @@ global:
     %s
     %s
     %s
+telemetryCollector:
+  enabled: true
+  cloud:
+    clientId:
+      secretName: %s
+      secretKey: %s
+    clientSecret:
+      secretName: %s
+      secretKey: %s
 server:
   replicas: %d
   affinity: null
@@ -228,6 +239,8 @@ controller:
 		secretNameHCPClientID, secretKeyHCPClientID,
 		secretNameHCPClientSecret, secretKeyHCPClientSecret,
 		apiHostCfg, authURLCfg, scadaAddressCfg,
+		secretNameHCPClientID, secretKeyHCPClientID,
+		secretNameHCPClientSecret, secretKeyHCPClientSecret,
 		cfg.BootstrapResponse.Cluster.BootstrapExpect, secretNameServerCert)
 	valuesMap := config.ConvertToMap(values)
 	return valuesMap
diff --git a/cli/preset/cloud_preset_test.go b/cli/preset/cloud_preset_test.go
index 946e1ca158..232d7a5fa3 100644
--- a/cli/preset/cloud_preset_test.go
+++ b/cli/preset/cloud_preset_test.go
@@ -480,6 +480,8 @@ global:
   gossipEncryption:
     secretKey: key
     secretName: consul-gossip-key
+  metrics:
+    enableTelemetryCollector: true
   tls:
     caCert:
       secretKey: tls.crt
@@ -491,6 +493,15 @@ server:
   replicas: 3
   serverCert:
     secretName: consul-server-cert
+telemetryCollector:
+  cloud:
+    clientId:
+      secretKey: client-id
+      secretName: consul-hcp-client-id
+    clientSecret:
+      secretKey: client-secret
+      secretName: consul-hcp-client-secret
+  enabled: true
 `
 
 	const expectedWithoutOptional = `connectInject:
@@ -518,6 +529,8 @@ global:
   gossipEncryption:
     secretKey: key
     secretName: consul-gossip-key
+  metrics:
+    enableTelemetryCollector: true
   tls:
     caCert:
       secretKey: tls.crt
@@ -529,6 +542,15 @@ server:
   replicas: 3
   serverCert:
     secretName: consul-server-cert
+telemetryCollector:
+  cloud:
+    clientId:
+      secretKey: client-id
+      secretName: consul-hcp-client-id
+    clientSecret:
+      secretKey: client-secret
+      secretName: consul-hcp-client-secret
+  enabled: true
 `
 
 	cloudPreset := &CloudPreset{}