diff --git a/jobs/loggregator_trafficcontroller/spec b/jobs/loggregator_trafficcontroller/spec index e92f1389f..54e25b958 100644 --- a/jobs/loggregator_trafficcontroller/spec +++ b/jobs/loggregator_trafficcontroller/spec @@ -76,9 +76,6 @@ properties: metron_endpoint.host: description: "The host used to emit messages to the Metron agent" default: "127.0.0.1" - metron_endpoint.dropsonde_port: - description: "The port used to emit dropsonde messages to the Metron agent" - default: 3457 metron_endpoint.grpc_port: description: "The port used to emit grpc messages to the Metron agent" default: 3458 diff --git a/jobs/loggregator_trafficcontroller/templates/bpm.yml.erb b/jobs/loggregator_trafficcontroller/templates/bpm.yml.erb index 5edcdb606..81f4fd0dd 100644 --- a/jobs/loggregator_trafficcontroller/templates/bpm.yml.erb +++ b/jobs/loggregator_trafficcontroller/templates/bpm.yml.erb @@ -21,7 +21,6 @@ processes: - name: loggregator_trafficcontroller executable: /var/vcap/packages/loggregator_trafficcontroller/trafficcontroller env: - AGENT_UDP_ADDRESS: "<%= p('metron_endpoint.host').to_s + ":" + p('metron_endpoint.dropsonde_port').to_s %>" AGENT_GRPC_ADDRESS: "<%= p('metron_endpoint.host').to_s + ":" + p('metron_endpoint.grpc_port').to_s %>" ROUTER_ADDRS: "<%= router_addrs.join(",") %>" diff --git a/src/testservers/traffic_controller.go b/src/testservers/traffic_controller.go index 2a038eff7..7e30eed88 100644 --- a/src/testservers/traffic_controller.go +++ b/src/testservers/traffic_controller.go @@ -36,7 +36,7 @@ func BuildTrafficControllerConf(routerAddr string, agentPort int) tcConf.Config ServerName: "cloud-controller", }, Agent: tcConf.Agent{ - UDPAddress: fmt.Sprintf("localhost:%d", agentPort), + GRPCAddress: fmt.Sprintf("localhost:%d", agentPort), }, GRPC: tcConf.GRPC{ CertFile: LoggregatorTestCerts.Cert("trafficcontroller"), diff --git a/src/trafficcontroller/app/config.go b/src/trafficcontroller/app/config.go index 50de1944e..cf9c4ca7d 100644 --- a/src/trafficcontroller/app/config.go +++ b/src/trafficcontroller/app/config.go @@ -10,7 +10,6 @@ import ( // Agent stores configuration for communication to a logging/metric agent. type Agent struct { - UDPAddress string `env:"AGENT_UDP_ADDRESS"` GRPCAddress string `env:"AGENT_GRPC_ADDRESS"` }