Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Rework rsyslog stuff. Use default dist /etc/rsyslog.conf, add our stuff to /etc/rsyslog.d

Browse source
This commit is contained in:
Kevin Fenzi 2014-01-25 17:45:38 +00:00
parent 899cff9492
commit 0844a05bf0
9 changed files with 103 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/group_vars/kernel-qa
View file

@ -1,6 +1,5 @@
--- ---
freezes: true freezes: true
resolvconf: "{{ files }}/resolv.conf/phx2" resolvconf: "{{ files }}/resolv.conf/phx2"
rsyslogconf: "{{ files }}/rsyslog/rsyslog.conf.phx2"
fas_client_groups: sysadmin-kernel fas_client_groups: sysadmin-kernel
sudoers: "{{ private }}/files/sudo/kernel-qa" sudoers: "{{ private }}/files/sudo/kernel-qa"

13
roles/base/files/rsyslog/rsyslog-audit.conf Normal file
View file

@ -0,0 +1,13 @@
# monitor auditd log and send out over local6 to central loghost
$ModLoad imfile.so
# auditd audit.log
$InputFileName /var/log/audit/audit.log
$InputFileTag tag_audit_log:
$InputFileStateFile audit_log
$InputFileSeverity info
$InputFileFacility local6
$InputRunFileMonitor
:msg, !contains, "type=AVC"
local6.* @@log02:514

3
roles/base/files/rsyslog/rsyslog-disablerate.conf Normal file
View file

@ -0,0 +1,3 @@
# Disable rate limiting
$IMUXSockRateLimitInterval 0
$SystemLogRateLimitInterval 0

4
roles/base/files/rsyslog/rsyslog-log02.conf Normal file
View file

@ -0,0 +1,4 @@
#
# Send everything on to central log02 logger machines
#
cron.*;kern.*;authpriv.*;local7.*;*.info;local6.none @@log02:514

55
roles/base/files/rsyslog/rsyslog.conf
View file

