Skip to content

Adds metron properties for communicating with CF ETCD over TLS #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 17, 2016
Merged

Adds metron properties for communicating with CF ETCD over TLS #169

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d513117
Adds metron properties for communicating with CF ETCD over TLS
Jun 13, 2016
2858313
Fixes properties from cf as per Eric's suggestions
Jun 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions manifest-generation/config-from-cf-internal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ config_from_cf:
server_key: (( properties.consul.server_key ))
loggregator:
etcd_machines: (( properties.loggregator.etcd.machines ))
etcd_require_ssl: (( properties.loggregator.etcd.require_ssl))
Copy link
Contributor

@emalm emalm Jun 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Spacing: should be require_ssl )).

etcd_ca_cert: (( properties.loggregator.etcd.ca_cert ))
shared_secret: (( properties.loggregator_endpoint.shared_secret ))
traffic_controller_url: (( "wss://doppler." properties.system_domain ":443" ))
dropsonde_incoming_port: (( properties.loggregator.dropsonde_incoming_port ))
Expand All @@ -34,6 +36,9 @@ config_from_cf:
tls:
client_cert: (( properties.metron_agent.tls.client_cert ))
client_key: (( properties.metron_agent.tls.client_key ))
etcd:
client_cert: (( properties.metron_agent.etcd.client_cert ))
client_key: (( properties.metron_agent.etcd.client_key ))
nats:
user: (( properties.nats.user ))
password: (( properties.nats.password ))
Expand Down Expand Up @@ -69,6 +74,8 @@ properties:
server_key: (( merge ))
loggregator:
etcd:
ca_cert: (( merge || nil ))
Copy link
Contributor

@emalm emalm Jun 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know it's repeated elsewhere, but (( merge || nil )) can just be ~ or null (not nil, though).

require_ssl: (( merge || false ))
Copy link
Contributor

@emalm emalm Jun 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's not duplicate the spec default: flowing a null through is a better practice, so this can just be null.

machines: (( merge ))
dropsonde_incoming_port: (( merge || nil ))
tls:
Expand All @@ -85,6 +92,10 @@ properties:
tls:
client_cert: (( merge ))
client_key: (( merge ))
etcd:
client_cert: (( properties.metron_agent.etcd.client_cert ))
Copy link
Contributor

@emalm emalm Jun 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This reference and the following line seem circular: shouldn't they be null as well?

client_key: (( properties.metron_agent.etcd.client_key ))

nats:
user: (( merge ))
password: (( merge ))
Expand Down
5 changes: 5 additions & 0 deletions manifest-generation/config-from-cf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ config_from_cf:
server_cert: (( merge ))
server_key: (( merge ))
loggregator:
etcd_ca_cert: (( merge ))
etcd_require_ssl: (( merge ))
etcd_machines: (( merge ))
shared_secret: (( merge ))
traffic_controller_url: (( merge ))
Expand All @@ -33,6 +35,9 @@ config_from_cf:
tls:
client_cert: (( merge ))
client_key: (( merge ))
etcd:
client_cert: (( merge ))
client_key: (( merge ))

metron_endpoint:
shared_secret: (( merge ))
Expand Down
5 changes: 5 additions & 0 deletions manifest-generation/diego.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,9 +433,14 @@ properties:
tls:
client_cert: (( config_from_cf.metron_agent.tls.client_cert ))
client_key: (( config_from_cf.metron_agent.tls.client_key ))
etcd:
client_cert: (( config_from_cf.metron_agent.etcd.client_cert ))
client_key: (( config_from_cf.metron_agent.etcd.client_key ))
dropsonde_incoming_port: (( config_from_cf.metron_agent.dropsonde_incoming_port ))
loggregator:
etcd:
require_ssl: (( config_from_cf.loggregator.etcd_require_ssl ))
ca_cert: (( config_from_cf.loggregator.etcd_ca_cert ))
machines: (( config_from_cf.loggregator.etcd_machines ))
dropsonde_incoming_port: (( config_from_cf.loggregator.dropsonde_incoming_port ))
tls:
Expand Down