From cd185c4c2c557c3a8911f05c7e760d33082b5306 Mon Sep 17 00:00:00 2001 From: Curt Bushko Date: Wed, 19 Oct 2022 15:44:19 -0400 Subject: [PATCH 1/2] update prometheus template args --- command/connect/envoy/bootstrap_tpl.go | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/command/connect/envoy/bootstrap_tpl.go b/command/connect/envoy/bootstrap_tpl.go index afb56eb777..442dbe6d75 100644 --- a/command/connect/envoy/bootstrap_tpl.go +++ b/command/connect/envoy/bootstrap_tpl.go @@ -111,10 +111,21 @@ type BootstrapTplArgs struct { // the envoy_prometheus_bind_addr listener. PrometheusScrapePath string - PrometheusCAFile string - PrometheusCAPath string + // PrometheusCAFile is the path to a CA file for Envoy to use when serving TLS on the Prometheius metrics + // endpoint. Only applicable when envoy_prometheus_bind_addr is set in the proxy config. + PrometheusCAFile string + + // PrometheusCAPath is the path to a directory of CA certificates for Envoy to use when serving the Prometheus + // metrics endpoint. Only applicable when envoy_prometheus_bind_addr is set in the proxy config. + PrometheusCAPath string + + // PrometheusCertFile is the path to a certificate file for Envoy to use when serving TLS on the Prometheus + // metrics endpoint. Only applicable when envoy_prometheus_bind_addr is set in the proxy config. PrometheusCertFile string - PrometheusKeyFile string + + // PrometheusKeyFile is the path to a private key file Envoy to use when service TLS on the Prometheus metrics + // endpoint. Only applicable when envoy_prometheus_bind_addr is set in the proxy config. + PrometheusKeyFile string } // GRPC settings used in the bootstrap template. From 161273a931ce5158dac43bfdf774c9f3305b6b16 Mon Sep 17 00:00:00 2001 From: Curt Bushko Date: Wed, 19 Oct 2022 15:52:10 -0400 Subject: [PATCH 2/2] Update command/connect/envoy/bootstrap_tpl.go Co-authored-by: Paul Glass --- command/connect/envoy/bootstrap_tpl.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/command/connect/envoy/bootstrap_tpl.go b/command/connect/envoy/bootstrap_tpl.go index 442dbe6d75..92a0a614ec 100644 --- a/command/connect/envoy/bootstrap_tpl.go +++ b/command/connect/envoy/bootstrap_tpl.go @@ -123,7 +123,7 @@ type BootstrapTplArgs struct { // metrics endpoint. Only applicable when envoy_prometheus_bind_addr is set in the proxy config. PrometheusCertFile string - // PrometheusKeyFile is the path to a private key file Envoy to use when service TLS on the Prometheus metrics + // PrometheusKeyFile is the path to a private key file Envoy to use when serving TLS on the Prometheus metrics // endpoint. Only applicable when envoy_prometheus_bind_addr is set in the proxy config. PrometheusKeyFile string }