Defaults to metrics forwarder syslog on bosh release

cloudfoundry · May 14, 2024 · 73a9cf9 · 73a9cf9
1 parent 39f8b34
commit 73a9cf9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/ci/autoscaler/scripts/deploy-autoscaler.sh b/ci/autoscaler/scripts/deploy-autoscaler.sh
@@ -21,6 +21,7 @@ ops_files=${OPS_FILES:-"${autoscaler_dir}/operations/add-releases.yml\
   ${autoscaler_dir}/operations/remove-metricsgateway.yml\
   ${autoscaler_dir}/operations/remove-postgres-tls.yml\
   ${autoscaler_dir}/operations/enable-log-cache-via-uaa.yml\
+  ${autoscaler_dir}/operations/enable-metricsforwarder-syslog.yml\
   ${autoscaler_dir}/operations/enable-scheduler-logging.yml"}
 
 

diff --git a/jobs/metricsforwarder/spec b/jobs/metricsforwarder/spec
@@ -43,6 +43,9 @@ properties:
   autoscaler.metricsforwarder.server.server_key:
     description: "PEM-encoded server key for the metricsforwarder server"
 
+  autoscaler.metricsforwarder.syslog.server_address:
+    description: "IP address for log cache syslog server"
+
   autoscaler.metricsforwarder.loggregator.metron_address:
     description: "IP address and port where the metron agent is running"
     default: "127.0.0.1:3458"

diff --git a/jobs/metricsforwarder/templates/metricsforwarder.yml.erb b/jobs/metricsforwarder/templates/metricsforwarder.yml.erb
@@ -55,12 +55,24 @@ server:
 
 logging:
   level: <%= p("autoscaler.metricsforwarder.logging.level") %>
+
+<% if_p("autoscaler.metricsforwarder.syslog.server_address") %>
+syslog:
+  metron_address: <%= p("autoscaler.metricsforwarder.syslog.server_address") %>
+  port: 6067
+  tls:
+    key_file: /var/vcap/jobs/loggr-syslog-agent/config/certs/syslog_agent.key
+    cert_file: /var/vcap/jobs/loggr-syslog-agent/config/certs/syslog_agent.crt
+    ca_file: /home/vcap/app/assets/certs/loggr-syslog-agent/loggregator_ca.crt
+<% else %>
 loggregator:
   metron_address: <%= p("autoscaler.metricsforwarder.loggregator.metron_address") %>
   tls:
     key_file: /var/vcap/jobs/metricsforwarder/config/certs/metron_client/client.key
     cert_file: /var/vcap/jobs/metricsforwarder/config/certs/metron_client/client.crt
     ca_file: /var/vcap/jobs/metricsforwarder/config/certs/metron_client/ca.crt
+<% end %>
+
 db:
   policy_db:
     url: <%= policy_db_url %>