Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prefix docker container name to syslog syslogtag (program name) #1810

Merged
merged 1 commit into from
Jun 25, 2018
+64 −3
Merged

Prefix docker container name to syslog syslogtag (program name) #1810

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prefix docker container name to syslog syslogtag (program name) 
Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
@qiluo-msft
qiluo-msft committed Jun 23, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit cbca65958c499e1b9cc55d02c28877e5458b5ae4
6 changes: 4 additions & 2 deletions dockers/docker-base/etc/rsyslog.conf
View file
Original file line number Diff line number Diff line change
@@ -29,8 +29,10 @@ $ModLoad imuxsock # provides support for local system logging
###########################
#### GLOBAL DIRECTIVES ####
###########################
#Set remote syslog server
*.* @127.0.0.1:514

# Set remote syslog server
template (name="ForwardFormatInContainer" type="string" string="<%PRI%>%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag%%msg:::sp-if-no-1st-sp%%msg%")
*.* action(type="omfwd" target="127.0.0.1" port="514" protocol="udp" Template="ForwardFormatInContainer")

#
# Use traditional timestamp format.
3 changes: 3 additions & 0 deletions dockers/docker-database/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

# Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions dockers/docker-dhcp-relay/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

# Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions dockers/docker-fpm-frr/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

# Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions dockers/docker-fpm-quagga/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

# Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions dockers/docker-lldp-sv2/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

# Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions dockers/docker-orchagent/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions dockers/docker-platform-monitor/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

# Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions dockers/docker-router-advertiser/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

# Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions dockers/docker-snmp-sv2/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

# Enable -O for all Python calls
ENV PYTHONOPTIMIZE 1

3 changes: 3 additions & 0 deletions dockers/docker-sonic-telemetry/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions dockers/docker-teamd/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions platform/broadcom/docker-syncd-brcm/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions platform/cavium/docker-syncd-cavm/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions platform/centec/docker-syncd-centec/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions platform/marvell/docker-syncd-mrvl/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

3 changes: 3 additions & 0 deletions platform/nephos/docker-syncd-nephos/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

5 changes: 4 additions & 1 deletion platform/p4/docker-sonic-p4/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

@@ -76,4 +79,4 @@ COPY ["files/arp_update", "/usr/bin"]
RUN echo "docker-sonic-p4" > /etc/hostname
RUN touch /etc/quagga/zebra.conf

ENTRYPOINT ["/bin/bash"]
ENTRYPOINT ["/bin/bash"]
3 changes: 3 additions & 0 deletions platform/vs/docker-sonic-vs/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM docker-config-engine

ARG docker_container_name
RUN [ -f /etc/rsyslog.conf ] && sed -ri "s/%syslogtag%/$docker_container_name\/%syslogtag%/;" /etc/rsyslog.conf

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

2 changes: 2 additions & 0 deletions slave.mk
View file
Original file line number Diff line number Diff line change
@@ -382,6 +382,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_SIMPLE_DOCKER_IMAGES)) : $(TARGET_PATH)/%.g
--build-arg user=$(USER) \
--build-arg uid=$(UID) \
--build-arg guid=$(GUID) \
--build-arg docker_container_name=$($*.gz_CONTAINER_NAME) \
-t $* $($*.gz_PATH) $(LOG)
docker save $* | gzip -c > $@
# Clean up
@@ -412,6 +413,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .pl
--build-arg user=$(USER) \
--build-arg uid=$(UID) \
--build-arg guid=$(GUID) \
--build-arg docker_container_name=$($*.gz_CONTAINER_NAME) \
-t $* $($*.gz_PATH) $(LOG)
docker save $* | gzip -c > $@
# Clean up