Log Traffic Server logs to /var/log/trafficserver

zrhoffman · Apr 2, 2024 · 33fcd88 · 33fcd88
1 parent f816372
commit 33fcd88
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,7 +15,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - [#7832](https://github.com/apache/trafficcontrol/pull/7832) *t3c* Removed perl dependency
 - Updated the CacheGroups Traffic Portal page to use a more performant AG-Grid-based table.
 - Updated Go version to 1.22.0
-- [#7979](https://github.com/apache/trafficcontrol/pull/7979) *Traffic Router*, *Traffic Monitor*: Store logs in /var/log
+- [#7979](https://github.com/apache/trafficcontrol/pull/7979) *Traffic Router*, *Traffic Monitor*, *Traffic Server*: Store logs in /var/log
 
 ### Fixed
 - [#7957](https://github.com/apache/trafficcontrol/pull/7957) *Traffic Ops* Fix the incorrect display of delivery services assigned to ORG servers.

diff --git a/cache-config/testing/docker/trafficserver/trafficserver.spec b/cache-config/testing/docker/trafficserver/trafficserver.spec
@@ -134,8 +134,8 @@ fi
 /opt/trafficserver/share
 %dir /opt/trafficserver/var
 %attr(-,ats,ats) /opt/trafficserver/var/trafficserver
-%dir /opt/trafficserver/var/log
-%attr(-,ats,ats) /opt/trafficserver/var/log/trafficserver
+%dir /var/log/trafficserver
+%attr(-,ats,ats) /var/log/trafficserver
 %dir /opt/trafficserver/etc
 %attr(-,ats,ats) %dir /opt/trafficserver/etc/trafficserver
 %attr(-,ats,ats) %dir /opt/trafficserver/etc/trafficserver/snapshots

diff --git a/cache-config/testing/ort-tests/baseline-configs/records.config b/cache-config/testing/ort-tests/baseline-configs/records.config
@@ -14,7 +14,7 @@ CONFIG proxy.config.http.parent_proxy_routing_enable INT 1
 CONFIG proxy.config.http.server_ports STRING 8080 8080:ipv6
 CONFIG proxy.config.http.slow.log.threshold INT 10000
 CONFIG proxy.config.http.transaction_active_timeout_in INT 0
-CONFIG proxy.config.log.logfile_dir STRING /opt/trafficserver/var/log/trafficserver
+CONFIG proxy.config.log.logfile_dir STRING /var/log/trafficserver
 CONFIG proxy.config.log.max_space_mb_for_logs INT 512
 CONFIG proxy.config.log.max_space_mb_headroom INT 50
 CONFIG proxy.config.proxy_name STRING atlanta-edge-03.ga.atlanta.kabletown.net

diff --git a/cache-config/testing/ort-tests/tc-fixtures.json b/cache-config/testing/ort-tests/tc-fixtures.json
@@ -1617,7 +1617,7 @@
           "configFile": "records.config",
           "name": "CONFIG proxy.config.log.logfile_dir",
           "secure": false,
-          "value": "STRING /opt/trafficserver/var/log/trafficserver"
+          "value": "STRING /var/log/trafficserver"
         },
         {
           "configFile": "records.config",
@@ -2013,7 +2013,7 @@
           "configFile": "records.config",
           "name": "CONFIG proxy.config.log.logfile_dir",
           "secure": false,
-          "value": "STRING /opt/trafficserver/var/log/trafficserver"
+          "value": "STRING /var/log/trafficserver"
         },
         {
           "configFile": "records.config",

diff --git a/grove/build/grove.logrotate b/grove/build/grove.logrotate
@@ -45,7 +45,7 @@
         copytruncate
 }
 
-/opt/trafficserver/var/log/trafficserver/custom_ats_2.log {
+/var/log/trafficserver/custom_ats_2.log {
         hourly
         dateext
         dateformat -%Y%m%d%H

diff --git a/grove/docker/docker-entrypoint.sh b/grove/docker/docker-entrypoint.sh
@@ -46,7 +46,7 @@ init() {
   "log_location_warning": "/var/log/grove/error.log",
   "log_location_info":    "null",
   "log_location_debug":   "null",
-  "log_location_event":   "/opt/trafficserver/var/log/trafficserver/custom_ats_2.log",
+  "log_location_event":   "/var/log/trafficserver/custom_ats_2.log",
 
   "parent_request_timeout_ms":                 10000,
   "parent_request_keep_alive_ms":              10000,
@@ -63,7 +63,7 @@ ENDOFMESSAGE
 	if [[ ! -z $REMAP_PATH ]]; then
     cp $REMAP_PATH /etc/grove/remap.json
   fi
-	mkdir -p /opt/trafficserver/var/log/trafficserver
+	mkdir -p /var/log/trafficserver
 	mkdir -p /var/log/grove/
 	touch /var/log/grove/error.log
 

diff --git a/grove/grovetccfg/grove_profile.traffic_ops b/grove/grovetccfg/grove_profile.traffic_ops
@@ -82,7 +82,7 @@
       "config_file": "grove.cfg"
     },
     {
-      "value": "/opt/trafficserver/var/log/trafficserver/custom_ats_2.log",
+      "value": "/var/log/trafficserver/custom_ats_2.log",
       "name": "log_location_event",
       "config_file": "grove.cfg"
     },

diff --git a/infrastructure/ansible/roles/dataset_loader/defaults/main.yml b/infrastructure/ansible/roles/dataset_loader/defaults/main.yml
@@ -1626,7 +1626,7 @@ dl_ds_default_profile_cdntemplates:
         value: "/var/log/grove/error.log"
       - name: log_location_event
         configFile: grove.cfg
-        value: "/opt/trafficserver/var/log/trafficserver/custom_ats_2.log"
+        value: "/var/log/trafficserver/custom_ats_2.log"
       - name: log_location_info
         configFile: grove.cfg
         value: 'null'

diff --git a/infrastructure/ansible/roles/grove/defaults/main.yml b/infrastructure/ansible/roles/grove/defaults/main.yml
@@ -34,7 +34,7 @@ grovetccfg_crontab:
     job:  "/usr/sbin/grovetccfg -certdir {{ grove_certdir }} -host {{ ansible_hostname }} -insecure -pretty -tourl {{ grovetccfg_traffic_ops_url }} -touser {{ grovetccfg_traffic_ops_username }} -topass '{{ grovetccfg_traffic_ops_password }}' > /tmp/grovetccfg.log 2>&1"
 
 # Grove configuration
-grove_custom_ats2_path: "/opt/trafficserver/var/log/trafficserver/custom_ats_2.log"
+grove_custom_ats2_path: "/var/log/trafficserver/custom_ats_2.log"
 grove_ssl_cert_path: "{{ grove_config_dir }}/certs/cert.pem"
 grove_ssl_key_path: "{{ grove_config_dir }}/certs/key.pem"
 grove_remap_file_path: "{{ grove_config_dir }}/remap.json"

diff --git a/traffic_server/_tsb/trafficserver.spec b/traffic_server/_tsb/trafficserver.spec
@@ -127,8 +127,8 @@ fi
 /opt/trafficserver/share
 %dir /opt/trafficserver/var
 %attr(-,ats,ats) /opt/trafficserver/var/trafficserver
-%dir /opt/trafficserver/var/log
-%attr(-,ats,ats) /opt/trafficserver/var/log/trafficserver
+%dir /var/log/trafficserver
+%attr(-,ats,ats) /var/log/trafficserver
 %dir /opt/trafficserver/etc
 %attr(-,ats,ats) %dir /opt/trafficserver/etc/trafficserver
 %attr(-,ats,ats) %dir /opt/trafficserver/etc/trafficserver/snapshots

diff --git a/traffic_server/spec/trafficserver.spec b/traffic_server/spec/trafficserver.spec
@@ -89,8 +89,8 @@ fi
 /opt/trafficserver/share
 %dir /opt/trafficserver/var
 %attr(-,ats,ats) /opt/trafficserver/var/trafficserver
-%dir /opt/trafficserver/var/log
-%attr(-,ats,ats) /opt/trafficserver/var/log/trafficserver
+%dir /var/log/trafficserver
+%attr(-,ats,ats) /var/log/trafficserver
 %dir /opt/trafficserver/etc
 %attr(-,ats,ats) %dir /opt/trafficserver/etc/trafficserver
 %attr(-,ats,ats) %dir /opt/trafficserver/etc/trafficserver/snapshots