x
/
compass-adapters
Code Issues Proposed changes

Merge "do not sync all log back to compass" into dev/experimental

This commit is contained in:
Jenkins 2015-04-30 17:25:42 +00:00 committed by Gerrit Code Review
parent 28cba4a593 e7280b8970
commit 24265c4a51
6 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cobbler/snippets/kickstart_chef_run.sh
View File

@ -76,7 +76,7 @@ EOL
#if $getVar("compass_server","") != "" #if $getVar("compass_server","") != ""
local3.info @$compass_server:514 local3.info @$compass_server:514
#else #else
local3.info @server:514 local3.info @@$server:514
#end if #end if
EOL EOL
rm -rf /var/lib/rsyslog/chef_\\$node_log rm -rf /var/lib/rsyslog/chef_\\$node_log

4
cobbler/snippets/kickstart_rsyslog.conf
View File

@ -10,9 +10,9 @@ cat << EOL > /etc/rsyslog.conf
\\$ActionResumeRetryCount -1 \\$ActionResumeRetryCount -1
\\$ActionQueueSaveOnShutDown on \\$ActionQueueSaveOnShutDown on
#if $getVar("compass_server", "") != "" #if $getVar("compass_server", "") != ""
*.* @@$compass_server:514 \# *.* @@$compass_server:514
#else #else
*.* @@$server:514 \# *.* @@$server:514
#end if #end if
\# Provides UDP syslog reception \# Provides UDP syslog reception

6
cobbler/snippets/preseed_chef_run.sh
View File

@ -71,7 +71,11 @@ EOL
\\\\$InputFileFacility local3 \\\\$InputFileFacility local3
\\\\$InputRunFileMonitor \\\\$InputRunFileMonitor
\\\\$InputFilePollInterval 1 \\\\$InputFilePollInterval 1
local3.info @$server:514 #if $getVar("compass_server","") != ""
local3.info @$compass_server:514
#else
local3.info @@$server:514
#end if
EOL EOL
rm -rf /var/lib/rsyslog/chef_\\$node_log rm -rf /var/lib/rsyslog/chef_\\$node_log
service rsyslog restart service rsyslog restart

6
cobbler/snippets/preseed_rsyslog.conf
View File

@ -9,7 +9,11 @@ cat << EOL > /etc/rsyslog.conf
\\$ActionQueueFileName srvrfwd \\$ActionQueueFileName srvrfwd
\\$ActionResumeRetryCount -1 \\$ActionResumeRetryCount -1
\\$ActionQueueSaveOnShutDown on \\$ActionQueueSaveOnShutDown on
*.* @@$server:514 #if $getVar("compass_server", "") != ""
\# *.* @@$compass_server:514
#else
\# *.* @@$server:514
#end if
\# Provides UDP syslog reception \# Provides UDP syslog reception
\#\\$ModLoad imudp \#\\$ModLoad imudp

4
cobbler/snippets/rsyslog.xml
View File

@ -13,9 +13,9 @@
\$ActionResumeRetryCount -1 \$ActionResumeRetryCount -1
\$ActionQueueSaveOnShutDown on \$ActionQueueSaveOnShutDown on
#if $getVar("compass_server", "") != "" #if $getVar("compass_server", "") != ""
*.* @@$compass_server:514 \# *.* @@$compass_server:514
#else #else
*.* @@$server:514 \# *.* @@$server:514
#end if #end if
\# Provides UDP syslog reception \# Provides UDP syslog reception

6
cobbler/snippets/suse_chef_run.sh
View File

@ -71,7 +71,11 @@ EOL
\\\\$InputFileFacility local3 \\\\$InputFileFacility local3
\\\\$InputRunFileMonitor \\\\$InputRunFileMonitor
\\\\$InputFilePollInterval 1 \\\\$InputFilePollInterval 1
local3.info @$server:514 #if $getVar("compass_server","") != ""
local3.info @$compass_server:514
#else
local3.info @@$server:514
#end if
EOL EOL
rm -rf /var/lib/rsyslog/chef_\\$node_log rm -rf /var/lib/rsyslog/chef_\\$node_log
service rsyslog restart service rsyslog restart