fix spec for metricforwarder

cloudfoundry · May 15, 2024 · f6ef81b · f6ef81b
1 parent b44c8a0
commit f6ef81b
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/jobs/metricsforwarder/templates/metricsforwarder.yml.erb b/jobs/metricsforwarder/templates/metricsforwarder.yml.erb
@@ -56,15 +56,15 @@ server:
 logging:
   level: <%= p("autoscaler.metricsforwarder.logging.level") %>
 
-<% if if_p("autoscaler.metricsforwarder.syslog.server_address") %>
+
+<% if_p("autoscaler.metricsforwarder.syslog.server_address") do |prop| %>
 syslog:
-  metron_address: <%= p("autoscaler.metricsforwarder.syslog.server_address") %>
-  port: 6067
+  server_address: <%= p("autoscaler.metricsforwarder.syslog.server_address") %>
   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 %>
+    ca_file: /var/vcap/jobs/loggr-syslog-agent/config/certs/loggregator_ca.crt
+<% end.else do %>
 loggregator:
   metron_address: <%= p("autoscaler.metricsforwarder.loggregator.metron_address") %>
   tls:

diff --git a/operations/enable-metricsforwarder-syslog.yml b/operations/enable-metricsforwarder-syslog.yml
@@ -0,0 +1,7 @@
+- type: remove
+  path: /instance_groups/name=metricsforwarder/jobs/name=metricsforwarder/properties/autoscaler/metricsforwarder/loggregator
+
+- type: replace
+  path: /instance_groups/name=metricsforwarder/jobs/name=metricsforwarder/properties/autoscaler/metricsforwarder/syslog?
+  value:
+    server_address: 10.0.1.13
diff --git a/spec/fixtures/metricsforwarder.yml b/spec/fixtures/metricsforwarder.yml
@@ -20,4 +20,4 @@ autoscaler:
     client_id: client_id
     secret: uaa_secret
     uaa_api: https://login.cf.domain/uaa
-    grant_type: ALLOW_ALL
+    grant_type: ALLOW_ALL
diff --git a/spec/jobs/metricsforwarder/metricsforwarder_spec.rb b/spec/jobs/metricsforwarder/metricsforwarder_spec.rb
@@ -12,6 +12,28 @@
   let(:rendered_template) { YAML.safe_load(template.render(properties)) }
 
   context "config/metricsforwarder.yml" do
+    it "supports syslog forwarding" do
+      properties["autoscaler"]["metricsforwarder"] = {
+        "syslog" => {
+          "server_address" => "syslog-server",
+        }
+      }
+
+      expect(rendered_template).to include(
+        {
+          "syslog" => {
+            "server_address" => "syslog-server",
+            "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" => "/var/vcap/jobs/loggr-syslog-agent/config/certs/loggregator_ca.crt",
+            }
+          }
+        }
+      )
+    end
+
+
     it "does not set username nor password if not configured" do
       properties["autoscaler"]["metricsforwarder"] = {
         "health" => {
@@ -42,6 +64,7 @@
         )
     end
 
+
     it "has a cred helper impl by default" do
       expect(rendered_template).to include(
         {