Remove old property: loggregator.use_v2_api - Diego release

docs/070-tls-configuration.md

@@ -63,7 +63,6 @@ supports the loggregator V2 API which uses gRPC and supports TLS.
 In order to enable the loggregator V2 API you need to set the following
 properties:
 
- * `loggregator.use_v2_api`: Set this to true
  * `loggregator.v2_api_port`: Set this to the loggregator gRPC port
    (`metron_agent.grpc_port`), this property has a default value that matches
    the default value of `metron`'s

jobs/auctioneer/spec

@@ -89,9 +89,6 @@ properties:
     description: "Timeout in seconds to receive a response to the keepalive ping. If a response is not received within this time, the locket client will reconnect to another server."
     default: 22
 
-  loggregator.use_v2_api:
-    description: "True to use local metron agent gRPC v2 API. False to use UDP v1 API."
-    default: false
   loggregator.v2_api_port:
     description: "Local metron agent gRPC port"
     default: 3458

jobs/auctioneer/templates/auctioneer.json.erb

@@ -78,20 +78,17 @@
   end
 
   config[:loggregator]={}
-  config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api")
-  if p("loggregator.use_v2_api") == true
-    config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
-    config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
-    config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
-    config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
-    config[:loggregator][:loggregator_job_deployment] = spec.deployment
-    config[:loggregator][:loggregator_job_name] = spec.name
-    config[:loggregator][:loggregator_job_index] = spec.id
-    config[:loggregator][:loggregator_job_ip] = spec.address
-    config[:loggregator][:loggregator_job_origin] = "auctioneer"
-    config[:loggregator][:loggregator_source_id] = "auctioneer"
-    config[:loggregator][:loggregator_instance_id] = spec.id
-  end
+  config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
+  config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
+  config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
+  config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
+  config[:loggregator][:loggregator_job_deployment] = spec.deployment
+  config[:loggregator][:loggregator_job_name] = spec.name
+  config[:loggregator][:loggregator_job_index] = spec.id
+  config[:loggregator][:loggregator_job_ip] = spec.address
+  config[:loggregator][:loggregator_job_origin] = "auctioneer"
+  config[:loggregator][:loggregator_source_id] = "auctioneer"
+  config[:loggregator][:loggregator_instance_id] = spec.id
 
   config.to_json
 %>

jobs/bbs/spec

@@ -166,10 +166,7 @@ properties:
   cell_registrations.locket.enabled:
     description: When set, the BBS will detect Diego cells registered with the Locket API.
     default: true
-
-  loggregator.use_v2_api:
-    description: "True to use local metron agent gRPC v2 API. False to use UDP v1 API."
-    default: false
+
   loggregator.v2_api_port:
     description: "Local metron agent gRPC port"
     default: 3458

jobs/bbs/templates/bbs.json.erb

@@ -173,20 +173,17 @@
   end
 
   config[:loggregator]={}
-  config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api")
-  if p("loggregator.use_v2_api") == true
-    config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
-    config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
-    config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
-    config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
-    config[:loggregator][:loggregator_job_deployment] = spec.deployment
-    config[:loggregator][:loggregator_job_name] = spec.name
-    config[:loggregator][:loggregator_job_index] = spec.id
-    config[:loggregator][:loggregator_job_ip] = spec.address
-    config[:loggregator][:loggregator_job_origin] = "bbs"
-    config[:loggregator][:loggregator_source_id] = "bbs"
-    config[:loggregator][:loggregator_instance_id] = spec.id
-  end
+  config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
+  config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
+  config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
+  config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
+  config[:loggregator][:loggregator_job_deployment] = spec.deployment
+  config[:loggregator][:loggregator_job_name] = spec.name
+  config[:loggregator][:loggregator_job_index] = spec.id
+  config[:loggregator][:loggregator_job_ip] = spec.address
+  config[:loggregator][:loggregator_job_origin] = "bbs"
+  config[:loggregator][:loggregator_source_id] = "bbs"
+  config[:loggregator][:loggregator_instance_id] = spec.id
 
   # Validate diego.bbs.metrics.advanced_metrics
   if_p("diego.bbs.metrics.advanced_metrics.enabled") do |value|

