diff --git a/CHANGELOG.md b/CHANGELOG.md index 26d91786b8..cbaf2bb364 100644 --- 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*, *Traffic Server*: Store logs in /var/log +- [#7979](https://github.com/apache/trafficcontrol/pull/7979) *Traffic Router*, *Traffic Monitor*, *Traffic Server*, *Traffic Stats*: 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/infrastructure/ansible/roles/traffic_stats/defaults/main.yml b/infrastructure/ansible/roles/traffic_stats/defaults/main.yml index 7f7eff66b4..79524aca5d 100644 --- a/infrastructure/ansible/roles/traffic_stats/defaults/main.yml +++ b/infrastructure/ansible/roles/traffic_stats/defaults/main.yml @@ -22,7 +22,7 @@ ts_group: traffic_stats # Traffic Stats Installation information ts_install_basedir: /opt/traffic_stats ts_install_confdir: "{{ ts_install_basedir }}/conf" -ts_install_logdir: "{{ ts_install_basedir }}/var/log/traffic_stats" +ts_install_logdir: "/var/log/traffic_stats" # Traffic Ops connection data ts_toUser: diff --git a/infrastructure/cdn-in-a-box/traffic_stats/run.sh b/infrastructure/cdn-in-a-box/traffic_stats/run.sh index 2b68d95744..be99ce94f3 100755 --- a/infrastructure/cdn-in-a-box/traffic_stats/run.sh +++ b/infrastructure/cdn-in-a-box/traffic_stats/run.sh @@ -95,12 +95,12 @@ cat <<-EOF >/opt/traffic_stats/conf/traffic_stats_seelog.xml - + EOF -touch /opt/traffic_stats/var/log/traffic_stats/traffic_stats.log +touch /var/log/traffic_stats/traffic_stats.log # Wait for influxdb until nc $INFLUXDB_HOST $INFLUXDB_PORT /dev/null 2>&1; do @@ -124,5 +124,5 @@ else "${traffic_stats_command[@]}" & fi; -exec tail -f /opt/traffic_stats/var/log/traffic_stats/traffic_stats.log +exec tail -f /var/log/traffic_stats/traffic_stats.log diff --git a/traffic_stats/build/traffic_stats.spec b/traffic_stats/build/traffic_stats.spec index e9ace68aeb..e056ec4567 100644 --- a/traffic_stats/build/traffic_stats.spec +++ b/traffic_stats/build/traffic_stats.spec @@ -64,7 +64,7 @@ mkdir -p "${RPM_BUILD_ROOT}"/opt/traffic_stats/conf mkdir -p "${RPM_BUILD_ROOT}"/opt/traffic_stats/backup mkdir -p "${RPM_BUILD_ROOT}"/opt/traffic_stats/influxdb_tools mkdir -p "${RPM_BUILD_ROOT}"/opt/traffic_stats/var/run -mkdir -p "${RPM_BUILD_ROOT}"/opt/traffic_stats/var/log/traffic_stats +mkdir -p "${RPM_BUILD_ROOT}"/var/log/traffic_stats mkdir -p "${RPM_BUILD_ROOT}"/etc/init.d mkdir -p "${RPM_BUILD_ROOT}"/etc/logrotate.d mkdir -p "${RPM_BUILD_ROOT}"/var/lib/grafana/plugins/trafficcontrol-scenes-app @@ -129,9 +129,8 @@ fi %dir /opt/traffic_stats/conf %dir /opt/traffic_stats/backup %dir /opt/traffic_stats/var -%dir /opt/traffic_stats/var/log %dir /opt/traffic_stats/var/run -%dir /opt/traffic_stats/var/log/traffic_stats +%dir /var/log/traffic_stats %dir /var/lib/grafana/plugins/trafficcontrol-scenes-app %dir /opt/traffic_stats/influxdb_tools diff --git a/traffic_stats/traffic_stats.init b/traffic_stats/traffic_stats.init index 3adf06d8cd..67e8b54378 100644 --- a/traffic_stats/traffic_stats.init +++ b/traffic_stats/traffic_stats.init @@ -63,7 +63,7 @@ start() { # Start daemons. echo -n $"Starting $name: " - daemon nohup $prog $options < /dev/null > /opt/traffic_stats/var/log/traffic_stats/traffic_stats.out 2>&1 & + daemon nohup $prog $options < /dev/null > /var/log/traffic_stats/traffic_stats.out 2>&1 & RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/traffic_stats/traffic_stats.logrotate b/traffic_stats/traffic_stats.logrotate index ef1bb9c978..be3bd7a10c 100644 --- a/traffic_stats/traffic_stats.logrotate +++ b/traffic_stats/traffic_stats.logrotate @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. -/opt/traffic_stats/var/log/traffic_stats/traffic_stats.log { +/var/log/traffic_stats/traffic_stats.log { compress maxage 30 missingok diff --git a/traffic_stats/traffic_stats_seelog.xml b/traffic_stats/traffic_stats_seelog.xml index 301016a733..7463dc298b 100644 --- a/traffic_stats/traffic_stats_seelog.xml +++ b/traffic_stats/traffic_stats_seelog.xml @@ -20,6 +20,6 @@ under the License. - +