Skip to content

Commit 9e5b817

Browse files
sethboylesSamze
andauthored
Add app_log_revision property (#442)
This new property enables app logs in the format APP/REV/<version>/PROC/WEB/<process>. We added this property to the following jobs: * cloud_controller_ng * cc_deployment_updater * cloud_controller_clock * cloud_controller_worker We believe cloud_controller_worker does not send desired_lrp actions to diego, however we were not completely sure so we added it just incase. Co-authored-by: Sam Gunaratne <sam.gunaratne@broadcom.com>
1 parent 3acffc9 commit 9e5b817

File tree

7 files changed

+16
-2
lines changed

7 files changed

+16
-2
lines changed

jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,3 +275,5 @@ max_annotations_per_resource: <%= link("cloud_controller_internal").p("cc.max_an
275275
cpu_weight_min_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_min_memory") %>
276276
cpu_weight_max_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_max_memory") %>
277277
custom_metric_tag_prefix_list: <%= link("cloud_controller_internal").p("cc.custom_metric_tag_prefix_list") %>
278+
279+
app_log_revision: <%= link("cloud_controller_internal").p("cc.app_log_revision") %>

jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,3 +358,5 @@ max_annotations_per_resource: <%= link("cloud_controller_internal").p("cc.max_an
358358
cpu_weight_min_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_min_memory") %>
359359
cpu_weight_max_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_max_memory") %>
360360
custom_metric_tag_prefix_list: <%= link("cloud_controller_internal").p("cc.custom_metric_tag_prefix_list") %>
361+
362+
app_log_revision: <%= link("cloud_controller_internal").p("cc.app_log_revision") %>

jobs/cloud_controller_ng/spec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ provides:
225225
- uaa.clients.cc_routing.secret
226226
- cc.experimental.use_puma_webserver
227227
- cc.experimental.use_redis
228+
- cc.app_log_revision
228229

229230
consumes:
230231
- name: database
@@ -800,6 +801,9 @@ properties:
800801
cc.default_app_ssh_access:
801802
default: true
802803
description: "When ssh is allowed and not explicitly set in the application, new applications will start with ssh service enabled"
804+
cc.app_log_revision:
805+
default: false
806+
description: "Add revision version to an app's log source. Only applies if an App is using revisions. For example, app logs will be prefixed with APP/REV/1/PROC/WEB/0"
803807
cc.client_max_body_size:
804808
default: "15M"
805809
description: "Maximum body size for nginx"

jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,8 @@ cc_service_key_client_secret: <%= p("uaa.clients.cc_service_key_client.secret")
431431
allow_app_ssh_access: <%= p("cc.allow_app_ssh_access") %>
432432
default_app_ssh_access: <%= p("cc.default_app_ssh_access") %>
433433

434+
app_log_revision: <%= p("cc.app_log_revision") %>
435+
434436
skip_cert_verify: <%= p("ssl.skip_cert_verify") %>
435437

436438
install_buildpacks: <%= p("cc.install_buildpacks").to_json %>

jobs/cloud_controller_worker/templates/cloud_controller_ng.yml.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,3 +349,5 @@ custom_metric_tag_prefix_list: <%= link("cloud_controller_internal").p("cc.custo
349349
cpu_weight_min_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_min_memory") %>
350350
cpu_weight_max_memory: <%= link("cloud_controller_internal").p("cc.cpu_weight_max_memory") %>
351351
max_manifest_service_binding_poll_duration_in_seconds: <%= p("cc.max_manifest_service_binding_poll_duration_in_seconds") %>
352+
353+
app_log_revision: <%= link("cloud_controller_internal").p("cc.app_log_revision") %>

spec/cloud_controller_clock/cloud_controller_clock_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ module Test
7878
'disable_private_domain_cross_space_context_path_route_sharing' => false,
7979
'cpu_weight_min_memory' => 128,
8080
'cpu_weight_max_memory' => 8192,
81-
'custom_metric_tag_prefix_list' => ['heck.yes.example.com']
81+
'custom_metric_tag_prefix_list' => ['heck.yes.example.com'],
82+
'app_log_revision' => true
8283
}
8384
}
8485
end

spec/cloud_controller_worker/cloud_controller_worker_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ module Test
7979
'custom_metric_tag_prefix_list' => ['heck.yes.example.com'],
8080
'jobs' => {
8181
'enable_dynamic_job_priorities' => false
82-
}
82+
},
83+
'app_log_revision' => true
8384
}
8485
}
8586
end

0 commit comments

Comments
 (0)