From 97386148a5521e07ee2496a2cecd81d0f9b0c2af Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Tue, 2 Apr 2024 16:39:47 -0600 Subject: [PATCH 1/4] Store Apache Traffic Server logs in /var/log/trafficserver --- CHANGELOG.md | 1 + cache-config/testing/docker/trafficserver/trafficserver.spec | 5 +++-- .../testing/ort-tests/baseline-configs/records.config | 2 +- cache-config/testing/ort-tests/tc-fixtures.json | 4 ++-- traffic_server/_tsb/trafficserver.spec | 5 +++-- traffic_server/spec/trafficserver.spec | 5 +++-- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ec7260347..d060614f67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - [#8009](https://github.com/apache/trafficcontrol/pull/8009) *Traffic Portal v2*: Update NodeJS version to 20. - [#8040](https://github.com/apache/trafficcontrol/pull/8040) *Traffic Router*: Get the Tomcat version from .env and update Tomcat to 9.0.90. - [##8056](https://github.com/apache/trafficcontrol/pull/8056) Remove the `version` key from compose files and use `docker compose` instead of `docker-compose`. +- [7980](https://github.com/apache/trafficcontrol/pull/7980) *Traffic Server*: Store logs in /var/log ### Fixed - [#8008](https://github.com/apache/trafficcontrol/pull/8008) *Traffic Router* Fix czf temp file deletion issue. diff --git a/cache-config/testing/docker/trafficserver/trafficserver.spec b/cache-config/testing/docker/trafficserver/trafficserver.spec index 35ad16e5ca..fd4213a6d2 100644 --- a/cache-config/testing/docker/trafficserver/trafficserver.spec +++ b/cache-config/testing/docker/trafficserver/trafficserver.spec @@ -83,6 +83,7 @@ mkdir -p $RPM_BUILD_ROOT/opt/trafficserver/etc/trafficserver/snapshots mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system cp rc/trafficserver.service $RPM_BUILD_ROOT/usr/lib/systemd/system/ cp ../traffic_server_jemalloc $RPM_BUILD_ROOT/opt/trafficserver/bin/ +mkdir -p "${RPM_BUILD_ROOT}"/var/log/trafficserver %if %{?_with_openssl_included:1}%{!?_with_openssl_included:0} mkdir -p $RPM_BUILD_ROOT/opt/trafficserver/openssl @@ -134,8 +135,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 index 5f9ef17d29..623d367ac4 100644 --- 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 index 8fdd927fe1..45def555f2 100644 --- 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/traffic_server/_tsb/trafficserver.spec b/traffic_server/_tsb/trafficserver.spec index 8bf7f28aa8..f5a9bf634a 100644 --- a/traffic_server/_tsb/trafficserver.spec +++ b/traffic_server/_tsb/trafficserver.spec @@ -76,6 +76,7 @@ mkdir -p $RPM_BUILD_ROOT/opt/trafficserver/etc/trafficserver/snapshots mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system cp rc/trafficserver.service $RPM_BUILD_ROOT/usr/lib/systemd/system/ cp ../traffic_server_jemalloc $RPM_BUILD_ROOT/opt/trafficserver/bin/ +mkdir -p $RPM_BUILD_ROOT/var/log/trafficserver %if %{?_with_openssl_included:1}%{!?_with_openssl_included:0} mkdir -p $RPM_BUILD_ROOT/opt/trafficserver/openssl @@ -127,8 +128,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 index 4d60cb557c..56e55f2e14 100644 --- a/traffic_server/spec/trafficserver.spec +++ b/traffic_server/spec/trafficserver.spec @@ -49,6 +49,7 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT%{install_prefix}/trafficserver/etc/trafficserver/snapshots mkdir -p $RPM_BUILD_ROOT/etc/init.d +mkdir -p $RPM_BUILD_ROOT/var/log/trafficserver cp $RPM_BUILD_DIR/%{name}-%{version}/rc/trafficserver $RPM_BUILD_ROOT/etc/init.d/ %clean @@ -89,8 +90,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 From 438cc70cd496fda3c7803c43935a4b387f685b09 Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Wed, 3 Apr 2024 01:40:45 -0600 Subject: [PATCH 2/4] Store Grove logs in /var/log/trafficserver --- grove/build/grove.logrotate | 2 +- grove/docker/docker-entrypoint.sh | 4 ++-- grove/grovetccfg/grove_profile.traffic_ops | 2 +- infrastructure/ansible/roles/dataset_loader/defaults/main.yml | 2 +- infrastructure/ansible/roles/grove/defaults/main.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/grove/build/grove.logrotate b/grove/build/grove.logrotate index a84b3fdc57..c376e1f72d 100644 --- 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 index c61c3e5196..61402459cf 100755 --- 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 index 82f904e9d8..1a8f6b3b86 100644 --- 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 index 990510a698..2e41b6a963 100644 --- 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 index 3245c0bef4..15ae588822 100644 --- 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" From a0cc302a282903fc704ab16fa5d5a68bab724e4b Mon Sep 17 00:00:00 2001 From: The Anh Nguyen Date: Mon, 15 Apr 2024 22:24:36 +0700 Subject: [PATCH 3/4] chore: change ATS traffic.out folder to /var/log/trafficserver (#122) * chore: change ATS traffic.out folder to /var/log/trafficserver * chore: add license --- traffic_server/_tsb/Dockerfile | 1 + traffic_server/_tsb/run.sh | 3 +-- traffic_server/_tsb/trafficserver.env | 21 +++++++++++++++++++++ traffic_server/_tsb/trafficserver.spec | 5 +++++ 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 traffic_server/_tsb/trafficserver.env diff --git a/traffic_server/_tsb/Dockerfile b/traffic_server/_tsb/Dockerfile index cec03d640a..b370e1e17c 100644 --- a/traffic_server/_tsb/Dockerfile +++ b/traffic_server/_tsb/Dockerfile @@ -107,6 +107,7 @@ RUN pip3 install --user Sphinx COPY run.sh /run.sh COPY trafficserver.spec /rpmbuilddir/SPECS/trafficserver.spec COPY traffic_server_jemalloc /rpmbuilddir/SOURCES/traffic_server_jemalloc +COPY trafficserver.env /rpmbuilddir/SOURCES/trafficserver.env RUN /usr/sbin/useradd -u 176 -r ats -s /sbin/nologin -d / CMD if [[ ${RHEL_VERSION%%.*} -ge 8 ]]; then \ os_toolset=gcc-toolset-11; \ diff --git a/traffic_server/_tsb/run.sh b/traffic_server/_tsb/run.sh index 41a05c31c2..416e330637 100755 --- a/traffic_server/_tsb/run.sh +++ b/traffic_server/_tsb/run.sh @@ -70,7 +70,6 @@ ED ) || die "Failed to patch plugins makefile to include astats." # Patch trafficserver systemd service -# This includes changing output redirection to traffic.out and adding udev-settle to wait for disks -(sed -i 's/ExecStart=@exp_bindir@\/traffic_manager \$TM_DAEMON_ARGS/ExecStart=@exp_bindir@\/traffic_manager --bind_stdout @exp_logdir@\/traffic.out --bind_stderr @exp_logdir@\/traffic.out \$TM_DAEMON_ARGS/g' /rpmbuilddir/SOURCES/src/rc/trafficserver.service.in) +# This includes adding udev-settle to wait for disks (sed -i 's/After=syslog.target network.target/Wants=systemd-udev-settle.service \nAfter=syslog.target network.target systemd-udev-settle.service/g' /rpmbuilddir/SOURCES/src/rc/trafficserver.service.in) rpmbuild -bb ${rpmbuild_openssl} --define "_topdir /rpmbuilddir" /rpmbuilddir/SPECS/trafficserver.spec || die "Failed to build rpm." diff --git a/traffic_server/_tsb/trafficserver.env b/traffic_server/_tsb/trafficserver.env new file mode 100644 index 0000000000..c576ffc107 --- /dev/null +++ b/traffic_server/_tsb/trafficserver.env @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +STDOUTLOG=/var/log/trafficserver/traffic.out +STDERRLOG=/var/log/trafficserver/traffic.out \ No newline at end of file diff --git a/traffic_server/_tsb/trafficserver.spec b/traffic_server/_tsb/trafficserver.spec index f5a9bf634a..73b46dbd0a 100644 --- a/traffic_server/_tsb/trafficserver.spec +++ b/traffic_server/_tsb/trafficserver.spec @@ -53,6 +53,7 @@ Apache Traffic Server with Apache Traffic Control modifications and environment %setup -c -T cp -far %{src}/. . cp -far %{src}/../traffic_server_jemalloc .. +cp -far %{src}/../trafficserver.env .. autoreconf -vfi %build @@ -74,8 +75,11 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/opt/trafficserver/etc/trafficserver/snapshots mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system +mkdir -p $RPM_BUILD_ROOT/etc/sysconfig cp rc/trafficserver.service $RPM_BUILD_ROOT/usr/lib/systemd/system/ cp ../traffic_server_jemalloc $RPM_BUILD_ROOT/opt/trafficserver/bin/ +touch $RPM_BUILD_ROOT/etc/sysconfig/trafficserver +cp ../trafficserver.env $RPM_BUILD_ROOT/etc/sysconfig/trafficserver mkdir -p $RPM_BUILD_ROOT/var/log/trafficserver %if %{?_with_openssl_included:1}%{!?_with_openssl_included:0} @@ -117,6 +121,7 @@ fi %license LICENSE %defattr(-,root,root) %attr(644,-,-) /usr/lib/systemd/system/trafficserver.service +%attr(644,-,-) /etc/sysconfig/trafficserver %dir /opt/trafficserver %if %{?_with_openssl_included:1}%{!?_with_openssl_included:0} /opt/trafficserver/openssl From c9b74b5fa098fb7ca5b562a0328f1097954b5575 Mon Sep 17 00:00:00 2001 From: The Anh Nguyen Date: Mon, 22 Jul 2024 20:16:49 +0200 Subject: [PATCH 4/4] fix ciab-build (#125) * fix ciab-build * fix yumserver Dockerfile * Update Go version to 1.22.5 (#8034) * Update Go version to 1.22.5 * Update some images to Rocky Linux 8 --------- Co-authored-by: asf-ci-trafficcontrol Co-authored-by: Zach Hoffman --------- Co-authored-by: asf-ci-trafficcontrol Co-authored-by: Zach Hoffman --- .../testing/docker/trafficserver/Dockerfile | 3 ++- .../testing/docker/trafficserver/run.sh | 1 + .../docker/trafficserver/trafficserver.env | 21 +++++++++++++++++++ .../docker/trafficserver/trafficserver.spec | 5 +++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 cache-config/testing/docker/trafficserver/trafficserver.env diff --git a/cache-config/testing/docker/trafficserver/Dockerfile b/cache-config/testing/docker/trafficserver/Dockerfile index 731a349f7a..eb3f3f0938 100644 --- a/cache-config/testing/docker/trafficserver/Dockerfile +++ b/cache-config/testing/docker/trafficserver/Dockerfile @@ -116,6 +116,7 @@ COPY cache-config/testing/docker/trafficserver/traffic_server_jemalloc \ cache-config/testing/docker/trafficserver/cjose.pic.patch \ cache-config/testing/docker/trafficserver/jansson.pic.patch \ cache-config/testing/docker/trafficserver/run.sh \ - / + cache-config/testing/docker/trafficserver/trafficserver.env \ + / CMD /run.sh diff --git a/cache-config/testing/docker/trafficserver/run.sh b/cache-config/testing/docker/trafficserver/run.sh index 1e51741740..eb115f8cc6 100755 --- a/cache-config/testing/docker/trafficserver/run.sh +++ b/cache-config/testing/docker/trafficserver/run.sh @@ -93,6 +93,7 @@ cd /root/rpmbuild/SOURCES # clone the trafficserver repo git clone https://github.com/apache/trafficserver.git --branch $ATS_VERSION || die "Failed to fetch the ATS Source" cp /traffic_server_jemalloc . +cp /trafficserver.env . # patch in the astats plugin (cp -fa /astats_over_http /root/rpmbuild/SOURCES/trafficserver/plugins/astats_over_http diff --git a/cache-config/testing/docker/trafficserver/trafficserver.env b/cache-config/testing/docker/trafficserver/trafficserver.env new file mode 100644 index 0000000000..c576ffc107 --- /dev/null +++ b/cache-config/testing/docker/trafficserver/trafficserver.env @@ -0,0 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# SPDX-License-Identifier: Apache-2.0 + +STDOUTLOG=/var/log/trafficserver/traffic.out +STDERRLOG=/var/log/trafficserver/traffic.out \ No newline at end of file diff --git a/cache-config/testing/docker/trafficserver/trafficserver.spec b/cache-config/testing/docker/trafficserver/trafficserver.spec index fd4213a6d2..aa7c04b48b 100644 --- a/cache-config/testing/docker/trafficserver/trafficserver.spec +++ b/cache-config/testing/docker/trafficserver/trafficserver.spec @@ -53,6 +53,7 @@ Apache Traffic Server with Apache Traffic Control modifications and environment %setup -c -T cp -far %{src}/. . cp -fa %{src}/../traffic_server_jemalloc .. +cp -fa %{src}/../trafficserver.env .. autoreconf -vfi %build @@ -81,8 +82,11 @@ make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/opt/trafficserver/etc/trafficserver/snapshots mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system +mkdir -p $RPM_BUILD_ROOT/etc/sysconfig cp rc/trafficserver.service $RPM_BUILD_ROOT/usr/lib/systemd/system/ cp ../traffic_server_jemalloc $RPM_BUILD_ROOT/opt/trafficserver/bin/ +touch $RPM_BUILD_ROOT/etc/sysconfig/trafficserver +cp ../trafficserver.env $RPM_BUILD_ROOT/etc/sysconfig/trafficserver mkdir -p "${RPM_BUILD_ROOT}"/var/log/trafficserver %if %{?_with_openssl_included:1}%{!?_with_openssl_included:0} @@ -124,6 +128,7 @@ fi %license LICENSE %defattr(-,root,root) %attr(644,-,-) /usr/lib/systemd/system/trafficserver.service +%attr(644,-,-) /etc/sysconfig/trafficserver %dir /opt/trafficserver %if %{?_with_openssl_included:1}%{!?_with_openssl_included:0} /opt/trafficserver/openssl