Skip to content

Commit 7153cfc

Browse files
committed
remove syslog from cloud controller
1 parent 7b4057f commit 7153cfc

23 files changed

Lines changed: 49 additions & 66 deletions

File tree

jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@
109109

110110
'logging' => {
111111
'file' => '/var/vcap/sys/log/blobstore_benchmark/blobstore_benchmark.log',
112-
'syslog' => 'vcap.cloud_controller_ng',
113112
'level' => benchmark_logging_level.to_s,
114113

115114
'max_retries' => p("cc.logging_max_retries", cc_cfg["logging_max_retries"] || 0),

jobs/cc_deployment_updater/templates/cloud_controller_ng.yml.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ name: <%= name %>
2828

2929
logging:
3030
file: /var/vcap/sys/log/cc_deployment_updater/cc_deployment_updater.log
31-
syslog: vcap.cloud_controller_ng
3231
level: "<%= p("cc.logging_level") %>"
3332
max_retries: <%= p("cc.logging_max_retries") %>
3433
format:

jobs/cc_deployment_updater/templates/pre-start.sh.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
set -ex
44

5-
source /var/vcap/packages/capi_utils/syslog_utils.sh
6-
tee_output_to_sys_log "cc_deployment_updater.$(basename "$0")"
5+
source /var/vcap/packages/capi_utils/output_utils.sh
6+
write_output_with_datetime
77

88
SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
99
source "${SCRIPT_DIR}/ruby_version.sh"

jobs/cloud_controller_clock/templates/cloud_controller_ng.yml.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ name: <%= name %>
134134

135135
logging:
136136
file: /var/vcap/sys/log/cloud_controller_clock/cloud_controller_clock.log
137-
syslog: vcap.cloud_controller_ng
138137
level: "<%= p("cc.logging_level") %>"
139138
max_retries: <%= p("cc.logging_max_retries") %>
140139
format:

jobs/cloud_controller_clock/templates/pre-start.sh.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ chpst -u vcap:vcap chmod -R go-w $BUNDLER_DIR
1212
SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
1313
source "${SCRIPT_DIR}/ruby_version.sh"
1414

15-
source /var/vcap/packages/capi_utils/syslog_utils.sh
16-
tee_output_to_sys_log "cloud_controller_clock.$(basename "$0")"
15+
source /var/vcap/packages/capi_utils/output_utils.sh
16+
write_output_with_datetime
1717

1818
function setup_directories {
1919
RUN_DIR="/var/vcap/sys/run/cloud_controller_clock"

jobs/cloud_controller_ng/spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ properties:
978978
description: "NewRelic's SQL statement recording mode: [off | obfuscated | raw]"
979979

980980
cc.nginx_access_log_destination:
981-
description: "The nginx access log destination. This can be used to route access logs to a file, syslog, or a memory buffer."
981+
description: "The nginx access log destination. This can be used to route access logs to a file, or a memory buffer."
982982
default: "/var/vcap/sys/log/nginx_cc/nginx.access.log"
983983
cc.nginx_access_log_format:
984984
description: "The nginx log format string to use when writing to the access log."
@@ -989,7 +989,7 @@ properties:
989989
description: "The characters escaping used for logging variables: [default | json]"
990990
default: default
991991
cc.nginx_error_log_destination:
992-
description: "The nginx error log destination. This can be used to route error logs to a file, syslog, or a memory buffer."
992+
description: "The nginx error log destination. This can be used to route error logs to a file, or a memory buffer."
993993
default: "/var/vcap/sys/log/nginx_cc/nginx.error.log"
994994
cc.nginx_error_log_level:
995995
description: "The lowest severity nginx log level to capture in the error log."

jobs/cloud_controller_ng/templates/cloud_controller_ng.yml.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ directories:
162162

163163
logging:
164164
file: /var/vcap/sys/log/cloud_controller_ng/cloud_controller_ng.log
165-
syslog: vcap.cloud_controller_ng
166165
level: "<%= p("cc.logging_level") %>"
167166
max_retries: <%= p("cc.logging_max_retries") %>
168167
anonymize_ips: <%= p("cc.logging_anonymize_ips") %>

jobs/cloud_controller_ng/templates/nginx.conf.erb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ daemon off;
22

33
pid /var/vcap/data/cloud_controller_ng/nginx.pid;
44
error_log /var/vcap/sys/log/cloud_controller_ng/nginx-error.log <%= p("cc.nginx_error_log_level") %>;
5-
error_log syslog:server=127.0.0.1,severity=error,tag=vcap_nginx_error <%= p("cc.nginx_error_log_level") %>;
65

76
worker_processes auto;
87

@@ -19,7 +18,6 @@ http {
1918
log_format main escape=<%= p("cc.nginx_access_log_escaping") %> '<%= p("cc.nginx_access_log_format").chomp %>';
2019

2120
access_log /var/vcap/sys/log/cloud_controller_ng/nginx-access.log main;
22-
access_log syslog:server=127.0.0.1,severity=info,tag=vcap_nginx_access main;
2321

2422
proxy_hide_header X-USER-GUID; #user guid header should not be forwarded to client
2523

jobs/cloud_controller_ng/templates/nginx_external_endpoints.conf.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ location /internal/v5/ {
1010
# proxy and log all CC traffic
1111
location / {
1212
access_log /var/vcap/sys/log/cloud_controller_ng/nginx-access.log main;
13-
access_log syslog:server=127.0.0.1,severity=info,tag=vcap_nginx_access main;
1413
proxy_buffering off;
1514
proxy_set_header Host $host;
1615
proxy_set_header X-Real_IP $remote_addr;

jobs/cloud_controller_ng/templates/nginx_maintenance.conf.erb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ daemon off;
44
pid /var/vcap/data/cloud_controller_ng/nginx_maintenance.pid;
55

66
error_log /var/vcap/sys/log/cloud_controller_ng/nginx-maintenance-error.log <%= p("cc.nginx_error_log_level") %>;
7-
error_log syslog:server=127.0.0.1,severity=error,tag=vcap_nginx_error <%= p("cc.nginx_error_log_level") %>;
87

98
worker_processes auto;
109

@@ -26,7 +25,6 @@ http {
2625

2726
log_format main '<%= p("cc.nginx_access_log_format").chomp %>';
2827
access_log /var/vcap/sys/log/cloud_controller_ng/nginx-maintenence-access.log main;
29-
access_log syslog:server=127.0.0.1,severity=info,tag=vcap_nginx_access main;
3028

3129
# This block ensures the endpoints it serves are handled by mutual TLS.
3230
# Refer to the 'return 403' statement in the http block to see how we secure those endpoints.

0 commit comments

Comments
 (0)