jobs/file_server/spec

@@ -57,9 +57,6 @@ properties:
   tls.key:
     description: "PEM-encoded tls key"
 
-  loggregator.use_v2_api:
-    description: "Whether component should use the v2 loggregator API when sending data to the metron agent instead of the 'legacy' v1 API."
-    default: false
   loggregator.v2_api_port:
     description: "Port which the component should use to communicate to the metron agent's v2 API (host is assumed to be `localhost`)."
     default: 3458

jobs/file_server/templates/file_server.json.erb

@@ -39,20 +39,18 @@
 
   config[:time_format] = "rfc3339"
   config[:loggregator]={}
-  config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api")
-  if p("loggregator.use_v2_api") == true
-    config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
-    config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
-    config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
-    config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
-    config[:loggregator][:loggregator_job_deployment] = spec.deployment
-    config[:loggregator][:loggregator_job_name] = spec.name
-    config[:loggregator][:loggregator_job_index] = spec.id
-    config[:loggregator][:loggregator_job_ip] = spec.address
-    config[:loggregator][:loggregator_job_origin] = "file_server"
-    config[:loggregator][:loggregator_source_id] = "file_server"
-    config[:loggregator][:loggregator_instance_id] = spec.id
-  end
+  config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
+  config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
+  config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
+  config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
+  config[:loggregator][:loggregator_job_deployment] = spec.deployment
+  config[:loggregator][:loggregator_job_name] = spec.name
+  config[:loggregator][:loggregator_job_index] = spec.id
+  config[:loggregator][:loggregator_job_ip] = spec.address
+  config[:loggregator][:loggregator_job_origin] = "file_server"
+  config[:loggregator][:loggregator_source_id] = "file_server"
+  config[:loggregator][:loggregator_instance_id] = spec.id
+
 
   config.to_json
 %>

jobs/locket/spec

@@ -64,9 +64,6 @@ properties:
   diego.locket.sql.ca_cert:
     description: "Bundle of CA certificates for the Locket to verify the SQL server SSL certificate when connecting via SSL"
 
-  loggregator.use_v2_api:
-    description: "True to use local metron agent gRPC v2 API. False to use UDP v1 API."
-    default: false
   loggregator.v2_api_port:
     description: "Local metron agent gRPC port"
     default: 3458

jobs/locket/templates/locket.json.erb

@@ -68,20 +68,17 @@ end
 
 config[:time_format] = "rfc3339"
 config[:loggregator]={}
-config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api")
-if p("loggregator.use_v2_api") == true
-  config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
-  config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
-  config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
-  config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
-  config[:loggregator][:loggregator_job_deployment] = spec.deployment
-  config[:loggregator][:loggregator_job_name] = spec.name
-  config[:loggregator][:loggregator_job_index] = spec.id
-  config[:loggregator][:loggregator_job_ip] = spec.address
-  config[:loggregator][:loggregator_job_origin] = "locket"
-  config[:loggregator][:loggregator_source_id] = "locket"
-  config[:loggregator][:loggregator_instance_id] = spec.id
-end
+config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
+config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
+config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
+config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
+config[:loggregator][:loggregator_job_deployment] = spec.deployment
+config[:loggregator][:loggregator_job_name] = spec.name
+config[:loggregator][:loggregator_job_index] = spec.id
+config[:loggregator][:loggregator_job_ip] = spec.address
+config[:loggregator][:loggregator_job_origin] = "locket"
+config[:loggregator][:loggregator_source_id] = "locket"
+config[:loggregator][:loggregator_instance_id] = spec.id
 
 config.to_json
 %>

jobs/rep/spec

@@ -71,9 +71,6 @@ properties:
     description: "Array of optional tags used for scheduling Tasks and LRPs"
     default: []
 
-  loggregator.use_v2_api:
-    description: "True to use local metron agent gRPC v2 API. False to use UDP v1 API."
-    default: false
   loggregator.v2_api_port:
     description: "Local metron agent gRPC port"
     default: 3458

