From b1c1005f7470eee28f26765fa4c0e4f114d26f2d Mon Sep 17 00:00:00 2001 From: Andrew Crump Date: Tue, 15 Aug 2023 02:41:23 +0000 Subject: [PATCH] Reserve metric exporter name prefix - Error when rendering OTel Collector config if the component identifier for metric exporters contains '/cf-internal'. - Reserving this name prefix for potential later use. --- jobs/otel-collector-windows/templates/config.yml.erb | 6 ++++-- jobs/otel-collector/templates/config.yml.erb | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jobs/otel-collector-windows/templates/config.yml.erb b/jobs/otel-collector-windows/templates/config.yml.erb index b55ee6c79..1c3e7385d 100644 --- a/jobs/otel-collector-windows/templates/config.yml.erb +++ b/jobs/otel-collector-windows/templates/config.yml.erb @@ -1,12 +1,14 @@ <%= -otlp_grpc_endpoint = "127.0.0.1:#{p('ingress.grpc.port')}" +if p('metric_exporters').keys.any?{|k| k.include?('/cf-internal')} + raise 'Metric exporters cannot be defined under cf-internal namespace' +end config = { "receivers"=> { "otlp"=>{ "protocols"=>{ "grpc"=>{ - "endpoint"=>otlp_grpc_endpoint, + "endpoint"=>"127.0.0.1:#{p('ingress.grpc.port')}", "tls"=>{ "client_ca_file"=>"/var/vcap/jobs/otel-collector-windows/config/certs/otel-collector-ca.crt", "cert_file"=>"/var/vcap/jobs/otel-collector-windows/config/certs/otel-collector.crt", diff --git a/jobs/otel-collector/templates/config.yml.erb b/jobs/otel-collector/templates/config.yml.erb index e4f51458f..95fd63483 100644 --- a/jobs/otel-collector/templates/config.yml.erb +++ b/jobs/otel-collector/templates/config.yml.erb @@ -1,12 +1,14 @@ <%= -otlp_grpc_endpoint = "127.0.0.1:#{p('ingress.grpc.port')}" +if p('metric_exporters').keys.any?{|k| k.include?('/cf-internal')} + raise 'Metric exporters cannot be defined under cf-internal namespace' +end config = { "receivers"=> { "otlp"=>{ "protocols"=>{ "grpc"=>{ - "endpoint"=>otlp_grpc_endpoint, + "endpoint"=>"127.0.0.1:#{p('ingress.grpc.port')}", "tls"=>{ "client_ca_file"=>"/var/vcap/jobs/otel-collector/config/certs/otel-collector-ca.crt", "cert_file"=>"/var/vcap/jobs/otel-collector/config/certs/otel-collector.crt",