openstack/octavia
Code Issues Proposed changes

Merge "Move log offload files to /var/log/octavia"

Browse Source
This commit is contained in:
Zuul
2025-09-10 21:36:18 +00:00
committed by Gerrit Code Review
parent 56f7691812 d00fcf13b8
commit ff57fb942e
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/etc/rsyslog/10-octavia-log-offloading.conf
View File

@@ -8,9 +8,9 @@ module(load="imudp")
input(type="imudp" port=["%ADMIN_PORT%", "%TENANT_PORT%"]) input(type="imudp" port=["%ADMIN_PORT%", "%TENANT_PORT%"])
if ($inputname == "imudp" and $syslogfacility-text == "local0" and $syslogseverity-text == "info") then { if ($inputname == "imudp" and $syslogfacility-text == "local0" and $syslogseverity-text == "info") then {
action(type="omfile" FileCreateMode="0644" File="/var/log/octavia-tenant-traffic.log")&stop action(type="omfile" FileCreateMode="0644" File="/var/log/octavia/octavia-tenant-traffic.log")&stop
} }
if ($inputname == "imudp" and $syslogfacility-text != "local0") then { if ($inputname == "imudp" and $syslogfacility-text != "local0") then {
action(type="omfile" FileCreateMode="0644" File="/var/log/octavia-amphora.log")&stop action(type="omfile" FileCreateMode="0644" File="/var/log/octavia/octavia-amphora.log")&stop
} }

15
devstack/plugin.sh
View File

@@ -621,11 +621,26 @@ function configure_octavia_api_haproxy {
} }
function configure_rsyslog { function configure_rsyslog {
sudo mkdir -m 775 /var/log/octavia
sudo chgrp syslog /var/log/octavia
sudo cp ${OCTAVIA_DIR}/devstack/etc/rsyslog/10-octavia-log-offloading.conf /etc/rsyslog.d/ sudo cp ${OCTAVIA_DIR}/devstack/etc/rsyslog/10-octavia-log-offloading.conf /etc/rsyslog.d/
sudo sed -e " sudo sed -e "
s|%ADMIN_PORT%|${OCTAVIA_AMP_LOG_ADMIN_PORT}|g; s|%ADMIN_PORT%|${OCTAVIA_AMP_LOG_ADMIN_PORT}|g;
s|%TENANT_PORT%|${OCTAVIA_AMP_LOG_TENANT_PORT}|g; s|%TENANT_PORT%|${OCTAVIA_AMP_LOG_TENANT_PORT}|g;
" -i /etc/rsyslog.d/10-octavia-log-offloading.conf " -i /etc/rsyslog.d/10-octavia-log-offloading.conf
# Temporary backward compatibility symbolic link.
# Remove in the next "I" cycle
sudo touch /var/log/octavia/octavia-tenant-traffic.log
sudo chmod 664 /var/log/octavia/octavia-tenant-traffic.log
sudo chgrp syslog /var/log/octavia/octavia-tenant-traffic.log
sudo ln -s /var/log/octavia/octavia-tenant-traffic.log /var/log/octavia-tenant-traffic.log
sudo touch /var/log/octavia/octavia-amphora.log
sudo chmod 664 /var/log/octavia/octavia-amphora.log
sudo chgrp syslog /var/log/octavia/octavia-amphora.log
sudo ln -s /var/log/octavia/octavia-amphora.log /var/log/octavia-amphora.log
} }
function octavia_start { function octavia_start {

4
zuul.d/jobs.yaml
View File

@@ -74,8 +74,8 @@
tox_envlist: all tox_envlist: all
zuul_copy_output: zuul_copy_output:
'/var/log/dib-build/': 'logs' '/var/log/dib-build/': 'logs'
'/var/log/octavia-tenant-traffic.log': 'logs' '/var/log/octavia/octavia-tenant-traffic.log': 'logs'
'/var/log/octavia-amphora.log': 'logs' '/var/log/octavia/octavia-amphora.log': 'logs'
- job: - job:
name: octavia-grenade-skip-level name: octavia-grenade-skip-level