jobs/rep/templates/rep.json.erb

@@ -223,21 +223,18 @@
   end
 
   config[:loggregator]={}
-  config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api")
-  if p("loggregator.use_v2_api")
-    config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
-    config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
-    config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
-    config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
-    config[:loggregator][:loggregator_job_deployment] = spec.deployment
-    config[:loggregator][:loggregator_job_name] = spec.name
-    config[:loggregator][:loggregator_job_index] = spec.id
-    config[:loggregator][:loggregator_job_ip] = spec.address
-    config[:loggregator][:loggregator_job_origin] = "rep"
-    config[:loggregator][:loggregator_source_id] = "rep"
-    config[:loggregator][:loggregator_instance_id] = spec.id
-    config[:loggregator][:loggregator_app_metric_exclusion_filter] = p("loggregator.app_metric_exclusion_filter")
-  end
+  config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
+  config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
+  config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
+  config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
+  config[:loggregator][:loggregator_job_deployment] = spec.deployment
+  config[:loggregator][:loggregator_job_name] = spec.name
+  config[:loggregator][:loggregator_job_index] = spec.id
+  config[:loggregator][:loggregator_job_ip] = spec.address
+  config[:loggregator][:loggregator_job_origin] = "rep"
+  config[:loggregator][:loggregator_source_id] = "rep"
+  config[:loggregator][:loggregator_instance_id] = spec.id
+  config[:loggregator][:loggregator_app_metric_exclusion_filter] = p("loggregator.app_metric_exclusion_filter")
 
   config.to_json
 %>

jobs/rep_windows/spec

@@ -65,9 +65,6 @@ properties:
     description: "Length in bytes above which logged strings will be truncated. If set to 0, turns off truncation."
     default: 640
 
-  loggregator.use_v2_api:
-    description: "True to use local metron agent gRPC v2 API. False to use UDP v1 API."
-    default: false
   loggregator.v2_api_port:
     description: "Local metron agent gRPC port"
     default: 3458

jobs/rep_windows/templates/rep.json.erb

@@ -223,21 +223,18 @@
   end
 
   config[:loggregator]={}
-  config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api")
-  if p("loggregator.use_v2_api")
-    config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
-    config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
-    config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
-    config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
-    config[:loggregator][:loggregator_job_deployment] = spec.deployment
-    config[:loggregator][:loggregator_job_name] = spec.name
-    config[:loggregator][:loggregator_job_index] = spec.id
-    config[:loggregator][:loggregator_job_ip] = spec.address
-    config[:loggregator][:loggregator_job_origin] = "rep"
-    config[:loggregator][:loggregator_source_id] = "rep"
-    config[:loggregator][:loggregator_instance_id] = spec.id
-    config[:loggregator][:loggregator_app_metric_exclusion_filter] = p("loggregator.app_metric_exclusion_filter")
-  end
+  config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
+  config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
+  config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
+  config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
+  config[:loggregator][:loggregator_job_deployment] = spec.deployment
+  config[:loggregator][:loggregator_job_name] = spec.name
+  config[:loggregator][:loggregator_job_index] = spec.id
+  config[:loggregator][:loggregator_job_ip] = spec.address
+  config[:loggregator][:loggregator_job_origin] = "rep"
+  config[:loggregator][:loggregator_source_id] = "rep"
+  config[:loggregator][:loggregator_instance_id] = spec.id
+  config[:loggregator][:loggregator_app_metric_exclusion_filter] = p("loggregator.app_metric_exclusion_filter")
 
   config.to_json
 %>

jobs/route_emitter/spec

@@ -134,9 +134,6 @@ properties:
     default: false
   uaa.ca_cert:
     description: "UAA ca certificate"
-  loggregator.use_v2_api:
-    description: "True to use local metron agent gRPC v2 API. False to use UDP v1 API."
-    default: false
   loggregator.v2_api_port:
     description: "Local metron agent gRPC port"
     default: 3458

