Enable global port listening

cloudfoundry · Feb 28, 2024 · 24d217b · 24d217b
1 parent 5d2fa34
commit 24d217b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/jobs/otel-collector-windows/spec b/jobs/otel-collector-windows/spec
@@ -16,6 +16,9 @@ properties:
   enabled:
     description: "Enable OTel Collector"
     default: true
+  ingress.grpc.internal_only:
+    description: "Only allow listening on local VM to receive OTLP over gRPC"
+    default: true
   ingress.grpc.port:
     description: "Port the collector is listening on to receive OTLP over gRPC"
     default: 9100

diff --git a/jobs/otel-collector-windows/templates/config.yml.erb b/jobs/otel-collector-windows/templates/config.yml.erb
@@ -7,12 +7,14 @@ if metric_exporters.keys.any?{|k| k.include?('/cf-internal')}
   raise 'Metric exporters cannot be defined under cf-internal namespace'
 end
 
+local_listening = p('ingress.grpc.local_only')
+
 config = {
   "receivers"=> {
     "otlp"=>{
       "protocols"=>{
         "grpc"=>{
-          "endpoint"=>"127.0.0.1:#{p('ingress.grpc.port')}",
+          "endpoint"=>local_listening ? "127.0.0.1:#{p('ingress.grpc.port')}" : ":#{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/spec b/jobs/otel-collector/spec
@@ -17,6 +17,9 @@ properties:
   enabled:
     description: "Enable OTel Collector"
     default: true
+  ingress.grpc.local_only:
+    description: "Allow only local VM listening to receive OTLP over gRPC"
+    default: true
   ingress.grpc.port:
     description: "Port the collector is listening on to receive OTLP over gRPC"
     default: 9100

diff --git a/jobs/otel-collector/templates/config.yml.erb b/jobs/otel-collector/templates/config.yml.erb
@@ -10,12 +10,14 @@ if metric_exporters.any?{|k, v| k.start_with?('prometheus') && v['endpoint'] &&
   raise 'Cannot define prometheus exporter listening on port 8889 (reserved for BBS API port)'
 end
 
+local_listening = p('ingress.grpc.local_only')
+
 config = {
   "receivers"=> {
     "otlp"=>{
       "protocols"=>{
         "grpc"=>{
-          "endpoint"=>"127.0.0.1:#{p('ingress.grpc.port')}",
+          "endpoint"=>local_listening ? "127.0.0.1:#{p('ingress.grpc.port')}" : ":#{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",