Remove metrics forwarder health port from bosh job

cloudfoundry · Jun 25, 2024 · 18e47e7 · 18e47e7
1 parent bdaa192
commit 18e47e7
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 29 deletions.
diff --git a/jobs/metricsforwarder/spec b/jobs/metricsforwarder/spec
@@ -8,10 +8,6 @@ templates:
   metricsforwarder_server.crt.erb: config/certs/metricsforwarder/server.crt
   metricsforwarder_server.key.erb: config/certs/metricsforwarder/server.key
 
-  healthendpoint_ca.crt.erb: config/certs/healthendpoint/ca.crt
-  healthendpoint.crt.erb: config/certs/healthendpoint/server.crt
-  healthendpoint.key.erb: config/certs/healthendpoint/server.key
-
   metron_client_ca.crt.erb: config/certs/metron_client/ca.crt
   metron_client.crt.erb: config/certs/metron_client/client.crt
   metron_client.key.erb: config/certs/metron_client/client.key
@@ -167,15 +163,6 @@ properties:
     description: "The time interval to refresh cached policies from policy database"
     default: 60s
 
-  autoscaler.metricsforwarder.health.port:
-    description: "The listening port of health endpoint"
-    default: 6403
-  autoscaler.metricsforwarder.health.ca_cert:
-    description: "PEM-encoded CA certificate for the health endpoint"
-  autoscaler.metricsforwarder.health.server_cert:
-    description: "PEM-encoded server certificate for the health endpoint"
-  autoscaler.metricsforwarder.health.server_key:
-    description: "PEM-encoded server key for the health endpoint"
   autoscaler.metricsforwarder.health.username:
     description: "the username of health endpoint"
     default: ''

diff --git a/jobs/metricsforwarder/templates/healthendpoint.crt.erb b/jobs/metricsforwarder/templates/healthendpoint.crt.erb
diff --git a/jobs/metricsforwarder/templates/healthendpoint.key.erb b/jobs/metricsforwarder/templates/healthendpoint.key.erb
diff --git a/jobs/metricsforwarder/templates/healthendpoint_ca.crt.erb b/jobs/metricsforwarder/templates/healthendpoint_ca.crt.erb
diff --git a/jobs/metricsforwarder/templates/metricsforwarder.yml.erb b/jobs/metricsforwarder/templates/metricsforwarder.yml.erb
@@ -91,15 +91,8 @@ cache_ttl: <%= p("autoscaler.metricsforwarder.cache_ttl") %>
 cache_cleanup_interval: <%= p("autoscaler.metricsforwarder.cache_cleanup_interval") %>
 policy_poller_interval: <%= p("autoscaler.metricsforwarder.policy_poller_interval") %>
 health:
-  port:  <%= p("autoscaler.metricsforwarder.health.port") %>
   username: <%= p("autoscaler.metricsforwarder.health.username") %>
   password: <%= p("autoscaler.metricsforwarder.health.password") %>
-  <% if_p("autoscaler.metricsforwarder.health.ca_cert", "autoscaler.metricsforwarder.health.server_cert", "autoscaler.metricsforwarder.health.server_key") do %>
-  tls:
-    ca_file: /var/vcap/jobs/metricsforwarder/config/certs/healthendpoint/ca.crt
-    cert_file: /var/vcap/jobs/metricsforwarder/config/certs/healthendpoint/server.crt
-    key_file: /var/vcap/jobs/metricsforwarder/config/certs/healthendpoint/server.key
-  <% end %>
 
 rate_limit:
   valid_duration: <%= p("autoscaler.metricsforwarder.rate_limit.valid_duration") %>