jobs/route_emitter/templates/route_emitter.json.erb

@@ -160,20 +160,17 @@
   end
 
   config[:loggregator]={}
-  config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api")
-  if p("loggregator.use_v2_api") == true
-    config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
-    config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
-    config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
-    config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
-    config[:loggregator][:loggregator_job_deployment] = spec.deployment
-    config[:loggregator][:loggregator_job_name] = spec.name
-    config[:loggregator][:loggregator_job_index] = spec.id
-    config[:loggregator][:loggregator_job_ip] = spec.address
-    config[:loggregator][:loggregator_job_origin] = "route_emitter"
-    config[:loggregator][:loggregator_source_id] = "route_emitter"
-    config[:loggregator][:loggregator_instance_id] = spec.id
-  end
+  config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
+  config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
+  config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
+  config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
+  config[:loggregator][:loggregator_job_deployment] = spec.deployment
+  config[:loggregator][:loggregator_job_name] = spec.name
+  config[:loggregator][:loggregator_job_index] = spec.id
+  config[:loggregator][:loggregator_job_ip] = spec.address
+  config[:loggregator][:loggregator_job_origin] = "route_emitter"
+  config[:loggregator][:loggregator_source_id] = "route_emitter"
+  config[:loggregator][:loggregator_instance_id] = spec.id
 
   config.to_json
 %>

jobs/route_emitter_windows/spec

@@ -137,9 +137,6 @@ properties:
     default: false
   uaa.ca_cert:
     description: "UAA ca certificate"
-  loggregator.use_v2_api:
-    description: "True to use local metron agent gRPC v2 API. False to use UDP v1 API."
-    default: false
   loggregator.v2_api_port:
     description: "Local metron agent gRPC port"
     default: 3458

jobs/route_emitter_windows/templates/route_emitter.json.erb

@@ -159,20 +159,17 @@
   end
 
   config[:loggregator]={}
-  config[:loggregator][:loggregator_use_v2_api] = p("loggregator.use_v2_api")
-  if p("loggregator.use_v2_api") == true
-    config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
-    config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
-    config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
-    config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
-    config[:loggregator][:loggregator_job_deployment] = spec.deployment
-    config[:loggregator][:loggregator_job_name] = spec.name
-    config[:loggregator][:loggregator_job_index] = spec.id
-    config[:loggregator][:loggregator_job_ip] = spec.address
-    config[:loggregator][:loggregator_job_origin] = "route_emitter"
-    config[:loggregator][:loggregator_source_id] = "route_emitter"
-    config[:loggregator][:loggregator_instance_id] = spec.id
-  end
+  config[:loggregator][:loggregator_api_port] = p("loggregator.v2_api_port")
+  config[:loggregator][:loggregator_ca_path] = "#{conf_dir}/certs/loggregator/ca.crt"
+  config[:loggregator][:loggregator_cert_path] = "#{conf_dir}/certs/loggregator/client.crt"
+  config[:loggregator][:loggregator_key_path] = "#{conf_dir}/certs/loggregator/client.key"
+  config[:loggregator][:loggregator_job_deployment] = spec.deployment
+  config[:loggregator][:loggregator_job_name] = spec.name
+  config[:loggregator][:loggregator_job_index] = spec.id
+  config[:loggregator][:loggregator_job_ip] = spec.address
+  config[:loggregator][:loggregator_job_origin] = "route_emitter"
+  config[:loggregator][:loggregator_source_id] = "route_emitter"
+  config[:loggregator][:loggregator_instance_id] = spec.id
 
   config.to_json
 %>

jobs/ssh_proxy/spec

@@ -116,9 +116,6 @@ properties:
     description: "Connect directly to container IP instead of to the host IP and external port. Suitable only for deployments in which the gorouters and TCP routers can route directly to the container IP of instances."
     default: false
 
-  loggregator.use_v2_api:
-    description: "True to use local metron agent gRPC v2 API. False to use UDP v1 API."
-    default: false
   loggregator.v2_api_port:
     description: "Local metron agent gRPC port"
     default: 3458