Skip to content

Commit 9415ab0

Browse files
Add host property to the relevant jobs
Co-authored-by: Jan von Loewenstein <[email protected]>
1 parent 2d82cbd commit 9415ab0

File tree

14 files changed

+28
-0
lines changed

14 files changed

+28
-0
lines changed

jobs/loggr-forwarder-agent-windows/monit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"executable" => "/var/vcap/packages/forwarder-agent-windows/forwarder-agent.exe",
1818
"args" => [],
1919
"env" => {
20+
"AGENT_HOST" => "#{p("host")}",
2021
"AGENT_PORT" => "#{p("port")}",
2122
"AGENT_CA_FILE_PATH" => "#{certs_dir}/loggregator_ca.crt",
2223
"AGENT_CERT_FILE_PATH" => "#{certs_dir}/forwarder.crt",

jobs/loggr-forwarder-agent-windows/spec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ packages:
1515
- forwarder-agent-windows
1616

1717
properties:
18+
host:
19+
description: "Host the agent is serving gRPC via mTLS"
20+
default: "127.0.0.1"
1821
port:
1922
description: "Port the agent is serving gRPC via mTLS"
2023
default: 3458

jobs/loggr-forwarder-agent/spec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ packages:
1515
- forwarder-agent
1616

1717
properties:
18+
host:
19+
description: "Host the agent is serving gRPC via mTLS"
20+
default: "127.0.0.1"
1821
port:
1922
description: "Port the agent is serving gRPC via mTLS"
2023
default: 3458

jobs/loggr-forwarder-agent/templates/bpm.yml.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
],
2222
},
2323
"env" => {
24+
"AGENT_HOST" => "#{p("host")}",
2425
"AGENT_PORT" => "#{p("port")}",
2526
"AGENT_CA_FILE_PATH" => "#{certs_dir}/loggregator_ca.crt",
2627
"AGENT_CERT_FILE_PATH" => "#{certs_dir}/forwarder.crt",

jobs/loggr-syslog-agent-windows/monit

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"AGENT_CERT_FILE_PATH" => "#{certs_dir}/syslog_agent.crt",
3333
"AGENT_KEY_FILE_PATH" => "#{certs_dir}/syslog_agent.key",
3434
"AGENT_CIPHER_SUITES" => p("tls.cipher_suites").split(":").join(","),
35+
"AGENT_HOST" => "#{p("host")}",
3536
"AGENT_PORT" => "#{p("port")}",
3637

3738
"DRAIN_SKIP_CERT_VERIFY" => "#{p("drain_skip_cert_verify")}",

jobs/loggr-syslog-agent-windows/spec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ properties:
3535
description: Whether metadata is included in structured data by default
3636
default: true
3737

38+
host:
39+
description: "Host the agent is serving gRPC via mTLS"
40+
default: "127.0.0.1"
3841
port:
3942
description: "Port the agent is serving gRPC via mTLS"
4043
default: 3458

jobs/loggr-syslog-agent/spec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ properties:
3232
binding_cache_override_url:
3333
description: URL to use if required to override the default bosh-dns binding cache address
3434

35+
host:
36+
description: "Host the agent is serving gRPC via mTLS"
37+
default: "127.0.0.1"
3538
port:
3639
description: "Port the agent is serving gRPC via mTLS"
3740
default: 3458

jobs/loggr-syslog-agent/templates/bpm.yml.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"AGENT_CERT_FILE_PATH" => "#{certs_dir}/syslog_agent.crt",
2424
"AGENT_KEY_FILE_PATH" => "#{certs_dir}/syslog_agent.key",
2525
"AGENT_CIPHER_SUITES" => "#{p("tls.cipher_suites").split(":").join(",")}",
26+
"AGENT_HOST" => "#{p("host")}",
2627
"AGENT_PORT" => "#{p("port")}",
2728
"DRAIN_SKIP_CERT_VERIFY" => "#{p("drain_skip_cert_verify")}",
2829
"DEFAULT_DRAIN_METADATA" => "#{p("default_drain_metadata")}",

jobs/loggr-udp-forwarder/spec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ properties:
3333
description: |
3434
The gRPC port to forward the converted v2 envelopes to.
3535
default: 3458
36+
host:
37+
description: "Host the agent uses to listen for incoming v1 (dropsonde) envelopes via UDP"
38+
default: "127.0.0.1"
3639
udp_port:
3740
description: |
3841
The port to listen for incoming v1 (dropsonde) envelopes via UDP.

jobs/loggr-udp-forwarder/templates/bpm.yml.erb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"LOGGREGATOR_AGENT_CERT_FILE_PATH" => "#{certs_dir}/loggregator_agent.crt",
1414
"LOGGREGATOR_AGENT_KEY_FILE_PATH" => "#{certs_dir}/loggregator_agent.key",
1515
"LOGGREGATOR_AGENT_ADDR" => "localhost:#{p('loggregator.ingress_port')}",
16+
"AGENT_HOST" => "#{p('host')}",
1617
"UDP_PORT" => "#{p('udp_port')}",
1718
"DEPLOYMENT" => "#{deployment}",
1819
"JOB" => "#{job_name}",

0 commit comments

Comments
 (0)