@ -1,20 +1,20 @@
#rsyslog v3 config file # rsyslog v5 configuration file
# if you experience problems, check # For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
# http://www.rsyslog.com/troubleshoot for assistance # If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
#### MODULES #### #### MODULES ####
$ModLoad imuxsock.so # provides support for local system logging (e.g. via logger command) $ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
$ModLoad imklog.so # provides kernel logging support (previously done by rklogd) $ModLoad imklog # provides kernel logging support (previously done by rklogd)
#$ModLoad immark.so # provides --MARK-- message capability #$ModLoad immark # provides --MARK-- message capability
# Provides UDP syslog reception # Provides UDP syslog reception
#$ModLoad imudp.so #$ModLoad imudp
#$UDPServerRun 514 #$UDPServerRun 514
# Provides TCP syslog reception # Provides TCP syslog reception
#$ModLoad imtcp.so #$ModLoad imtcp
#$InputTCPServerRun 514 #$InputTCPServerRun 514
@ -23,10 +23,13 @@ $ModLoad imklog.so # provides kernel logging support (previously done by rklogd)
# Use default timestamp format # Use default timestamp format
$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
# File syncing capability is disabled by default. This feature is usually not required, # File syncing capability is disabled by default. This feature is usually not required,
# not useful and an extreme performance hit # not useful and an extreme performance hit
#$ActionFileEnableSync on #$ActionFileEnableSync on
# Include all config files in /etc/rsyslog.d/
$IncludeConfig /etc/rsyslog.d/*.conf
#### RULES #### #### RULES ####
@ -36,7 +39,7 @@ $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
# Log anything (except mail) of level info or higher. # Log anything (except mail) of level info or higher.
# Don't log private authentication messages! # Don't log private authentication messages!
*.info;local6.none;mail.none;authpriv.none;cron.none /var/log/messages *.info;mail.none;authpriv.none;cron.none /var/log/messages
# The authpriv file has restricted access. # The authpriv file has restricted access.
authpriv.* /var/log/secure authpriv.* /var/log/secure
@ -57,16 +60,6 @@ uucp,news.crit /var/log/spooler
# Save boot messages also to boot.log # Save boot messages also to boot.log
local7.* /var/log/boot.log local7.* /var/log/boot.log
# monitor auditd log and send out over local6 to central loghost
$ModLoad imfile.so
# auditd audit.log
$InputFileName /var/log/audit/audit.log
$InputFileTag tag_audit_log:
$InputFileStateFile audit_log
$InputFileSeverity info
$InputFileFacility local6
$InputRunFileMonitor
# ### begin forwarding rule ### # ### begin forwarding rule ###
# The statement between the begin ... end define a SINGLE forwarding # The statement between the begin ... end define a SINGLE forwarding
@ -76,22 +69,12 @@ $InputRunFileMonitor
# #
# An on-disk queue is created for this action. If the remote host is # An on-disk queue is created for this action. If the remote host is
# down, messages are spooled to disk and sent when it is up again. # down, messages are spooled to disk and sent when it is up again.
$WorkDirectory /var/lib/rsyslog # where to place spool files #$WorkDirectory /var/lib/rsyslog # where to place spool files
$ActionQueueFileName fwdRule1 # unique name prefix for spool files #$ActionQueueFileName fwdRule1 # unique name prefix for spool files
$ActionQueueMaxDiskSpace 512m # 512M space limit (use as much as possible) #$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible)
$ActionQueueSaveOnShutdown on # save messages to disk on shutdown #$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
$ActionQueueType LinkedList # run asynchronously #$ActionQueueType LinkedList # run asynchronously
$ActionResumeRetryCount -1 # infinite retries if host is down #$ActionResumeRetryCount -1 # infinite retries if host is down
# Disable rate limiting
$IMUXSockRateLimitInterval 0
$SystemLogRateLimitInterval 0
# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional # remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
#*.* @@remote-host:514 #*.* @@remote-host:514
# ### end of the forwarding rule ### # ### end of the forwarding rule ###
cron.*;kern.*;authpriv.*;local7.*;*.info;local6.none @@log02:514
:msg, !contains, "type=AVC" ~
local6.* @@log02:514

41
roles/base/files/rsyslog/rsyslog.conf.releng → roles/base/files/rsyslog/rsyslog.conf.el6
View file

@ -1,20 +1,20 @@
#rsyslog v3 config file # rsyslog v5 configuration file
# if you experience problems, check # For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
# http://www.rsyslog.com/troubleshoot for assistance # If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
#### MODULES #### #### MODULES ####
$ModLoad imuxsock.so # provides support for local system logging (e.g. via logger command) $ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
$ModLoad imklog.so # provides kernel logging support (previously done by rklogd) $ModLoad imklog # provides kernel logging support (previously done by rklogd)
#$ModLoad immark.so # provides --MARK-- message capability #$ModLoad immark # provides --MARK-- message capability
# Provides UDP syslog reception # Provides UDP syslog reception
#$ModLoad imudp.so #$ModLoad imudp
#$UDPServerRun 514 #$UDPServerRun 514
# Provides TCP syslog reception # Provides TCP syslog reception
#$ModLoad imtcp.so #$ModLoad imtcp
#$InputTCPServerRun 514 #$InputTCPServerRun 514
@ -23,6 +23,14 @@ $ModLoad imklog.so # provides kernel logging support (previously done by rklogd)
# Use default timestamp format # Use default timestamp format
$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
# File syncing capability is disabled by default. This feature is usually not required,
# not useful and an extreme performance hit
#$ActionFileEnableSync on
# Include all config files in /etc/rsyslog.d/
$IncludeConfig /etc/rsyslog.d/*.conf
#### RULES #### #### RULES ####
# Log all kernel messages to the console. # Log all kernel messages to the console.
@ -31,7 +39,7 @@ $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
# Log anything (except mail) of level info or higher. # Log anything (except mail) of level info or higher.
# Don't log private authentication messages! # Don't log private authentication messages!
*.info;local6.none;mail.none;authpriv.none;cron.none /var/log/messages *.info;mail.none;authpriv.none;cron.none /var/log/messages
# The authpriv file has restricted access. # The authpriv file has restricted access.
authpriv.* /var/log/secure authpriv.* /var/log/secure
@ -52,6 +60,7 @@ uucp,news.crit /var/log/spooler
# Save boot messages also to boot.log # Save boot messages also to boot.log
local7.* /var/log/boot.log local7.* /var/log/boot.log
# ### begin forwarding rule ### # ### begin forwarding rule ###
# The statement between the begin ... end define a SINGLE forwarding # The statement between the begin ... end define a SINGLE forwarding
# rule. They belong together, do NOT split them. If you create multiple # rule. They belong together, do NOT split them. If you create multiple
@ -60,14 +69,12 @@ local7.* /var/log/boot.log
# #
# An on-disk queue is created for this action. If the remote host is # An on-disk queue is created for this action. If the remote host is
# down, messages are spooled to disk and sent when it is up again. # down, messages are spooled to disk and sent when it is up again.
$WorkDirectory /var/lib/rsyslog # where to place spool files #$WorkDirectory /var/lib/rsyslog # where to place spool files
$ActionQueueFileName fwdRule1 # unique name prefix for spool files #$ActionQueueFileName fwdRule1 # unique name prefix for spool files
$ActionQueueMaxDiskSpace 512m # 512M space limit (use as much as possible) #$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible)
$ActionQueueSaveOnShutdown on # save messages to disk on shutdown #$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
$ActionQueueType LinkedList # run asynchronously #$ActionQueueType LinkedList # run asynchronously
$ActionResumeRetryCount -1 # infinite retries if host is down #$ActionResumeRetryCount -1 # infinite retries if host is down
# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional # remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
#*.* @@remote-host:514 #*.* @@remote-host:514
# ### end of the forwarding rule ### # ### end of the forwarding rule ###
cron.*;kern.*;authpriv.*;local7.*;*.info;local6.none @@log02:514

51
roles/base/files/rsyslog/rsyslog.conf.kojibuilder → roles/base/files/rsyslog/rsyslog.conf.f20
View file

@ -1,38 +1,47 @@
#rsyslog v3 config file # rsyslog v5 configuration file
# if you experience problems, check # For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
# http://www.rsyslog.com/troubleshoot for assistance # If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html
#### MODULES #### #### MODULES ####
$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) # The imjournal module bellow is now used as a message source instead of imuxsock.
$ModLoad imjournal # provides access to the systemd journal $ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
$ModLoad imklog # provides kernel logging support (previously done by rklogd) $ModLoad imjournal # provides access to the systemd journal
#$ModLoad immark.so # provides --MARK-- message capability $ModLoad imklog # provides kernel logging support (previously done by rklogd)
#$ModLoad immark # provides --MARK-- message capability
# Provides UDP syslog reception # Provides UDP syslog reception
#$ModLoad imudp.so #$ModLoad imudp
#$UDPServerRun 514 #$UDPServerRun 514
# Provides TCP syslog reception # Provides TCP syslog reception
#$ModLoad imtcp.so #$ModLoad imtcp
#$InputTCPServerRun 514 #$InputTCPServerRun 514
#### GLOBAL DIRECTIVES #### #### GLOBAL DIRECTIVES ####
# Include all config files in /etc/rsyslog.d/ # Where to place auxiliary files
$IncludeConfig /etc/rsyslog.d/*.conf $WorkDirectory /var/lib/rsyslog
# Use default timestamp format # Use default timestamp format
$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
# File syncing capability is disabled by default. This feature is usually not required,
# not useful and an extreme performance hit
#$ActionFileEnableSync on
# Include all config files in /etc/rsyslog.d/
$IncludeConfig /etc/rsyslog.d/*.conf
# Turn off message reception via local log socket; # Turn off message reception via local log socket;
# local messages are retrieved through imjournal now. # local messages are retrieved through imjournal now.
$OmitLocalLogging on $OmitLocalLogging on
# File to store the position in the journal # File to store the position in the journal
$StateFile imjournal.state $IMJournalStateFile imjournal.state
#### RULES #### #### RULES ####
@ -42,7 +51,7 @@ $StateFile imjournal.state
# Log anything (except mail) of level info or higher. # Log anything (except mail) of level info or higher.
# Don't log private authentication messages! # Don't log private authentication messages!
*.info;local6.none;mail.none;authpriv.none;cron.none /var/log/messages *.info;mail.none;authpriv.none;cron.none /var/log/messages
# The authpriv file has restricted access. # The authpriv file has restricted access.
authpriv.* /var/log/secure authpriv.* /var/log/secure
@ -55,7 +64,7 @@ mail.* -/var/log/maillog
cron.* /var/log/cron cron.* /var/log/cron
# Everybody gets emergency messages # Everybody gets emergency messages
*.emerg * *.emerg :omusrmsg:*
# Save news errors of level crit and higher in a special file. # Save news errors of level crit and higher in a special file.
uucp,news.crit /var/log/spooler uucp,news.crit /var/log/spooler
@ -63,6 +72,7 @@ uucp,news.crit /var/log/spooler
# Save boot messages also to boot.log # Save boot messages also to boot.log
local7.* /var/log/boot.log local7.* /var/log/boot.log
# ### begin forwarding rule ### # ### begin forwarding rule ###
# The statement between the begin ... end define a SINGLE forwarding # The statement between the begin ... end define a SINGLE forwarding
# rule. They belong together, do NOT split them. If you create multiple # rule. They belong together, do NOT split them. If you create multiple
@ -71,14 +81,11 @@ local7.* /var/log/boot.log
# #
# An on-disk queue is created for this action. If the remote host is # An on-disk queue is created for this action. If the remote host is
# down, messages are spooled to disk and sent when it is up again. # down, messages are spooled to disk and sent when it is up again.
$WorkDirectory /var/lib/rsyslog # where to place spool files #$ActionQueueFileName fwdRule1 # unique name prefix for spool files
$ActionQueueFileName fwdRule1 # unique name prefix for spool files #$ActionQueueMaxDiskSpace 1g # 1gb space limit (use as much as possible)
$ActionQueueMaxDiskSpace 512m # 512M space limit (use as much as possible) #$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
$ActionQueueSaveOnShutdown on # save messages to disk on shutdown #$ActionQueueType LinkedList # run asynchronously
$ActionQueueType LinkedList # run asynchronously #$ActionResumeRetryCount -1 # infinite retries if host is down
$ActionResumeRetryCount -1 # infinite retries if host is down
# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional # remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
#*.* @@remote-host:514 #*.* @@remote-host:514
# ### end of the forwarding rule ### # ### end of the forwarding rule ###
cron.*;kern.*;authpriv.*;local7.*;*.info;local6.none @@log02:514

97
roles/base/files/rsyslog/rsyslog.conf.phx2
View file

@ -1,97 +0,0 @@
#rsyslog v3 config file
# if you experience problems, check
# http://www.rsyslog.com/troubleshoot for assistance
#### MODULES ####
$ModLoad imuxsock.so # provides support for local system logging (e.g. via logger command)
$ModLoad imklog.so # provides kernel logging support (previously done by rklogd)
#$ModLoad immark.so # provides --MARK-- message capability
# Provides UDP syslog reception
#$ModLoad imudp.so
#$UDPServerRun 514
# Provides TCP syslog reception
#$ModLoad imtcp.so
#$InputTCPServerRun 514
#### GLOBAL DIRECTIVES ####
# Use default timestamp format
$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
# File syncing capability is disabled by default. This feature is usually not required,
# not useful and an extreme performance hit
#$ActionFileEnableSync on
#### RULES ####
# Log all kernel messages to the console.
# Logging much else clutters up the screen.
#kern.* /dev/console
# Log anything (except mail) of level info or higher.
# Don't log private authentication messages!
*.info;local6.none;mail.none;authpriv.none;cron.none /var/log/messages
# The authpriv file has restricted access.
authpriv.* /var/log/secure
# Log all the mail messages in one place.
mail.* -/var/log/maillog
# Log cron stuff
cron.* /var/log/cron
# Everybody gets emergency messages
*.emerg *
# Save news errors of level crit and higher in a special file.
uucp,news.crit /var/log/spooler
# Save boot messages also to boot.log
local7.* /var/log/boot.log
# monitor auditd log and send out over local6 to central loghost
$ModLoad imfile.so
# auditd audit.log
$InputFileName /var/log/audit/audit.log
$InputFileTag tag_audit_log:
$InputFileStateFile audit_log
$InputFileSeverity info
$InputFileFacility local6
$InputRunFileMonitor
# ### begin forwarding rule ###
# The statement between the begin ... end define a SINGLE forwarding
# rule. They belong together, do NOT split them. If you create multiple
# forwarding rules, duplicate the whole block!
# Remote Logging (we use TCP for reliable delivery)
#
# An on-disk queue is created for this action. If the remote host is
# down, messages are spooled to disk and sent when it is up again.
$WorkDirectory /var/lib/rsyslog # where to place spool files
$ActionQueueFileName fwdRule1 # unique name prefix for spool files
$ActionQueueMaxDiskSpace 512m # 512M space limit (use as much as possible)
$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
$ActionQueueType LinkedList # run asynchronously
$ActionResumeRetryCount -1 # infinite retries if host is down
# Disable rate limiting
$IMUXSockRateLimitInterval 0
$SystemLogRateLimitInterval 0
# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
#*.* @@remote-host:514
# ### end of the forwarding rule ###
cron.*;kern.*;authpriv.*;local7.*;*.info;local6.none @@log02:514
:msg, !contains, "type=AVC" ~
local6.* @@log02:514

15
roles/base/tasks/main.yml
View file

@ -106,10 +106,7 @@
- name: rsyslog.conf - name: rsyslog.conf
copy: src={{ item }} dest=/etc/rsyslog.conf mode=644 copy: src={{ item }} dest=/etc/rsyslog.conf mode=644
first_available_file: first_available_file:
- "{{ rsyslogconf }}" - rsyslog/rsyslog.conf.{{ dist_tag }}
- rsyslog/rsyslog.conf.{{ ansible_fqdn }}
- rsyslog/rsyslog.conf.{{ host_group }}
- rsyslog/rsyslog.conf.{{ datacenter }}
- rsyslog/rsyslog.conf - rsyslog/rsyslog.conf
notify: notify:
@ -118,6 +115,16 @@
- rsyslogd - rsyslogd
- config - config
- name: add rsyslog config to /etc/rsyslog.d
copy: src={{ item }} dest=/etc/rsyslog.d/{{ item }} mode=644
with_items:
- rsyslog-audit.conf
- rsyslog-disablerate.conf
- rsyslog-log02.conf
tags:
- rsyslogd
- config
- name: /etc/postfix/main.cf - name: /etc/postfix/main.cf
copy: src={{ item }} dest=/etc/postfix/main.cf copy: src={{ item }} dest=/etc/postfix/main.cf
first_available_file: first_available_file: